diff --git a/.config/assets/wallpaper/orange-wallpaper.jpg b/.config/assets/wallpaper/orange-wallpaper.jpg
index 65b8a25..a9fac0a 100644
Binary files a/.config/assets/wallpaper/orange-wallpaper.jpg and b/.config/assets/wallpaper/orange-wallpaper.jpg differ
diff --git a/.config/matugen/config.toml b/.config/matugen/config.toml
index 8617021..756f95a 100644
--- a/.config/matugen/config.toml
+++ b/.config/matugen/config.toml
@@ -21,3 +21,16 @@ post_hook = 'swaync-client -rs'
 input_path = './templates/colors.conf'
 output_path = '~/.config/hypr/colors.conf'
 post_hook = 'sed -i "s/, /,/g" ~/.config/hypr/colors.conf'
+
+[templates.swaylock]
+input_path = './templates/config'
+output_path = '~/.config/swaylock/config'
+
+[templates.wlogout]
+input_path = './templates/wlogoutcolors.css'
+output_path = '~/.config/wlogout/colors.css'
+
+[templates.oh-my-posh]
+input_path = './templates/config.omp.json'
+output_path = '~/.config/oh-my-posh/config.omp.json'
+post_hook = 'sed -i "s/|/{/g" ~/.config/oh-my-posh/config.omp.json && sed -i "s/°/}/g" ~/.config/oh-my-posh/config.omp.json'
diff --git a/.config/matugen/templates/config b/.config/matugen/templates/config
new file mode 100644
index 0000000..60fb5d3
--- /dev/null
+++ b/.config/matugen/templates/config
@@ -0,0 +1,36 @@
+indicator
+indicator-idle-visible
+indicator-radius=150
+indicator-thickness=10
+inside-color={{colors.background.default.hex}}
+inside-clear-color={{colors.on_error_container.default.hex}}
+inside-caps-lock-color={{colors.background.default.hex}}
+inside-ver-color={{colors.primary_container.default.hex}}
+inside-wrong-color={{colors.error_container.default.hex}}
+key-hl-color={{colors.primary.default.hex}}
+line-uses-ring
+ring-color={{colors.primary_container.default.hex}}
+ring-clear-color={{colors.on_error.default.hex}}
+ring-caps-lock-color={{colors.primary.default.hex}}
+ring-ver-color={{colors.primary_fixed_dim.default.hex}}
+ring-wrong-color={{colors.on_error.default.hex}}
+separator-color={{colors.primary_fixed_dim.default.hex}}
+text-color={{colors.primary.default.hex}}
+text-clear-color={{colors.on_error.default.hex}}
+text-caps-lock-color={{colors.primary.default.hex}}
+text-ver-color={{colors.primary.default.hex}}
+text-wrong-color={{colors.error.default.hex}}
+text-caps-lock=CAPS-LOCK
+text-ver=Verifying...
+text-wrong=Try again
+
+clock
+timestr=%H:%M
+datestr=%A, %x
+
+scaling=stretch
+image=$HOME/.config/assets/wallpaper/any-wallpaper.jpg
+effect-blur=90x1
+effect-pixelate=5
+
+time-effects
diff --git a/.config/matugen/templates/config.omp.json b/.config/matugen/templates/config.omp.json
new file mode 100644
index 0000000..33b52cd
--- /dev/null
+++ b/.config/matugen/templates/config.omp.json
@@ -0,0 +1,68 @@
+{
+  "$schema": "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json",
+  "blocks": [
+    {
+      "type": "prompt",
+      "alignment": "left",
+      "segments": [
+        {
+          "properties": {
+            "cache_duration": "none"
+          },
+          "leading_diamond": "\ue0b6",
+          "trailing_diamond": "\ue0b4",
+          "foreground": "{{colors.surface.default.hex}}",
+          "background": "{{colors.tertiary.default.hex}}",
+          "type": "os",
+          "style": "diamond"
+        },
+        {
+          "properties": {
+            "cache_duration": "none"
+          },
+          "trailing_diamond": "\ue0b4",
+          "template": " || .UserName °°@|| .HostName °°",
+          "foreground": "{{colors.surface.default.hex}}",
+          "background": "{{colors.secondary.default.hex}}",
+          "type": "session",
+          "style": "diamond"
+        },
+        {
+          "properties": {
+            "cache_duration": "none"
+          },
+          "trailing_diamond": "\ue0b4",
+          "template": " || .PWD °° ",
+          "foreground": "{{colors.surface.default.hex}}",
+          "background": "{{colors.primary.default.hex}}",
+          "type": "path",
+          "style": "diamond"
+        },
+        {
+          "properties": {
+            "cache_duration": "none",
+            "fetch_status": true,
+            "fetch_upstream_icon": true,
+            "mapped_branches": {
+              "bug/*": "\ueaaf",
+              "feat/*": "\uf427"
+            },
+            "source": "cli",
+            "untracked_modes": {
+              "/Users/user/Projects/oh-my-posh/": "no"
+            }
+          },
+          "trailing_diamond": "\ue0b4",
+          "template": " || .UpstreamIcon °°|| .HEAD °°||if .BranchStatus °° || .BranchStatus °°|| end °°|| if .Working.Changed °° \uf044 || .Working.String °°|| end °°|| if and (.Working.Changed) (.Staging.Changed) °° || end °°|| if .Staging.Changed °° \uf046 || .Staging.String °°|| end °°|| if gt .StashCount 0 °° \uf0c7 || .StashCount °°|| end °°",
+          "foreground": "{{colors.surface.default.hex}}",
+          "background": "{{colors.tertiary_fixed_dim.default.hex}}",
+          "type": "git",
+          "style": "diamond"
+        }
+      ],
+      "newline": true
+    }
+  ],
+  "version": 3,
+  "final_space": true
+}
diff --git a/.config/matugen/templates/wlogoutcolors.css b/.config/matugen/templates/wlogoutcolors.css
new file mode 100644
index 0000000..ae4e7bf
--- /dev/null
+++ b/.config/matugen/templates/wlogoutcolors.css
@@ -0,0 +1,5 @@
+@define-color background {{colors.background.default.rgba  | set_alpha: 0.7}};
+@define-color primary {{colors.primary.default.hex}};
+@define-color secondary {{colors.secondary.default.hex | set_lightness: -30.0}};
+@define-color tertiary {{colors.tertiary.default.hex | set_lightness: -30.0}};
+@define-color surface_bright {{colors.surface_bright.default.hex}};
diff --git a/.config/oh-my-posh/config.omp.json b/.config/oh-my-posh/config.omp.json
index ff05080..4eb6fc9 100644
--- a/.config/oh-my-posh/config.omp.json
+++ b/.config/oh-my-posh/config.omp.json
@@ -11,8 +11,8 @@
           },
           "leading_diamond": "\ue0b6",
           "trailing_diamond": "\ue0b4",
-          "foreground": "black",
-          "background": "#fab387",
+          "foreground": "#151218",
+          "background": "#f1b7c2",
           "type": "os",
           "style": "diamond"
         },
@@ -22,8 +22,8 @@
           },
           "trailing_diamond": "\ue0b4",
           "template": " {{ .UserName }}@{{ .HostName }}",
-          "foreground": "black",
-          "background": "#94e2d5",
+          "foreground": "#151218",
+          "background": "#cec2db",
           "type": "session",
           "style": "diamond"
         },
@@ -33,8 +33,8 @@
           },
           "trailing_diamond": "\ue0b4",
           "template": " {{ .PWD }} ",
-          "foreground": "black",
-          "background": "#cba6f7",
+          "foreground": "#151218",
+          "background": "#d6bbfb",
           "type": "path",
           "style": "diamond"
         },
@@ -53,9 +53,9 @@
             }
           },
           "trailing_diamond": "\ue0b4",
-          "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf0c7 {{ .StashCount }}{{ end }}",
-          "foreground": "black",
-          "background": "#f5c2e7",
+          "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} {{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf0c7 {{ .StashCount }}{{ end }}",
+          "foreground": "#151218",
+          "background": "#f1b7c2",
           "type": "git",
           "style": "diamond"
         }
diff --git a/.config/oh-my-posh/config.omp.json.bak b/.config/oh-my-posh/config.omp.json.bak
deleted file mode 100644
index 475eed5..0000000
--- a/.config/oh-my-posh/config.omp.json.bak
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  "$schema": "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json",
-  "final_space": true,
-  "blocks": [
-    {
-      "alignment": "left",
-      "newline": true,
-      "segments": [
-        {
-          "type": "os",
-          "style": "diamond",
-          "foreground": "black",
-          "background": "#fab387",
-          "leading_diamond": "\ue0b6",
-          "trailing_diamond": "\ue0b4"
-        },
-        {
-          "type": "session",
-          "style": "diamond",
-          "foreground": "black",
-          "background": "#94e2d5",
-          "template": " {{ .UserName }}@{{ .HostName }}",
-          "trailing_diamond": "\ue0b4"
-        },
-        {
-          "type": "path",
-          "style": "diamond",
-          "foreground": "black",
-          "background": "#cba6f7",
-          "template": " {{ .PWD }} ",
-          "trailing_diamond": "\ue0b4"
-        },
-        {
-          "type": "git",
-          "style": "diamond",
-          "foreground": "black",
-          "background": "#f5c2e7",
-          "trailing_diamond": "\ue0b4",
-          "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }}  {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }}  {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }}  {{ .StashCount }}{{ end }}",
-          "properties": {
-            "fetch_status": true,
-            "fetch_upstream_icon": true,
-            "untracked_modes": {
-              "/Users/user/Projects/oh-my-posh/": "no"
-            },
-            "source": "cli",
-            "mapped_branches": {
-              "feat/*": "",
-              "bug/*": ""
-            }
-          }
-        }
-      ],
-      "type": "prompt"
-    }
-  ],
-  "version": 2
-}
diff --git a/.config/scripts/set-wallpaper.sh b/.config/scripts/set-wallpaper.sh
index b9e77b9..ef8edb3 100755
--- a/.config/scripts/set-wallpaper.sh
+++ b/.config/scripts/set-wallpaper.sh
@@ -8,3 +8,5 @@ wallpapername=$(sed "s_-wallpaper\.\w*__" <<<$(sed "s_.*wallpaper/__" <<<"$1"))
 wallpaperextension=$(sed "s_.*-wallpaper\.__" <<<"$1")
 wallpaper=$wallpapername-wallpaper.$wallpaperextension
 sed -i "s_wallpaper/[^ ]*\.\w*_wallpaper/${wallpaper}_" ~/.config/hypr/lastWallpaper.conf
+sed -i "s_image=.*_image=${1}_" ~/.config/swaylock/config
+sed -i "s_${HOME}_~_" ~/.config/swaylock/config
diff --git a/.config/swaylock/config b/.config/swaylock/config
index 4920505..5bb8f08 100644
--- a/.config/swaylock/config
+++ b/.config/swaylock/config
@@ -2,24 +2,24 @@ indicator
 indicator-idle-visible
 indicator-radius=150
 indicator-thickness=10
-inside-color=313244
-inside-clear-color=f9e2af
-inside-caps-lock-color=eba0ac
-inside-ver-color=89dceb
-inside-wrong-color=f5c2e7
-key-hl-color=b4befe
+inside-color=#151218
+inside-clear-color=#ffdad6
+inside-caps-lock-color=#151218
+inside-ver-color=#523c73
+inside-wrong-color=#93000a
+key-hl-color=#d6bbfb
 line-uses-ring
-ring-color=6c7086
-ring-clear-color=fab387
-ring-caps-lock-color=6c7086
-ring-ver-color=89b4fa
-ring-wrong-color=f38ba8
-separator-color=6c7086
-text-color=cdd6f4
-text-clear-color=6c7086
-text-caps-lock-color=cdd6f4
-text-ver-color=6c7086
-text-wrong-color=6c7086
+ring-color=#523c73
+ring-clear-color=#690005
+ring-caps-lock-color=#d6bbfb
+ring-ver-color=#d6bbfb
+ring-wrong-color=#690005
+separator-color=#d6bbfb
+text-color=#d6bbfb
+text-clear-color=#690005
+text-caps-lock-color=#d6bbfb
+text-ver-color=#d6bbfb
+text-wrong-color=#ffb4ab
 text-caps-lock=CAPS-LOCK
 text-ver=Verifying...
 text-wrong=Try again
@@ -29,7 +29,7 @@ timestr=%H:%M
 datestr=%A, %x
 
 scaling=stretch
-image=$HOME/.config/assets/purple-wallpaper.jpg
+image=~/.config/assets/wallpaper/purple-wallpaper.jpg
 effect-blur=90x1
 effect-pixelate=5
 
diff --git a/.config/wlogout/colors.css b/.config/wlogout/colors.css
new file mode 100644
index 0000000..aefdb66
--- /dev/null
+++ b/.config/wlogout/colors.css
@@ -0,0 +1,5 @@
+@define-color background rgba(21, 18, 24, 0.7);
+@define-color primary #d6bbfb;
+@define-color secondary #8162a2;
+@define-color tertiary #d83755;
+@define-color surface_bright #3b383e;
diff --git a/.config/wlogout/style.css b/.config/wlogout/style.css
index 9d2e000..e170417 100644
--- a/.config/wlogout/style.css
+++ b/.config/wlogout/style.css
@@ -1,22 +1,24 @@
+@import url("colors.css");
+
 * {
   background-image: none;
   box-shadow: none;
 }
 
 window {
-  background-color: rgba(12, 12, 12, 0.5);
+  background-color: @background;
 }
 
 button {
-  border: 0.5em solid #b4befe;
+  border: 0.5em solid @primary;
   border-radius: 0;
-  color: #cba6f7;
-  background-color: #45475a;
+  background-color: @surface_bright;
   background-repeat: no-repeat;
   background-position: center;
   background-size: 15%;
   transition: ease-in-out 0.2s;
   margin: 10em 0 10em 0;
+  color: transparent;
 }
 
 #lock {
@@ -58,13 +60,13 @@ button {
 }
 
 button:focus {
-  background-color: rgba(148, 226, 213, 0.5);
+  background-color: @secondary;
   outline-style: none;
 }
 
 button:active,
 button:hover {
-  background-color: rgba(203, 166, 247, 0.5);
+  background-color: @tertiary;
   outline-style: none;
   margin: 3em 0 3em 0;
   border-radius: 5em;
@@ -83,5 +85,5 @@ button:hover {
 #reboot:active,
 #reboot:hover {
   border-radius: 5em 5em 5em 5em;
-  border: 0.5em solid #b4befe;
+  border: 0.5em solid @primary;
 }
diff --git a/.config/wlogout/style.css.bakk b/.config/wlogout/style.css.bakk
deleted file mode 100644
index 3e5e435..0000000
--- a/.config/wlogout/style.css.bakk
+++ /dev/null
@@ -1,81 +0,0 @@
-* {
-    background-image: none;
-    font-size: 5px;
-}
-
-
-window {
-    background-color: transparent;
-}
-
-button {
-    color: red;
-    background-color: purple;
-    outline-style: none;
-    border: none;
-    border-width: 0px;
-    background-repeat: no-repeat;
-    background-position: center;
-    background-size: 10%;
-    border-radius: 0px;
-    box-shadow: none;
-    text-shadow: none;
-    animation: gradient_f 20s ease-in infinite;
-}
-
-button:focus {
-    background-color: purple;
-    background-size: 20%;
-}
-
-button:hover {
-    background-color: purple;
-    background-size: 25%;
-    border-radius: 50px;
-    animation: gradient_f 20s ease-in infinite;
-    transition: all 0.3s cubic-bezier(.55,0.0,.28,1.682);
-}
-
-button:hover#lock {
-    border-radius: 50px 50px 0px 50px;
-    margin : 5px 0px 0px 5px;
-}
-
-button:hover#logout {
-    border-radius: 50px 0px 50px 50px;
-    margin : 0px 0px 5px 5px;
-}
-
-button:hover#shutdown {
-    border-radius: 50px 50px 50px 0px;
-    margin : 5px 5px 0px 0px;
-}
-
-button:hover#reboot {
-    border-radius: 0px 50px 50px 50px;
-    margin : 0px 5px 5px 0px;
-}
-
-#lock {
-    background-image: image(url("/user/share/wlogout/icons/lock.png"), url("/usr/share/wlogout/icons/lock.png"), url("/usr/local/share/wlogout/icons/lock.png"));
-    border-radius: 5px 0px 0px 0px;
-    margin : 5px 0px 0px 5px;
-}
-
-#logout {
-    background-image: image(url("/user/share/wlogout/icons/lock.png"), url("/usr/share/wlogout/icons/logout.png"), url("/usr/local/share/wlogout/icons/logout.png"));
-    border-radius: 0px 0px 0px 5px;
-    margin : 0px 0px 5px 5px;
-}
-
-#shutdown {
-    background-image: image(url("/user/share/wlogout/icons/lock.png"), url("/usr/share/wlogout/icons/shutdown.png"), url("/usr/local/share/wlogout/icons/shutdown.png"));
-    border-radius: 0px 5px 0px 0px;
-    margin : 5px 5px 0px 0px;
-}
-
-#reboot {
-    background-image: image(url("/user/share/wlogout/icons/lock.png"), url("/usr/share/wlogout/icons/reboot.png"), url("/usr/local/share/wlogout/icons/reboot.png"));
-    border-radius: 0px 0px 5px 0px;
-    margin : 0px 5px 5px 0px;
-}