diff --git a/overlays/sway/etc/greetd/sway b/overlays/sway/etc/greetd/sway
index 6cf7cf53a335b757039358906e5e3c541e3a61e6..c28f92eb7af843b3c6c958ca3e9b0c326e8e8889 100644
--- a/overlays/sway/etc/greetd/sway
+++ b/overlays/sway/etc/greetd/sway
@@ -5,4 +5,6 @@ include /etc/sway/inputs/*
 include /etc/sway/outputs/*
 
 exec "gtkgreet -l -c sway; swaymsg exit"
-bindsym $mod+Shift+e exec wlogout --layout /etc/wlogout/user-loggedout --buttons-per-row 3
+
+# offer shutdown options
+bindsym $mod+Shift+e exec $shutdown
diff --git a/overlays/sway/etc/sway/definitions b/overlays/sway/etc/sway/definitions
index c8da62f07fefddb4afa78b0da244caa973d0fe43..b4a44af084e1f56715340a51c641e2b38f9b7700 100644
--- a/overlays/sway/etc/sway/definitions
+++ b/overlays/sway/etc/sway/definitions
@@ -10,7 +10,7 @@ set $up k
 set $right l
 
 # styles
-set $theme matcha
+set $theme /etc/sway/themes/matcha
 set $background /usr/share/wallpapers/manjaro-arm/generic/manjaro-arm2.png
 
 # Your preferred terminal emulator
@@ -38,3 +38,6 @@ set $statusbar waybar
 
 # logout command
 set $logout wlogout --layout /etc/wlogout/user-loggedin
+
+# shutdown command
+set $shutdown wlogout --layout /etc/wlogout/user-loggedout --buttons-per-row 3
diff --git a/overlays/sway/etc/sway/inputs/default-keyboard b/overlays/sway/etc/sway/inputs/default-keyboard
index eee51da8613516dd2afc6d015d669af7bb74d443..d003760e4e37415640c625556a882a8cb66b8ddc 100644
--- a/overlays/sway/etc/sway/inputs/default-keyboard
+++ b/overlays/sway/etc/sway/inputs/default-keyboard
@@ -3,6 +3,6 @@
 # You can get the names of your inputs by running: swaymsg -t get_inputs
 # Read `man 5 sway-input` for more information about this section.
 input type:keyboard {
-    xkb_layout us
+    xkb_layout "us"
     #xkb_options ctrl:nocaps
 }
diff --git a/overlays/sway/etc/sway/modes/normal-mode b/overlays/sway/etc/sway/modes/normal-mode
index 9d492649b158aa6e874aac61077d9752b2c751c3..46a0e38308d4b9fabac84e4228e9fd6870418eac 100644
--- a/overlays/sway/etc/sway/modes/normal-mode
+++ b/overlays/sway/etc/sway/modes/normal-mode
@@ -2,114 +2,114 @@
 #
 # Basics:
 #
-    # Start a terminal
-    bindsym $mod+Return exec $term
-
-    # Kill focused window
-    bindsym $mod+Shift+q kill
-
-    # Start your launcher
-    bindsym $mod+d exec $appmenu
-    bindsym $mod+x exec $menu
-
-    # Drag floating windows by holding down $mod and left mouse button.
-    # Resize them with right mouse button + $mod.
-    # Despite the name, also works for non-floating windows.
-    # Change normal to inverse to use left mouse button for resizing and right
-    # mouse button for dragging.
-    floating_modifier $mod normal
-
-    # Reload the configuration file
-    bindsym $mod+Shift+c reload
-
-    # Exit sway (logs you out of your Wayland session)
-    bindsym $mod+Shift+e exec $logout
-    bindsym Print exec grimshot save screen
-    bindsym Alt+Print exec grimshot save win
-    bindsym $mod+Print exec grimshot save area
-
-    bindsym XF86AudioLowerVolume exec amixer -q sset 'Master' 5%-
-    bindsym XF86AudioMute exec amixer -q sset 'Master' toggle
-    bindsym XF86AudioRaiseVolume exec amixer -q sset 'Master' 5%+
-    bindsym XF86MonBrightnessDown exec light -U 5
-    bindsym XF86MonBrightnessUp exec light -A 5
+# Start a terminal
+bindsym $mod+Return exec $term
+
+# Kill focused window
+bindsym $mod+Shift+q kill
+
+# Start your launcher
+bindsym $mod+d exec $appmenu
+bindsym $mod+x exec $menu
+
+# Drag floating windows by holding down $mod and left mouse button.
+# Resize them with right mouse button + $mod.
+# Despite the name, also works for non-floating windows.
+# Change normal to inverse to use left mouse button for resizing and right
+# mouse button for dragging.
+floating_modifier $mod normal
+
+# Reload the configuration file
+bindsym $mod+Shift+c reload
+
+# Exit sway (logs you out of your Wayland session)
+bindsym $mod+Shift+e exec $logout
+bindsym Print exec grimshot save screen
+bindsym Alt+Print exec grimshot save win
+bindsym $mod+Print exec grimshot save area
+
+bindsym XF86AudioLowerVolume exec amixer -q sset 'Master' 5%-
+bindsym XF86AudioMute exec amixer -q sset 'Master' toggle
+bindsym XF86AudioRaiseVolume exec amixer -q sset 'Master' 5%+
+bindsym XF86MonBrightnessDown exec light -U 5
+bindsym XF86MonBrightnessUp exec light -A 5
 
 #
 # Moving around:
 #
-    # Move your focus around
-    bindsym $mod+$left focus left
-    bindsym $mod+$down focus down
-    bindsym $mod+$up focus up
-    bindsym $mod+$right focus right
-    # Or use $mod+[up|down|left|right]
-    bindsym $mod+Left focus left
-    bindsym $mod+Down focus down
-    bindsym $mod+Up focus up
-    bindsym $mod+Right focus right
-
-    # Move the focused window with the same, but add Shift
-    bindsym $mod+Shift+$left move left
-    bindsym $mod+Shift+$down move down
-    bindsym $mod+Shift+$up move up
-    bindsym $mod+Shift+$right move right
-    # Ditto, with arrow keys
-    bindsym $mod+Shift+Left move left
-    bindsym $mod+Shift+Down move down
-    bindsym $mod+Shift+Up move up
-    bindsym $mod+Shift+Right move right
+# Move your focus around
+bindsym $mod+$left focus left
+bindsym $mod+$down focus down
+bindsym $mod+$up focus up
+bindsym $mod+$right focus right
+# Or use $mod+[up|down|left|right]
+bindsym $mod+Left focus left
+bindsym $mod+Down focus down
+bindsym $mod+Up focus up
+bindsym $mod+Right focus right
+
+# Move the focused window with the same, but add Shift
+bindsym $mod+Shift+$left move left
+bindsym $mod+Shift+$down move down
+bindsym $mod+Shift+$up move up
+bindsym $mod+Shift+$right move right
+# Ditto, with arrow keys
+bindsym $mod+Shift+Left move left
+bindsym $mod+Shift+Down move down
+bindsym $mod+Shift+Up move up
+bindsym $mod+Shift+Right move right
 #
 # Workspaces:
 #
-    # Switch to workspace
-    bindsym $mod+1 workspace 1
-    bindsym $mod+2 workspace 2
-    bindsym $mod+3 workspace 3
-    bindsym $mod+4 workspace 4
-    bindsym $mod+5 workspace 5
-    bindsym $mod+6 workspace 6
-    bindsym $mod+7 workspace 7
-    bindsym $mod+8 workspace 8
-    bindsym $mod+9 workspace 9
-    bindsym $mod+0 workspace 10
-    # Move focused container to workspace
-    bindsym $mod+Shift+1 move container to workspace 1
-    bindsym $mod+Shift+2 move container to workspace 2
-    bindsym $mod+Shift+3 move container to workspace 3
-    bindsym $mod+Shift+4 move container to workspace 4
-    bindsym $mod+Shift+5 move container to workspace 5
-    bindsym $mod+Shift+6 move container to workspace 6
-    bindsym $mod+Shift+7 move container to workspace 7
-    bindsym $mod+Shift+8 move container to workspace 8
-    bindsym $mod+Shift+9 move container to workspace 9
-    bindsym $mod+Shift+0 move container to workspace 10
-    # Note: workspaces can have any name you want, not just numbers.
-    # We just use 1-10 as the default.
+# Switch to workspace
+bindsym $mod+1 workspace 1
+bindsym $mod+2 workspace 2
+bindsym $mod+3 workspace 3
+bindsym $mod+4 workspace 4
+bindsym $mod+5 workspace 5
+bindsym $mod+6 workspace 6
+bindsym $mod+7 workspace 7
+bindsym $mod+8 workspace 8
+bindsym $mod+9 workspace 9
+bindsym $mod+0 workspace 10
+# Move focused container to workspace
+bindsym $mod+Shift+1 move container to workspace 1
+bindsym $mod+Shift+2 move container to workspace 2
+bindsym $mod+Shift+3 move container to workspace 3
+bindsym $mod+Shift+4 move container to workspace 4
+bindsym $mod+Shift+5 move container to workspace 5
+bindsym $mod+Shift+6 move container to workspace 6
+bindsym $mod+Shift+7 move container to workspace 7
+bindsym $mod+Shift+8 move container to workspace 8
+bindsym $mod+Shift+9 move container to workspace 9
+bindsym $mod+Shift+0 move container to workspace 10
+# Note: workspaces can have any name you want, not just numbers.
+# We just use 1-10 as the default.
 #
 # Layout stuff:
 #
-    # You can "split" the current object of your focus with
-    # $mod+b or $mod+v, for horizontal and vertical splits
-    # respectively.
-    bindsym $mod+b splith
-    bindsym $mod+v splitv
+# You can "split" the current object of your focus with
+# $mod+b or $mod+v, for horizontal and vertical splits
+# respectively.
+bindsym $mod+b splith
+bindsym $mod+v splitv
 
-    # Switch the current container between different layout styles
-    bindsym $mod+s layout stacking
-    bindsym $mod+w layout tabbed
-    bindsym $mod+e layout toggle split
+# Switch the current container between different layout styles
+bindsym $mod+s layout stacking
+bindsym $mod+w layout tabbed
+bindsym $mod+e layout toggle split
 
-    # Make the current focus fullscreen
-    bindsym $mod+f fullscreen
+# Make the current focus fullscreen
+bindsym $mod+f fullscreen
 
-    # Toggle the current focus between tiling and floating mode
-    bindsym $mod+Shift+space floating toggle
+# Toggle the current focus between tiling and floating mode
+bindsym $mod+Shift+space floating toggle
 
-    # Swap focus between the tiling area and the floating area
-    bindsym $mod+space focus mode_toggle
+# Swap focus between the tiling area and the floating area
+bindsym $mod+space focus mode_toggle
 
-    # Move focus to the parent container
-    bindsym $mod+a focus parent
+# Move focus to the parent container
+bindsym $mod+a focus parent
 #
 # Status Bar:
 #
diff --git a/overlays/sway/etc/sway/outputs/default b/overlays/sway/etc/sway/outputs/default
index 47766980febf06403fface3999fb22013d3bb991..785f14e5997a68db9cc8050c8f6f06945e7c9588 100644
--- a/overlays/sway/etc/sway/outputs/default
+++ b/overlays/sway/etc/sway/outputs/default
@@ -7,7 +7,7 @@
 # You can get the names of your outputs by running: swaymsg -t get_outputs
 
 # import theme
-include /etc/sway/themes/$theme
+include $theme
 
 # Default wallpaper (more resolutions are available in /usr/share/backgrounds/sway/)
 output * bg $background fill