diff --git a/gui/sway/config b/gui/sway/base
similarity index 93%
rename from gui/sway/config
rename to gui/sway/base
index 29a6007..db4e586 100644
--- a/gui/sway/config
+++ b/gui/sway/base
@@ -1,13 +1,4 @@
-# This file has been auto-generated by i3-config-wizard(1).
-# It will not be overwritten, so edit it as you like.
-#
-# Should you change your keyboard layout some time, delete
-# this file and re-run i3-config-wizard(1).
-#
-
-# i3 config file (v4)
-#
-# Please see https://i3wm.org/docs/userguide.html for a complete reference!
+# This file serves as the base config I desire across machines
 set $mod Mod4
 
 # Font for window titles. Will also be used by the bar unless a different font
@@ -26,9 +17,6 @@ exec_always wallpaper.sh
 # waybar
 exec_always "killall waybar; waybar"
 
-workspace 1 output DP-2
-workspace 2 output DP-3
-
 # loading layout
 assign [class="st-256color"] 1
 assign [class="Brave-browser"] 2
diff --git a/gui/sway/desktop b/gui/sway/desktop
new file mode 100644
index 0000000..1e88c67
--- /dev/null
+++ b/gui/sway/desktop
@@ -0,0 +1,4 @@
+include base
+
+workspace 1 output DP-2
+workspace 2 output DP-3
diff --git a/gui/sway/thinkpad b/gui/sway/thinkpad
new file mode 100644
index 0000000..2cb21bf
--- /dev/null
+++ b/gui/sway/thinkpad
@@ -0,0 +1 @@
+include base
diff --git a/gui/waybar/config b/gui/waybar/desktop
similarity index 100%
rename from gui/waybar/config
rename to gui/waybar/desktop
diff --git a/gui/waybar/style.css b/gui/waybar/desktop-style.css
similarity index 100%
rename from gui/waybar/style.css
rename to gui/waybar/desktop-style.css
diff --git a/gui/waybar/thinkpad b/gui/waybar/thinkpad
new file mode 100644
index 0000000..87e5a93
--- /dev/null
+++ b/gui/waybar/thinkpad
@@ -0,0 +1,49 @@
+{
+    "layer": "top",
+    "modules-left": ["sway/workspaces", "sway/window", "pulseaudio/slider"],
+    "modules-center": ["custom/weather"],
+    "modules-right": ["cpu", "memory", "network", "custom/bg", "custom/date"],
+    "sway/workspaces": {
+        "all-outputs": true
+    },
+    "sway/window": {
+        "all-outputs": true,
+        "max-length": 20
+    },
+    "pulseaudio/slider": {
+        "min": 0,
+        "max": 100
+    },
+    "custom/spotify-scroll": {
+
+    },
+    "custom/weather": {
+        "exec": "weather -pd",
+        "on-click": "i3-scratchpad.sh scratch st -n scratch -e weather -f",
+        "on-click-right": "weather -r",
+        "on-click-midde": "i3-scratchpad.sh scratch st -n scratch -e weather -pf"
+    },
+    "cpu": {
+        "format": "CPU: {usage}%"
+    },
+    "memory": {
+        "format": "RAM: {percentage}%",
+        "tooltip-format": "RAM: {used}/{total} GiB"
+    },
+    "network": {
+        "interval": 2,
+        "format-ethernet": "ETH: {bandwidthTotalBytes}",
+        "format-wifi": "WLAN: {ssid}",
+        "tooltip-format": "DOWN: {bandwidthDownBits} UP: {bandwidthUpBits} IP: {ipaddr}"
+    },
+    "custom/bg": {
+        "exec": "echo -e '\uf1c5'",
+        "interval": "once",
+        "on-click": "wallpaper.sh -s"
+    },
+    "custom/date": {
+        "exec": "date +'%A, %b %d %l:%M %P'",
+        "interval": 10
+    }
+}
+
diff --git a/gui/waybar/thinkpad-style.css b/gui/waybar/thinkpad-style.css
new file mode 100644
index 0000000..52f5f95
--- /dev/null
+++ b/gui/waybar/thinkpad-style.css
@@ -0,0 +1,135 @@
+* {
+    border: none;
+    border-radius: 0;
+    font-family: Hack Nerd Font, Roboto, Helvetica, Arial, sans-serif;
+    min-height: 0;
+}
+
+window.LVDS-1 * {
+    font-size: 12pt;
+}
+
+window#waybar {
+    background-color: transparent;
+    background-color: transparent;
+    color: #ddd;
+}
+
+window#waybar.empty {
+    color: rgba(0,0,0,0);
+}
+
+#workspaces button {
+    padding: 0 5px;
+    color: #ddd;
+    background-color: rgba(29, 31, 21, 0.8);
+}
+
+#workspaces button:hover {
+    background: rgba(0, 0, 0, 0.2);
+    box-shadow: inset 0 3px #ffffff;
+}
+
+#workspaces button.focused {
+    background-color: #64727D;
+    box-shadow: inset 0 3px #ffffff;
+}
+
+#workspaces button.urgent {
+    background-color: #eb4d4b;
+}
+
+#mode {
+    background-color: #64727D;
+    border-top: 3px solid #ffffff;
+}
+
+#backlight,
+#battery.bat1,
+#battery.bat2,
+#clock,
+#cpu,
+#custom-mail,
+#custom-poweroff,
+#custom-weather,
+#disk,
+#idle_inhibitor,
+#memory,
+#mode,
+#network.vpn,
+#network.wifi,
+#network.ethernet,
+#network.disconnected,
+#custom-date,
+#sway-window,
+#sway-workspaces,
+#pulseaudio,
+#custom-weather,
+#taskbar,
+#temperature,
+#tray {
+    padding: 0 5px;
+    margin: 2px;
+    color: #ddd;
+    border-radius: 7px;
+    background-color: rgba(29, 31, 21, 0.6);
+}
+
+#custom-bg {
+    padding: 0 10px 0px 5px;
+    margin: 2px;
+    color: #ddd;
+    border-radius: 7px;
+    background-color: rgba(29, 31, 21, 0.6);
+}
+
+#pulseaudio-slider slider {
+    min-height: 0px;
+    min-width: 0px;
+    opacity: 0;
+    background-image: none;
+    border: none;
+    box-shadow: none;
+}
+#pulseaudio-slider trough {
+    min-height: 10px;
+    min-width: 80px;
+    border-radius: 5px;
+    background-color: black;
+}
+#pulseaudio-slider highlight {
+    min-width: 5px;
+    border-radius: 5px;
+    background-color: green;
+}
+
+@keyframes blink {
+    to {
+        background-color: #ffffff;
+        color: #000000;
+    }
+}
+
+#battery.bat2.critical:not(.charging) {
+    background-color: #f53c3c;
+    color: #ffffff;
+    animation-name: blink;
+    animation-duration: 0.5s;
+    animation-timing-function: linear;
+    animation-iteration-count: infinite;
+    animation-direction: alternate;
+}
+
+#temperature.critical {
+    background-color: #eb4d4b;
+}
+
+#taskbar button:hover {
+    background: rgba(0, 0, 0, 0.2);
+    box-shadow: inset 0 3px #ffffff;
+}
+
+#taskbar button.active {
+    background-color: #64727D;
+    box-shadow: inset 0 3px #ffffff;
+}
diff --git a/meta/configs/sway.desktop.yaml b/meta/configs/sway.desktop.yaml
index 76fe621..490ffa5 100644
--- a/meta/configs/sway.desktop.yaml
+++ b/meta/configs/sway.desktop.yaml
@@ -1,3 +1,4 @@
 - link:
-    ~/.config/sway: gui/sway
+    ~/.config/sway/config: gui/sway/desktop
+    ~/.config/sway/lock.png: gui/sway/lock.png
     ~/.local/bin/swaylock-blur: bin/swaylock-blur
diff --git a/meta/configs/sway.thinkpad.yaml b/meta/configs/sway.thinkpad.yaml
new file mode 100644
index 0000000..1f3d10a
--- /dev/null
+++ b/meta/configs/sway.thinkpad.yaml
@@ -0,0 +1,4 @@
+- link:
+    ~/.config/sway/config: gui/sway/thinkpad
+    ~/.config/sway/lock.png: gui/sway/lock.png
+    ~/.local/bin/swaylock-blur: bin/swaylock-blur
diff --git a/meta/configs/waybar.desktop.yaml b/meta/configs/waybar.desktop.yaml
index df83526..8a119df 100644
--- a/meta/configs/waybar.desktop.yaml
+++ b/meta/configs/waybar.desktop.yaml
@@ -1,2 +1,4 @@
 - link:
-    ~/.config/waybar: gui/waybar
+    ~/.config/waybar/config: gui/waybar/desktop
+    ~/.config/waybar/style.css: gui/waybar/desktop-style.css
+
diff --git a/meta/configs/waybar.thinkpad.yaml b/meta/configs/waybar.thinkpad.yaml
new file mode 100644
index 0000000..6338f0b
--- /dev/null
+++ b/meta/configs/waybar.thinkpad.yaml
@@ -0,0 +1,3 @@
+- link:
+    ~/.config/waybar/config: gui/waybar/thinkpad
+    ~/.config/waybar/style.css: gui/waybar/thinkpad-style.css
diff --git a/meta/profiles/thinkpad b/meta/profiles/thinkpad
index beea5a9..fd83afe 100644
--- a/meta/profiles/thinkpad
+++ b/meta/profiles/thinkpad
@@ -1,6 +1,13 @@
+# base profile
+
 profile/arch
+
+# thinkpad specific
 st.thinkpad
 sway.thinkpad
+waybar.thinkpad
+
+# utilities
 calcurse
 seafile
 passwords
diff --git a/shells/oh-my-zsh/custom/themes/powerlevel10k b/shells/oh-my-zsh/custom/themes/powerlevel10k
index 36cce9a..5bba4b8 160000
--- a/shells/oh-my-zsh/custom/themes/powerlevel10k
+++ b/shells/oh-my-zsh/custom/themes/powerlevel10k
@@ -1 +1 @@
-Subproject commit 36cce9a088c8cd7d7b1a3adccc74cf2a130c51e0
+Subproject commit 5bba4b849b04da665d9776930f47371ebb9974a4
diff --git a/src/fzf b/src/fzf
index a714e76..90b8187 160000
--- a/src/fzf
+++ b/src/fzf
@@ -1 +1 @@
-Subproject commit a714e76ae17985708dde9e87ad59002c1616906f
+Subproject commit 90b818788249bb080f9eddcc4b36ad4080b55c5c
diff --git a/src/tmux-mem-cpu-load b/src/tmux-mem-cpu-load
index 9a9abc5..bf0b272 160000
--- a/src/tmux-mem-cpu-load
+++ b/src/tmux-mem-cpu-load
@@ -1 +1 @@
-Subproject commit 9a9abc5d13d94aa404c02d19b7184143d020ecb7
+Subproject commit bf0b2721df35ec195798cc493d356e6a70aac8f2