diff --git a/hyprland/keybinds.conf b/hyprland/keybinds.conf
index 71ac299..e20a69a 100644
--- a/hyprland/keybinds.conf
+++ b/hyprland/keybinds.conf
@@ -28,11 +28,7 @@ bindl = Ctrl+Super, Minus, global, caelestia:mediaPrevious
 bindl = , XF86AudioPrev, global, caelestia:mediaPrevious
 bindl = , XF86AudioStop, global, caelestia:mediaStop
 
-#bind = Super, A, exec, caelestia shell toggle sidebar
-#bind = Super+Alt, M, exec, caelestia shell toggle mediadisplay
-#bindir = Super, Super_L, exec, caelestia shell -t launcher
-#bindr = Ctrl+Super, R, exec, caelestia shell reload-css
-#bindr = Ctrl+Super+Shift, R, exec, systemctl --user restart caelestia-shell.service
+bindr = Ctrl+Super+Shift, R, exec, systemctl --user restart caelestia-shell.service
 bindr = Ctrl+Super+Alt, R, exec, hyprctl reload
 
 # Go to workspace #
@@ -47,16 +43,16 @@ bind = Super, 8, exec, caelestia workspace-action workspace 8
 bind = Super, 9, exec, caelestia workspace-action workspace 9
 bind = Super, 0, exec, caelestia workspace-action workspace 10
 # Go to workspace group #
-bind = Ctrl+Super, 1, exec, caelestia workspace-action workspacegroup 1
-bind = Ctrl+Super, 2, exec, caelestia workspace-action workspacegroup 2
-bind = Ctrl+Super, 3, exec, caelestia workspace-action workspacegroup 3
-bind = Ctrl+Super, 4, exec, caelestia workspace-action workspacegroup 4
-bind = Ctrl+Super, 5, exec, caelestia workspace-action workspacegroup 5
-bind = Ctrl+Super, 6, exec, caelestia workspace-action workspacegroup 6
-bind = Ctrl+Super, 7, exec, caelestia workspace-action workspacegroup 7
-bind = Ctrl+Super, 8, exec, caelestia workspace-action workspacegroup 8
-bind = Ctrl+Super, 9, exec, caelestia workspace-action workspacegroup 9
-bind = Ctrl+Super, 0, exec, caelestia workspace-action workspacegroup 10
+bind = Ctrl+Super, 1, exec, caelestia workspace-action -g workspace 1
+bind = Ctrl+Super, 2, exec, caelestia workspace-action -g workspace 2
+bind = Ctrl+Super, 3, exec, caelestia workspace-action -g workspace 3
+bind = Ctrl+Super, 4, exec, caelestia workspace-action -g workspace 4
+bind = Ctrl+Super, 5, exec, caelestia workspace-action -g workspace 5
+bind = Ctrl+Super, 6, exec, caelestia workspace-action -g workspace 6
+bind = Ctrl+Super, 7, exec, caelestia workspace-action -g workspace 7
+bind = Ctrl+Super, 8, exec, caelestia workspace-action -g workspace 8
+bind = Ctrl+Super, 9, exec, caelestia workspace-action -g workspace 9
+bind = Ctrl+Super, 0, exec, caelestia workspace-action -g workspace 10
 # Go to workspace -1/+1
 bind = Super, mouse_down, workspace, -1
 bind = Super, mouse_up, workspace, +1
@@ -82,16 +78,16 @@ bind = Super+Alt, 8, exec, caelestia workspace-action movetoworkspace 8
 bind = Super+Alt, 9, exec, caelestia workspace-action movetoworkspace 9
 bind = Super+Alt, 0, exec, caelestia workspace-action movetoworkspace 10
 # Move window to workspace group #
-bind = Ctrl+Super+Alt, 1, exec, caelestia workspace-action movetoworkspacegroup 1
-bind = Ctrl+Super+Alt, 2, exec, caelestia workspace-action movetoworkspacegroup 2
-bind = Ctrl+Super+Alt, 3, exec, caelestia workspace-action movetoworkspacegroup 3
-bind = Ctrl+Super+Alt, 4, exec, caelestia workspace-action movetoworkspacegroup 4
-bind = Ctrl+Super+Alt, 5, exec, caelestia workspace-action movetoworkspacegroup 5
-bind = Ctrl+Super+Alt, 6, exec, caelestia workspace-action movetoworkspacegroup 6
-bind = Ctrl+Super+Alt, 7, exec, caelestia workspace-action movetoworkspacegroup 7
-bind = Ctrl+Super+Alt, 8, exec, caelestia workspace-action movetoworkspacegroup 8
-bind = Ctrl+Super+Alt, 9, exec, caelestia workspace-action movetoworkspacegroup 9
-bind = Ctrl+Super+Alt, 0, exec, caelestia workspace-action movetoworkspacegroup 10
+bind = Ctrl+Super+Alt, 1, exec, caelestia workspace-action -g movetoworkspace 1
+bind = Ctrl+Super+Alt, 2, exec, caelestia workspace-action -g movetoworkspace 2
+bind = Ctrl+Super+Alt, 3, exec, caelestia workspace-action -g movetoworkspace 3
+bind = Ctrl+Super+Alt, 4, exec, caelestia workspace-action -g movetoworkspace 4
+bind = Ctrl+Super+Alt, 5, exec, caelestia workspace-action -g movetoworkspace 5
+bind = Ctrl+Super+Alt, 6, exec, caelestia workspace-action -g movetoworkspace 6
+bind = Ctrl+Super+Alt, 7, exec, caelestia workspace-action -g movetoworkspace 7
+bind = Ctrl+Super+Alt, 8, exec, caelestia workspace-action -g movetoworkspace 8
+bind = Ctrl+Super+Alt, 9, exec, caelestia workspace-action -g movetoworkspace 9
+bind = Ctrl+Super+Alt, 0, exec, caelestia workspace-action -g movetoworkspace 10
 # Move window to workspace -1/+1
 binde = Super+Alt, Page_Up, movetoworkspace, -1
 binde = Super+Alt, Page_Down, movetoworkspace, +1
@@ -161,36 +157,15 @@ bind = Ctrl+Alt, R, exec, caelestia record  # Record screen
 bind = Super+Shift+Alt, R, exec, caelestia record -r  # Record region
 bind = Super+Shift, C, exec, hyprpicker -a  # Colour picker
 
-# Media
-#bindl = Ctrl+Super, Space, exec, caelestia shell media play-pause
-#bindl = , XF86AudioPlay, exec, caelestia shell media play-pause
-#bindl = , XF86AudioPause, exec, caelestia shell media play-pause
-#bindl = Ctrl+Super, Equal, exec, caelestia shell media next
-#bindl = , XF86AudioNext, exec, caelestia shell media next
-#bindl = Ctrl+Super, Minus, exec, caelestia shell media previous
-#bindl = , XF86AudioPrev, exec, caelestia shell media previous
-#bindl = , XF86AudioStop, exec, caelestia shell media stop
-
 # Volume
 bindl = , XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle
 bindl = Super+Shift, M, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle
 bindle = , XF86AudioRaiseVolume, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ 0; wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 10%+
 bindle = , XF86AudioLowerVolume, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ 0; wpctl set-volume @DEFAULT_AUDIO_SINK@ 10%-
 
-# Brightness
-#bindle = , XF86MonBrightnessUp, exec, caelestia shell brightness 10%+
-#bindle = , XF86MonBrightnessDown, exec, caelestia shell brightness 10%-
-
 # Power
-#bind = Ctrl+Alt, Delete, exec, caelestia shell -t session
 bind = Ctrl+Shift+Alt, Delete, exec, pkill wlogout || wlogout -p layer-shell
 
-# Lock indicators
-#bindlni = , Caps_Lock, exec, caelestia shell show lock-caps
-#bindlnri = , Caps_Lock, exec, caelestia shell show lock-caps
-#bindlni = , Num_Lock, exec, caelestia shell show lock-num
-#bindlnri = , Num_Lock, exec, caelestia shell show lock-num
-
 # Lock and sleep
 bind = Super, L, exec, loginctl lock-session
 bind = Super+Shift, L, exec, systemctl suspend-then-hibernate
diff --git a/scheme/default.conf b/scheme/default.conf
index 5d3f7ae..d4c5533 100644
--- a/scheme/default.conf
+++ b/scheme/default.conf
@@ -1,31 +1,81 @@
-$rosewater = edcbc5
-$flamingo = d3a4a4
-$pink = d792c6
-$mauve = c678dd
-$red = be5046
-$maroon = e06c75
-$peach = d19a66
-$yellow = e5c07b
-$green = 98c379
-$teal = 56b6c2
-$sky = 90ccd7
-$sapphire = 389dcc
-$blue = 61afef
-$lavender = 8e98d9
-$text = abb2bf
-$subtext1 = 95a0b5
-$subtext0 = 838b9c
-$overlay2 = 767f8f
-$overlay1 = 666e7c
-$overlay0 = 5c6370
-$surface2 = 4b5263
-$surface1 = 3c414f
-$surface0 = 30343e
-$base = 282c34
-$mantle = 21242b
-$crust = 1e2126
-$success = 98c379
-$error = be5046
-$primary = d19a66
-$secondary = 61afef
-$tertiary = 98c379
+$primary_paletteKeyColor = 8D7526
+$secondary_paletteKeyColor = 827656
+$tertiary_paletteKeyColor = 5E7F63
+$neutral_paletteKeyColor = 7C766B
+$neutral_variant_paletteKeyColor = 7D7667
+$background = 16130B
+$onBackground = EAE2D4
+$surface = 16130B
+$surfaceDim = 16130B
+$surfaceBright = 3D392F
+$surfaceContainerLowest = 110E07
+$surfaceContainerLow = 1E1B13
+$surfaceContainer = 231F17
+$surfaceContainerHigh = 2D2A21
+$surfaceContainerHighest = 38342B
+$onSurface = EAE2D4
+$surfaceVariant = 4C4639
+$onSurfaceVariant = CEC6B4
+$inverseSurface = EAE2D4
+$inverseOnSurface = 343027
+$outline = 989080
+$outlineVariant = 4C4639
+$shadow = 000000
+$scrim = 000000
+$surfaceTint = E1C46D
+$primary = E1C46D
+$onPrimary = 3C2F00
+$primaryContainer = 574500
+$onPrimaryContainer = FFE086
+$inversePrimary = 725C0C
+$secondary = D4C5A1
+$onSecondary = 383016
+$secondaryContainer = 52482C
+$onSecondaryContainer = F1E1BB
+$tertiary = ACCFAF
+$onTertiary = 183720
+$tertiaryContainer = 77997B
+$onTertiaryContainer = 000000
+$error = FFB4AB
+$onError = 690005
+$errorContainer = 93000A
+$onErrorContainer = FFDAD6
+$primaryFixed = FFE086
+$primaryFixedDim = E1C46D
+$onPrimaryFixed = 231B00
+$onPrimaryFixedVariant = 574500
+$secondaryFixed = F1E1BB
+$secondaryFixedDim = D4C5A1
+$onSecondaryFixed = 221B04
+$onSecondaryFixedVariant = 50462A
+$tertiaryFixed = C8ECCA
+$tertiaryFixedDim = ACCFAF
+$onTertiaryFixed = 02210C
+$onTertiaryFixedVariant = 2F4E35
+$text = EAE2D4
+$subtext1 = CEC6B4
+$subtext0 = 989080
+$overlay2 = 867F70
+$overlay1 = 726C5E
+$overlay0 = 605A4E
+$surface2 = 4E493D
+$surface1 = 3C372D
+$surface0 = 28251B
+$base = 16130B
+$mantle = 0C0A06
+$crust = 050402
+$success = BBE08D
+$rosewater = ECC06C
+$flamingo = F8BA81
+$pink = F4B2E2
+$mauve = C9BFFD
+$red = FFB2BC
+$maroon = FFB5A2
+$peach = ABD28F
+$yellow = E1C46D
+$green = D5C871
+$teal = 98CCF9
+$sky = 83D5C5
+$sapphire = 85D2E7
+$blue = DEB9F7
+$lavender = 97D5A5