diff --git a/laptop/configs/hypr/binds.conf b/laptop/configs/hypr/binds.conf
index 7e3d811..793b82c 100644
--- a/laptop/configs/hypr/binds.conf
+++ b/laptop/configs/hypr/binds.conf
@@ -3,8 +3,12 @@ $mainMod = SUPER
 
 bind = $mainMod SHIFT, apostrophe, exec, bash ~/scripts/change-colorscheme.sh
 
+binde = , XF86MonBrightnessUp, exec, brightnessctl s +5%
+binde = , XF86MonBrightnessDown, exec, brightnessctl s 5%-
+
 # app bindings
-bind = $mainMod, Return, exec, wezterm
+bind = $mainMod, Return, exec, wezterm-gui
+bind = $mainMod CONTROL, Return, exec, kitty
 bind = $mainMod, E, exec, thunar
 bind = $mainMod SHIFT, Return, exec, tofi-drun
 bind = , Home, exec, ~/.local/bin/way-print.sh p
diff --git a/laptop/configs/hypr/init.conf b/laptop/configs/hypr/init.conf
index 2a6c1f4..345692b 100644
--- a/laptop/configs/hypr/init.conf
+++ b/laptop/configs/hypr/init.conf
@@ -1,12 +1,13 @@
-exec-once = swww init & 
+exec-once = swww-daemon --format xrgb & 
 exec-once = lxqt-policykit-agent &
 exec-once = ~/scripts/weechat.sh
 exec-once = dunst &
 exec-once = gammastep -t 4500:3500 -l -23.5475:-46.63611 &
 exec-once = gsettings set org.gnome.desktop.interface icon-theme Win10Sur-black-dark & gsettings set org.gnome.desktop.interface gtk-theme Numix-BLACK-Pomegranate & gsettings set org.gnome.desktop.interface cursor-theme Simp1e
-exec-once = dbus-update-activation-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
+exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
 exec-once = rm -rf ~/tmp/*
 exec-once = waybar &
 exec-once = syncthing --no-browser &
 exec-once = xremap ~/.config/xremap/config.yml
-exec-once = swww img ~/pics/ranni..jpg
+exec = SWWW_TRANSITION_STEP=90 SWWW_TRANSITION_FPS=30 SWWW_TRANSITION=wipe SWWW_TRANSITION_ANGLE=30 SWWW_TRANSITION_POS=center swww img ~/pics/monochrome-1.png
+exec-once = nm-applet &
diff --git a/laptop/configs/tmux/plugins/tmux-sensible b/laptop/configs/tmux/plugins/tmux-sensible
deleted file mode 160000
index 25cb91f..0000000
--- a/laptop/configs/tmux/plugins/tmux-sensible
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 25cb91f42d020f675bb0a2ce3fbd3a5d96119efa
diff --git a/laptop/configs/tmux/theme.conf b/laptop/configs/tmux/theme.conf
index 0ea0d98..c7d0e96 120000
--- a/laptop/configs/tmux/theme.conf
+++ b/laptop/configs/tmux/theme.conf
@@ -1 +1 @@
-tmux-black.conf
\ No newline at end of file
+tmux-monochrome.conf
\ No newline at end of file
diff --git a/laptop/configs/tmux/tmux-melange.conf b/laptop/configs/tmux/tmux-melange.conf
new file mode 100644
index 0000000..ba422cc
--- /dev/null
+++ b/laptop/configs/tmux/tmux-melange.conf
@@ -0,0 +1,50 @@
+
+# status bar
+set -g status-style fg=colour208,bg=black
+# set-option -g status-attr default
+set-option -g status-position bottom
+set-option -g status-interval 60
+set-option -g status-bg default
+set-option -g status-fg black
+
+# Left side of status bar
+set-option -g status-left-length 20
+set-option -g status-left '#{?client_prefix,#[bg=colour130]   ,#[bg=colour130] #S }#[fg=default,bg=default] '
+
+# Window status
+set-option -g window-status-format "#[fg=white,bg=black] #I #[fg=white,bg=black] #W "
+set-option -g window-status-current-format "#[fg=black,bg=colour130] #I #[fg=black,bg=colour130] #W "
+set-option -g window-status-separator " "
+set-option -g status-justify left
+
+# Right side of status bar
+set-option -g status-right-length 200
+set -g status-right "#{playerctl_short} | #(whoami)@#h "
+set -g @short_length "50"
+
+# pane border
+set -g pane-border-style fg=colour238,bg=colour235
+set -g pane-active-border-style fg=colour130,bg=colour236
+
+# Pane number indicator
+set-option -g display-panes-colour colour255
+set-option -g display-panes-active-colour brightwhite
+
+# Message
+set -g message-style fg=default,bg=default
+
+# Activity
+set-option -g monitor-activity on
+set-option -g monitor-silence 0
+set-option -g monitor-bell on
+set-option -g activity-action other
+set-option -g visual-activity on
+
+# Window numbering
+set-option -g base-index 1
+set-option -g pane-base-index 1
+set-option -g renumber-windows on
+
+# select default layout
+set-option -g main-pane-width 65
+set-option -g main-pane-height 65
diff --git a/laptop/configs/tmux/tmux-monochrome.conf b/laptop/configs/tmux/tmux-monochrome.conf
new file mode 100644
index 0000000..e616264
--- /dev/null
+++ b/laptop/configs/tmux/tmux-monochrome.conf
@@ -0,0 +1,60 @@
+# status bar
+set -g status-style fg=colour15,bg=colour235
+# set-option -g status-attr default
+set-option -g status-position bottom
+set-option -g status-interval 60
+set-option -g status-bg default
+set-option -g status-fg colour249
+
+# Left side of status bar
+set-option -g status-left-length 20
+# set-option -g status-left "#[fg=colour249,bg=colour235] #S #[fg=default,bg=default] "
+set-option -g status-left '#{?client_prefix,#[fg=black]#[bg=colour241]   ,#[bg=colour234] #S }#[fg=default,bg=default] '
+
+# Window status
+set-option -g window-status-format "#[fg=colour249,bg=colour234] #I #[fg=colour249,bg=colour234] #W "
+set-option -g window-status-current-format "#[fg=black,bg=colour241] #I #[fg=colour249,bg=colour234] #W "
+set-option -g window-status-separator " "
+set-option -g status-justify left
+
+# Right side of status bar
+set-option -g status-right-length 200
+set -g status-right "#{playerctl_short} | #(whoami)@#h "
+set -g @short_length "50"
+
+# set -g @short_length "30"
+# set -g @short_append_chars "..."
+# WEATHER='#(curl -s wttr.in/Berlin\?format\="%%t+%%C+%%w+%%m")'
+# set-option -g status-right "#[fg=colour249,bg=colour241]🌡 BER #[fg=colour249,bg=colour234] $WEATHER #[fg=colour249,bg=colour241]   #[fg=colour249,bg=colour234] #(whoami)@#h "
+
+# pane border
+set -g pane-border-style fg=colour238,bg=colour235
+set -g pane-active-border-style fg=colour241,bg=colour236
+
+# Pane number indicator
+set-option -g display-panes-colour colour234
+set-option -g display-panes-active-colour colour249
+
+# Clock mode
+# set-option -g clock-mode-colour colour249
+# set-option -g clock-mode-style 24
+
+# Message
+set -g message-style fg=default,bg=default
+
+# Activity
+set-option -g monitor-activity on
+set-option -g monitor-silence 0
+set-option -g monitor-bell on
+set-option -g activity-action other
+set-option -g visual-activity off
+
+# Window numbering
+set-option -g base-index 1
+set-option -g pane-base-index 1
+set-option -g renumber-windows on
+
+# select default layout
+set-option -g main-pane-width 65
+set-option -g main-pane-height 65
+
diff --git a/laptop/configs/tmux/tmux-solarized.conf b/laptop/configs/tmux/tmux-solarized.conf
new file mode 100644
index 0000000..33e97fa
--- /dev/null
+++ b/laptop/configs/tmux/tmux-solarized.conf
@@ -0,0 +1,60 @@
+# status bar
+set -g status-style fg=colour16,bg=colour0
+# set-option -g status-attr default
+set-option -g status-position bottom
+set-option -g status-interval 60
+set-option -g status-bg default
+set-option -g status-fg colour7
+
+# Left side of status bar
+set-option -g status-left-length 20
+# set-option -g status-left "#[fg=colour7,bg=colour0] #S #[fg=default,bg=default] "
+set-option -g status-left '#{?client_prefix,#[fg=black]#[bg=colour2]   ,#[bg=colour0] #S }#[fg=default,bg=default] '
+
+# Window status
+set-option -g window-status-format "#[fg=colour7,bg=colour0] #I #[fg=colour7,bg=colour0] #W "
+set-option -g window-status-current-format "#[fg=black,bg=colour2] #I #[fg=colour7,bg=colour0] #W "
+set-option -g window-status-separator " "
+set-option -g status-justify left
+
+# Right side of status bar
+set-option -g status-right-length 200
+set -g status-right "#{playerctl_short} | #(whoami)@#h "
+set -g @short_length "50"
+
+# set -g @short_length "30"
+# set -g @short_append_chars "..."
+# WEATHER='#(curl -s wttr.in/Berlin\?format\="%%t+%%C+%%w+%%m")'
+# set-option -g status-right "#[fg=colour7,bg=colour2]🌡 BER #[fg=colour7,bg=colour0] $WEATHER #[fg=colour7,bg=colour2]   #[fg=colour7,bg=colour0] #(whoami)@#h "
+
+# pane border
+set -g pane-border-style fg=colour238,bg=colour0
+set -g pane-active-border-style fg=colour2,bg=colour0
+
+# Pane number indicator
+set-option -g display-panes-colour colour0
+set-option -g display-panes-active-colour colour7
+
+# Clock mode
+# set-option -g clock-mode-colour colour7
+# set-option -g clock-mode-style 24
+
+# Message
+set -g message-style fg=default,bg=default
+
+# Activity
+set-option -g monitor-activity on
+set-option -g monitor-silence 0
+set-option -g monitor-bell on
+set-option -g activity-action other
+set-option -g visual-activity off
+
+# Window numbering
+set-option -g base-index 1
+set-option -g pane-base-index 1
+set-option -g renumber-windows on
+
+# select default layout
+set-option -g main-pane-width 65
+set-option -g main-pane-height 65
+
diff --git a/laptop/configs/tmux/tmux.conf b/laptop/configs/tmux/tmux.conf
index 8b556de..0ebfa47 100644
--- a/laptop/configs/tmux/tmux.conf
+++ b/laptop/configs/tmux/tmux.conf
@@ -6,10 +6,10 @@ set -g default-terminal "tmux-256color"
 set-option -sa terminal-overrides ",xterm-kitty:RGB"
 
 unbind C-o
-bind C-o display-popup -E "tms"
+bind C-o display-popup -E "~/.cargo/bin/tms"
 
 unbind C-j
-bind C-j display-popup -E "tms switch"
+bind C-j display-popup -E "~/.cargo/bin/tms switch"
 
 unbind %
 bind | split-window -h
diff --git a/laptop/configs/waybar/base16/base16-default-dark.css b/laptop/configs/waybar/base16/base16-default-dark.css
new file mode 100755
index 0000000..8d18a90
--- /dev/null
+++ b/laptop/configs/waybar/base16/base16-default-dark.css
@@ -0,0 +1,23 @@
+/*
+*
+* Base16 Default Dark
+* Author: Chris Kempson (http://chriskempson.com)
+*
+*/
+
+@define-color base00 #181818;
+@define-color base01 #282828;
+@define-color base02 #383838;
+@define-color base03 #585858;
+@define-color base04 #b8b8b8;
+@define-color base05 #d8d8d8;
+@define-color base06 #e8e8e8;
+@define-color base07 #f8f8f8;
+@define-color base08 #ab4642;
+@define-color base09 #dc9656;
+@define-color base0A #f7ca88;
+@define-color base0B #a1b56c;
+@define-color base0C #86c1b9;
+@define-color base0D #7cafc2;
+@define-color base0E #ba8baf;
+@define-color base0F #a16946;
diff --git a/laptop/configs/waybar/config b/laptop/configs/waybar/config
index 80f41e3..7984def 100644
--- a/laptop/configs/waybar/config
+++ b/laptop/configs/waybar/config
@@ -1,88 +1,62 @@
 {
-    "layer": "top",
-    "position": "top",
-    "mod": "dock",
-    "exclusive": true,
-    "passtrough": false,
-    "gtk-layer-shell": true,
-    "height": 0,
+  "spacing": 4,
+  // try to keep it 4px across the config
+  "height": 25,
+  "modules-left": ["hyprland/workspaces", "custom/icon", "hyprland/window"],
+  "modules-right": [
+    "tray",
+    "battery",
+    "pulseaudio",
+    "cpu",
+    "memory",
+    "temperature",
+    "clock",
+  ],
 
-    "modules-left": [
-        "hyprland/workspaces",
-    ],
+  /*
+    MODULES
+  */
+  "custom/icon": {
+    "exec": "~/.config/waybar/state",
+    "interval": 5,
+  },
+  "tray": {
+    "spacing": 10,
+  },
 
-    "modules-center": [
-	    "hyprland/window"
-    ],
-
-    "modules-right": [
-	"network",
-	"battery",
-        "pulseaudio",
-	    "clock",
-        "tray",
-    ],
-
-    "hyprland/window": {
-        "format": "{}"
-    },
-
-    "hyprland/workspaces": {
-        "on-scroll-up": "hyprctl dispatch workspace e+1",
-        "on-scroll-down": "hyprctl dispatch workspace e-1",
-        "all-outputs": true,
-        "on-click": "activate",
-        "format": "{icon}",
-        "format-icons": {
-	    "1": "1",
-	    "2": "2",
-	    "3": "3",
-	    "4": "4",
-	    "5": "5",
-	    "6": "6",
-	    "7": "7",
-	    "8": "8",
-	    "9": "9",
-	    "10": "10",
-        "11": "11",
-        "12": "12",
-        "13": "13"
-	    }
-    },
-
-    "tray": {
-        "icon-size": 20,
-        "tooltip": false,
-        "spacing": 10
-    },
-
-    "clock": {
-        "format": "{:%a %b %d, %H:%M}",
-        "tooltip-format": "<big>{:%Y %B}</big>\n\n<tt><small>{calendar}</small></tt>"
-    },
-
-    "pulseaudio": {
-        "format": "   {volume}% ",
-        "tooltip": false,
-        "format-muted": "  N/A",
-        "on-click": "pavucontrol &",
-        "scroll-step": 5
-    },
-
-    "network": {
-	"format-wifi": "   {essid} {signalStrength}% ",
-	"format-ethernet": "   {signalStrength}% ",
-	"format-disconnected": "   N/A "
-    },
-
-    "battery": {
-    	"states": {
-		"warning": 20,
-		"critical": 15
-	},
-	"format": "󰁹 {capacity}% ",
-	"format-charging": "󰂄 {capacity}% ",
-	"format-plugged": "󰂄 {capacity}% "
-    }
+  "hyprland/workspaces": {
+    "on-scroll-up": "hyprctl dispatch workspace e+1",
+    "on-scroll-down": "hyprctl dispatch workspace e-1",
+    "all-outputs": true,
+    "on-click": "activate",
+  },
+  "clock": {
+    // "timezone": "America/New_York",
+    "tooltip-format": "<big>[{:%Y %B}]</big>\n<tt><small>{calendar}</small></tt>",
+    "format": "[{:%H:%M}]",
+    "format-alt": "[{:%Y-%m-%d}]",
+  },
+  "cpu": {
+    "format": "[CPU:{usage}%]",
+    "tooltip": false,
+  },
+  "memory": {
+    "format": "[MEM:{percentage}%]",
+  },
+  "temperature": {
+    // "thermal-zone": 2,
+    // "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input",
+    "critical-threshold": 80,
+    "format-critical": "[!!{temperatureC}°C!!]",
+    "format": "[{temperatureC}°C]",
+  },
+  "battery": {
+    "format": "[BAT::{capacity}%]",
+  },
+  "pulseaudio": {
+    // "scroll-step": 1, // %, can be a float
+    "format": "[VOL:{volume}%]",
+    "format-muted": "[VOL: M]",
+    "on-click": "pavucontrol",
+  },
 }
-
diff --git a/laptop/configs/waybar/state b/laptop/configs/waybar/state
new file mode 100755
index 0000000..ee81287
Binary files /dev/null and b/laptop/configs/waybar/state differ
diff --git a/laptop/configs/waybar/style.css b/laptop/configs/waybar/style.css
index 70615a8..9ff83ee 100644
--- a/laptop/configs/waybar/style.css
+++ b/laptop/configs/waybar/style.css
@@ -1,50 +1,76 @@
+@define-color accent #383838;
+@define-color text #f8f8f8;
+@define-color invText #f8f8f8;
+/* text when background is accent */
+@define-color bg #181818;
+
+/* @import "./wal.css";
+@define-color accent @color5;
+@define-color bg @background;
+@define-color text @foreground; */
+
+@import "./base16/base16-default-dark.css";
+
+@define-color accent @base01;
+@define-color text @base07;
+@define-color invText @base07;
+/* text when background is accent */
+@define-color bg @base00;
+
 * {
-    border: none;
-    border-radius: 0;
-    padding: 0;
-    margin: 0;
-    font-size: 11px;
+	font-family: CartographCF Nerd Font;
+	font-size: 13px;
+	border-radius: 0px;
+	/* :[ */
+	min-height: 0px;
 }
 
 window#waybar {
-    background: #292828;
-    color: #ffffff;
+	background-color: @accent;
+	color: @text;
+	opacity: 1;
 }
 
-#custom-logo {
-    font-size: 18px;
-    margin: 0;
-    margin-left: 7px;
-    margin-right: 12px;
-    padding: 0;
-    font-family: NotoSans Nerd Font Mono;
+#workspaces {
+	background-color: transparent;
 }
 
 #workspaces button {
-    margin-left: 2px;
-    margin-right: 8px;
-    color: #ffffff;
+	padding: 0 5px;
+	color: @text;
 }
 
-#workspaces button:hover,
-#workspaces button:active {
-    background-color: #292828;
-    color: #ffffff;
+#workspaces button.active {
+	background-color: @accent;
+	color: @invText;
+	/* color: @background; */
 }
 
-#workspaces button.focused {
-    background-color: #383737;
+#pulseaudio,
+#cpu,
+#memory,
+#temperature,
+#battery,
+#clock,
+#tray,
+#custom-icon {
+	background-color: transparent;
+	color: @text;
+	margin: 0px;
 }
 
-#language {
-    margin-right: 7px;
+.modules-left {
+	background-color: @bg;
+	padding: 0px 0px 0px 0px;
 }
 
-#battery {
-    margin-left: 7px;
-    margin-right: 4px;
+#window {
+	color: @invText;
+	background-color: @accent;
+	padding-left: 4px;
 }
 
-#clock {
-    margin: 0px 6px;
+.modules-right {
+	background-color: @bg;
+	padding: 0px 0px 0px 0px;
 }
diff --git a/laptop/configs/wezterm/colors/melange_light.toml b/laptop/configs/wezterm/colors/melange_light.toml
new file mode 100644
index 0000000..25a809b
--- /dev/null
+++ b/laptop/configs/wezterm/colors/melange_light.toml
@@ -0,0 +1,29 @@
+[colors]
+foreground    = "#54433A"
+background    = "#F1F1F1"
+cursor_bg     = "#54433A"
+cursor_border = "#54433A"
+cursor_fg     = "#F1F1F1"
+selection_bg  = "#D9D3CE"
+selection_fg  = "#54433A"
+ansi = [
+  "#E9E1DB",
+  "#C77B8B",
+  "#6E9B72",
+  "#BC5C00",
+  "#7892BD",
+  "#BE79BB",
+  "#739797",
+  "#7D6658"
+]
+brights = [
+  "#A98A78",
+  "#BF0021",
+  "#3A684A",
+  "#A06D00",
+  "#465AA4",
+  "#904180",
+  "#3D6568",
+  "#54433A"
+]
+
diff --git a/laptop/configs/wezterm/colors/monochrome_glorb.toml b/laptop/configs/wezterm/colors/monochrome_glorb.toml
new file mode 100644
index 0000000..41eab95
--- /dev/null
+++ b/laptop/configs/wezterm/colors/monochrome_glorb.toml
@@ -0,0 +1,21 @@
+[colors]
+# The default text color
+foreground = "#868690"
+# The default background color
+background = "#0F1014"
+# Overrides the cell background color when the current cell is occupied by the
+# cursor and the cursor style is set to Block
+cursor_bg = "#ccb901"
+# Overrides the text color when the current cell is occupied by the cursor
+cursor_fg = "#868690"
+# Specifies the border color of the cursor when the cursor style is set to Block,
+# or the color of the vertical or horizontal bar when the cursor style is set to
+# Bar or Underline.
+cursor_border = "#ccb901"
+# the foreground color of selected text
+selection_fg = "#93939c"
+# the background color of selected text
+selection_bg = "#22222a"
+
+ansi = ["#131317", "#999EB2", "#ccc04c", "#D3D5DE", "#ccb901", "#E2E4ED", "#B6BAC8", "#868690"]
+brights = ["#575861", "#999EB2", "#ccc04c", "#D3D5DE", "#ccb901", "#E2E4ED", "#B6BAC8", "#868690"]
diff --git a/laptop/configs/wezterm/wezterm.lua b/laptop/configs/wezterm/wezterm.lua
index 639b7bb..e0ca9c1 100644
--- a/laptop/configs/wezterm/wezterm.lua
+++ b/laptop/configs/wezterm/wezterm.lua
@@ -5,42 +5,45 @@ local function font_with_fallback(name, params)
     return wezterm.font_with_fallback(names, params)
 end
 
-local font_name = "Cartograph CF Nerd Font"
+local font_name = {
+    family = "Cartograph CF Nerd Font",
+    harfbuzz_features = { 'calt = 0', 'clig = 0', 'liga=0' }
+}
 
 return {
     -- OpenGL for GPU acceleration, Software for CPU
     front_end = "OpenGL",
 
-     colors = {
-         foreground = "#bdbdbd",
-         background = "#080808",
-         cursor_bg = "#9e9e9e",
-         cursor_fg = "#080808",
-         selection_fg = "#080808",
-         selection_bg = "#b2ceee",
-    
-         ansi = {
-             "#323437",
-             "#ff5454",
-             "#8cc85f",
-             "#e3c78a",
-             "#80a0ff",
-             "#cf87e8",
-             "#79dac8",
-             "#c6c6c6",
-         },
-    
-         brights = {
-             "#949494",
-             "#ff5189",
-             "#36c692",
-             "#c2c292",
-             "#74b2ff",
-             "#ae81ff",
-             "#85dc85",
-             "#e4e4e4",
-         },
-     },
+    -- colors = {
+    --     foreground = "#bdbdbd",
+    --     background = "#080808",
+    --     cursor_bg = "#9e9e9e",
+    --     cursor_fg = "#080808",
+    --     selection_fg = "#080808",
+    --     selection_bg = "#b2ceee",
+    --
+    --     ansi = {
+    --         "#323437",
+    --         "#ff5454",
+    --         "#8cc85f",
+    --         "#e3c78a",
+    --         "#80a0ff",
+    --         "#cf87e8",
+    --         "#79dac8",
+    --         "#c6c6c6",
+    --     },
+    --
+    --     brights = {
+    --         "#949494",
+    --         "#ff5189",
+    --         "#36c692",
+    --         "#c2c292",
+    --         "#74b2ff",
+    --         "#ae81ff",
+    --         "#85dc85",
+    --         "#e4e4e4",
+    --     },
+    -- },
 
     -- Font config
     font = font_with_fallback(font_name),
@@ -98,7 +101,12 @@ return {
     -- General
     automatically_reload_config = true,
     inactive_pane_hsb = { saturation = 1.0, brightness = 1.0 },
-    window_background_opacity = 0.75,
+    window_background_opacity = 0.95,
     window_close_confirmation = "NeverPrompt",
     window_frame = { active_titlebar_bg = "#45475a", font = font_with_fallback(font_name, { bold = true }) },
+    check_for_updates = false,
+
+    color_scheme_dirs = { "~/.config/wezterm/colors" },
+
+    color_scheme = "monochrome_glorb"
 }