diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf
index e534fdf..23a379f 100755
--- a/hypr/hyprland.conf
+++ b/hypr/hyprland.conf
@@ -40,9 +40,7 @@ gestures {
 }
 
 # Window rules
-windowrule = float, ^(SnakePlusPlus)$
-windowrule = center, ^(SnakePlusPlus)$
-windowrulev2 = opacity 1.0 override, class:(steam_app.*)$
+source = ~/.config/hypr/windowrules.conf
 
 # General binds
 $mainMod = SUPER
diff --git a/hypr/theme.conf b/hypr/theme.conf
index a72a6f0..7a2950d 100644
--- a/hypr/theme.conf
+++ b/hypr/theme.conf
@@ -24,13 +24,13 @@ layerrule = blur,waybar
 source = ~/.config/hypr/frappe.conf
 
 general {
-    gaps_in = 3
-    gaps_out = 8
+    gaps_in = 15
+    gaps_out = 40, 160, 40, 160
     border_size = 3
     col.active_border = rgba(ca9ee6ff) rgba(f2d5cfff) 45deg
     col.inactive_border = rgba(b4befecc) rgba(6c7086cc) 45deg
     layout = dwindle
-    resize_on_border = true
+    resize_on_border = false
 }
 
 group {
@@ -41,7 +41,7 @@ group {
 }
 
 decoration {
-    rounding = 10
+    rounding = 0
     drop_shadow = false
     dim_special = 0.3
     #active_opacity = 1.0
diff --git a/hypr/windowrules.conf b/hypr/windowrules.conf
new file mode 100644
index 0000000..32d8bb8
--- /dev/null
+++ b/hypr/windowrules.conf
@@ -0,0 +1,35 @@
+
+# █░█░█ █ █▄░█ █▀▄ █▀█ █░█░█   █▀█ █░█ █░░ █▀▀ █▀
+# ▀▄▀▄▀ █ █░▀█ █▄▀ █▄█ ▀▄▀▄▀   █▀▄ █▄█ █▄▄ ██▄ ▄█
+
+
+# Main
+windowrulev2 = opacity 0.80 0.80,class:^(.*)$
+windowrulev2 = opacity 0.80 0.70,class:^(pavucontrol)$
+windowrulev2 = opacity 0.80 0.70,class:^(org.kde.polkit-kde-authentication-agent-1)$
+windowrulev2 = float, class:^(qt5ct)$
+windowrulev2 = float, class:^(nwg-look)$
+windowrulev2 = float, class:^(pavucontrol)$
+windowrulev2 = float, class:^(org.kde.polkit-kde-authentication-agent-1)$
+windowrulev2 = float, class:^(steam)$ 
+
+# Development
+windowrulev2 = float, class:^(Unity)$ 
+windowrulev2 = float, title:^(SnakePlusPlus)$ 
+windowrulev2 = center, title:^(SnakePlusPlus)$ 
+windowrulev2 = opacity 0.6, title:^(SnakePlusPlus)$ 
+windowrulev2 = float, title:^(TetrisPlusPlus)$ 
+windowrulev2 = center, title:^(TetrisPlusPlus)$ 
+
+# Games
+windowrulev2 = opacity 1.00 override 1.00 override, class:^(Minecraft.*)$
+windowrulev2 = pseudo, class:^(Minecraft.*)$
+windowrulev2 = size 2646 1108, class:^(Minecraft.*)$
+windowrulev2 = opacity 1.00 override 1.00 override, class:^(steam_app_.*)$
+windowrulev2 = pseudo, class:^(steam_app_.*)$
+windowrulev2 = size 2646 1108, class:^(steam_app_.*)$
+windowrulev2 = opacity 1.00 override 1.00 override, class:^(steam_proton)$
+windowrulev2 = pseudo, class:^(steam_proton)$
+windowrulev2 = size 2646 1108, class:^(steam_proton)$
+
+
diff --git a/waybar/config.json b/waybar/config.json
index 1393db0..d68ed08 100755
--- a/waybar/config.json
+++ b/waybar/config.json
@@ -3,7 +3,7 @@
         "name": "main",
         "layer": "top",
         "position": "top",
-        "height": 38,
+        "height": 42,
         "spacing": 4,
         "margin-top": 4,
         "margin-bottom": 0,
diff --git a/waybar/style.css b/waybar/style.css
index e29a7bf..268f4fa 100755
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -4,13 +4,22 @@
     border: none;
     border-radius: 0px;
     min-height: 0;
+    font-weight: bold;
 	font-size: 14px;
 	font-family: "Hack Nerd Font";
 }
 
 window#waybar {
+    background: @mantle;
     background-color: transparent;
 	color: @text;
+    border-bottom: 4px solid @crust;
+    border-radius: 0px;
+    padding: 4px;
+}
+
+window#waybar.hidden {
+    opacity: 0.2;
 }
 
 #workspaces {
@@ -31,6 +40,12 @@ window#waybar {
     transition: all 0.1s ease;
 }
 
+.modules-left,
+.modules-center,
+.modules-right {
+    padding: 0 4 4 4px;
+}
+
 #clock,
 #cpu,
 #disk,
@@ -41,6 +56,10 @@ window#waybar {
 #pulseaudio,
 #custom-poweroff,
 #custom-weather {
+    background-color: @base;
+    border-radius: 6px;
+    margin-left: 6px;
+    margin-right: 6px;
 	padding: 0 10px;
 }
 
@@ -59,3 +78,16 @@ window#waybar {
 #temperature {
     color: @sky;
 }
+
+
+
+
+
+#workspaces button.active {
+    background-color: alpha(@peach, 0.2);
+    border-radius: 2px;
+    margin-bottom: 2px;
+    transition: all 0.1s ease;
+}
+
+