diff --git a/.gitignore b/.gitignore
index 2e569ea..581091d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,3 +54,5 @@ systemd/
 gedit/
 tilix/
 QtProject.conf
+pipewire/
+oomox/
diff --git a/alacritty/alacritty.yml b/alacritty/alacritty.yml
index 0a09c26..da060fe 100644
--- a/alacritty/alacritty.yml
+++ b/alacritty/alacritty.yml
@@ -26,8 +26,8 @@ window:
   # Blank space added around the window in pixels. This padding is scaled
   # by DPI and the specified value is always added at both opposing sides.
   padding:
-    x: 5
-    y: 10
+    x: 15
+    y: 15
 
   # Window decorations
   #
diff --git a/gtk-3.0/settings.ini b/gtk-3.0/settings.ini
index 2bfdcc1..1ed66ff 100644
--- a/gtk-3.0/settings.ini
+++ b/gtk-3.0/settings.ini
@@ -1,8 +1,8 @@
 [Settings]
 gtk-application-prefer-dark-theme=0
-gtk-theme-name=Nordic-darker
-gtk-icon-theme-name=Tela-circle-grey-dark
-gtk-font-name=Kanit Medium 10
+gtk-theme-name=oomox-Nord
+gtk-icon-theme-name=DarK-lb
+gtk-font-name=Kanit 10
 gtk-cursor-theme-name=Adwaita
 gtk-cursor-theme-size=0
 gtk-toolbar-style=GTK_TOOLBAR_ICONS
diff --git a/mako/config b/mako/config
index b2cf044..b3ba2cc 100644
--- a/mako/config
+++ b/mako/config
@@ -11,7 +11,7 @@ border-size=3
 border-radius=10
 max-icon-size=32
 
-background-color=#4c566add
+background-color=#2e3440ee
 text-color=#8fbcbb
 border-color=#5e81ac
 
diff --git a/sway/config b/sway/config
index fcb4257..a293c31 100644
--- a/sway/config
+++ b/sway/config
@@ -21,8 +21,9 @@ set $menu wofi -c ~/.config/wofi/config -s ~/.config/wofi/style.css -I
 set $gnome-schema org.gnome.desktop.interface
 exec_always {
     #gsettings set $gnome-schema gtk-theme 'NordSur-dark'
-    gsettings set $gnome-schema gtk-theme 'Nordic-darker'
-    gsettings set $gnome-schema icon-theme 'Tela-circle-black-dark'
+    gsettings set $gnome-schema gtk-theme 'oomox-Nord'
+    #gsettings set $gnome-schema icon-theme 'oomox-Nord'
+    gsettings set $gnome-schema icon-theme 'DarK-lb'
     gsettings set $gnome-schema font-name 'Kanit Light 10'
     gsettings set $gnome-schema monospace-font-name 'JetBrains Mono 10'
     gsettings set $gnome-schema document-font-name 'Kanit Light 10'
diff --git a/swaylock/config b/swaylock/config
index 7f601cb..94c4561 100644
--- a/swaylock/config
+++ b/swaylock/config
@@ -3,6 +3,7 @@ font=Kanit Medium
 indicator-radius=100
 indicator-thickness=20
 #indicator-idle-visible
+#no-unlock-indicator
 
 inside-color=4c566aee
 inside-clear-color=b48eadee
@@ -24,3 +25,11 @@ text-clear-color=2e3440ee
 text-ver-color=2e3440ee
 text-wrong-color=2e3440ee
 
+# Swaylock Effects options
+fade-in=1
+grace=5
+indicator
+clock
+screenshots
+#effect-pixelate=5
+effect-blur=5x10
diff --git a/waybar/style.css b/waybar/style.css
index 1907564..1e9b501 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -101,7 +101,8 @@ window#waybar.top {
 }
 #workspaces button {
 	color: @lightblue;
-	padding: 1px 5px 0px 7px;
+	margin: 0;
+	padding: 1px 5px 0px 5px;
 	border-radius: 6px;
 }
 #workspaces button.focused {
@@ -179,13 +180,16 @@ window#waybar.top {
 #taskbar,
 #tray,
 #window {
-	padding: 0px;
-	margin: 3px 5px 5px 5px;;
+	margin: 5px;
+	padding: 0;
+}
+#taskbar {
+	margin-top: 3px;
 }
 #taskbar button {
 	color: @lightblue;
 	border-radius: 6px;
-	padding-top: 5px;
+	padding: 5px 2px 0px 2px;
 }
 #taskbar button.active {
 	background: @nord3;