diff --git a/README.md b/README.md
index 2aff61a..1763223 100644
--- a/README.md
+++ b/README.md
@@ -13,8 +13,13 @@ The installation is pretty straightforward using a couple of installation script
 3. Reboot the system
 4. Run `./post-install.sh`
 
+## Keybindings
+| Keybinding                      | Use                 |
+| ------------------------------- | ------------------- |
+| <kbd>Super</kbd>+<kbd>1-9</kbd> | Switching workspace |
+
 ## Contents
-The list of my used arch packages are found inside the files in `packages`. The files are numbered in the order they are installed, so packages inside `packages.list` are installed first and then packages in `packages2.list` are installed.
+The list of my used arch packages are found inside  `packages/packages.list`.
 
 The main content of this repository can be found in the `system` folder. It
 contains all configurations files, directories and scripts that mostly get symlinked
diff --git a/system/.config/autokey/autokey.json b/system/.config/autokey/autokey.json
index 8cdbfac..c172ce8 100644
--- a/system/.config/autokey/autokey.json
+++ b/system/.config/autokey/autokey.json
@@ -12,10 +12,10 @@
         "interfaceType": "XRecord",
         "undoUsingBackspace": true,
         "windowDefaultSize": [
-            955,
-            1010
+            924,
+            469
         ],
-        "hPanePosition": 240,
+        "hPanePosition": 232,
         "columnWidths": [
             150,
             50,
@@ -29,7 +29,7 @@
     },
     "folders": [],
     "toggleServiceHotkey": {
-        "enabled": true,
+        "enabled": false,
         "modifiers": [
             "<shift>",
             "<super>"
@@ -37,7 +37,7 @@
         "hotKey": "k"
     },
     "configHotkey": {
-        "enabled": true,
+        "enabled": false,
         "modifiers": [
             "<super>"
         ],
diff --git a/system/.config/autokey/autokey.json~ b/system/.config/autokey/autokey.json~
index 8cdbfac..857a515 100644
--- a/system/.config/autokey/autokey.json~
+++ b/system/.config/autokey/autokey.json~
@@ -12,10 +12,10 @@
         "interfaceType": "XRecord",
         "undoUsingBackspace": true,
         "windowDefaultSize": [
-            955,
-            1010
+            1872,
+            301
         ],
-        "hPanePosition": 240,
+        "hPanePosition": 470,
         "columnWidths": [
             150,
             50,
@@ -29,7 +29,7 @@
     },
     "folders": [],
     "toggleServiceHotkey": {
-        "enabled": true,
+        "enabled": false,
         "modifiers": [
             "<shift>",
             "<super>"
@@ -37,7 +37,7 @@
         "hotKey": "k"
     },
     "configHotkey": {
-        "enabled": true,
+        "enabled": false,
         "modifiers": [
             "<super>"
         ],
diff --git a/system/.config/compton/compton.conf b/system/.config/compton/compton.conf
index 62f898a..907a8fe 100644
--- a/system/.config/compton/compton.conf
+++ b/system/.config/compton/compton.conf
@@ -12,10 +12,11 @@
 
 # Settings opacity rules
 opacity-rule = [
-    "90:class_g = 'Termite'",
-    "90:class_g = 'Nemo'"
+    "85:class_g = 'Nemo'"
 ];
 
+inactive-dim = 0.25;
+
 # Performance improvements
 unredir-if-possible = true;
 backend = "glx";
diff --git a/system/.config/i3/config b/system/.config/i3/config
index 0b819f9..04c6b44 100644
--- a/system/.config/i3/config
+++ b/system/.config/i3/config
@@ -9,14 +9,23 @@
 #
 # USAGE:
 # This file is automatically used by i3.
+
+###############################################################################
+# Modifiers                                                                   #
+###############################################################################
 set $mod Mod4
 set $alt Mod1
 
-# Monitors
+###############################################################################
+# Outputs                                                                     #
+###############################################################################
 set $output1 HDMI-1
 set $output2 eDP-1
 
-# Workspaces
+###############################################################################
+# Workspaces                                                                  #
+###############################################################################
+# Define workspaces
 set $workspace1 "1: "
 set $workspace2 "2: "
 set $workspace3 "3: "
@@ -28,64 +37,7 @@ set $workspace8 "8: "
 set $workspace9 "9: "
 set $workspace10 "10: "
 
-new_window none
-
-# Font for window titles. Will also be used by the bar unless a different font
-# is used in the bar {} block below.
-font pango:Noto Sans, Font Awesome 5 Free 15px
-
-# Use Mouse+$mod to drag floating windows to their wanted position
-floating_modifier $mod
-
-# start a terminal
-bindsym $mod+Return exec termite -c ~/.config/termite/config
-
-# kill focused window
-bindsym $mod+Shift+q kill
-
-# Rofi menus
-bindsym $mod+r exec rofi -show run -lines 5
-bindsym $mod+g exec games.sh
-
-# change focus
-bindsym $mod+Left focus left
-bindsym $mod+Down focus down
-bindsym $mod+Up focus up
-bindsym $mod+Right focus right
-
-# move focused window
-bindsym $mod+Shift+Left move left
-bindsym $mod+Shift+Down move down
-bindsym $mod+Shift+Up move up
-bindsym $mod+Shift+Right move right
-
-# split in horizontal orientation
-bindsym $mod+h split h
-
-# split in vertical orientation
-bindsym $mod+v split v
-
-# enter fullscreen mode for the focused container
-bindsym $mod+f fullscreen toggle
-
-# change container layout (stacked, tabbed, toggle split)
-bindsym $mod+s layout stacking
-bindsym $mod+w layout tabbed
-bindsym $mod+e layout toggle split
-
-# toggle tiling / floating
-bindsym $mod+Shift+space floating toggle
-
-# change focus between tiling / floating windows
-bindsym $mod+space focus mode_toggle
-
-# focus the parent container
-bindsym $mod+a focus parent
-
-# focus the child container
-#bindsym $mod+d focus child
-
-# Assign workspaces to screens
+# Assign workspaces to outputs
 workspace $workspace1 output $output1
 workspace $workspace2 output $output2
 workspace $workspace3 output $output2
@@ -97,6 +49,73 @@ workspace $workspace8 output $output1
 workspace $workspace9 output $output2
 workspace $workspace10 output $output2
 
+new_window none
+
+# Font for window titles. Will also be used by the bar unless a different font
+# is used in the bar {} block below.
+font pango:Noto Sans, Font Awesome 5 Free 15px
+
+###############################################################################
+# Keybindings                                                                 #
+###############################################################################
+
+# Use Mouse+$mod to drag floating windows to their wanted position
+floating_modifier $mod
+
+# Start a terminal
+bindsym $mod+Return exec termite -c ~/.config/termite/config
+
+# Kill focused window
+bindsym $mod+Shift+q kill
+
+# Rofi menus
+bindsym $mod+R exec rofi -show run -lines 5
+bindsym $mod+G exec games.sh
+bindsym $mod+F4 exec power.sh
+
+# Change focus
+bindsym $mod+Left focus left
+bindsym $mod+H focus left
+bindsym $mod+Down focus down
+bindsym $mod+J focus down
+bindsym $mod+Up focus up
+bindsym $mod+K focus up
+bindsym $mod+Right focus right
+bindsym $mod+L focus right
+
+# Move focused window
+bindsym $mod+Shift+Left move left
+bindsym $mod+Shift+H move left
+bindsym $mod+Shift+Down move down
+bindsym $mod+Shift+J move down
+bindsym $mod+Shift+Up move up
+bindsym $mod+Shift+K move up
+bindsym $mod+Shift+Right move right
+bindsym $mod+Shift+L move right
+
+# Moving workspaces to other displays
+bindsym $mod+$alt+Left move workspace to output left
+bindsym $mod+$alt+H move workspace to output left
+bindsym $mod+$alt+Right move workspace to output right
+bindsym $mod+$alt+L move workspace to output right
+
+# split in horizontal orientation
+#bindsym $mod+h split h
+
+# split in vertical orientation
+bindsym $mod+v split v
+
+# Fullscreen toggle
+bindsym $mod+F11 fullscreen toggle
+
+# toggle tiling / floating
+bindsym $mod+Shift+space floating toggle
+
+# change focus between tiling / floating windows
+bindsym $mod+space focus mode_toggle
+
+
+
 # Workspace switching
 bindsym $mod+1 workspace $workspace1
 bindsym $mod+2 workspace $workspace2
@@ -143,9 +162,6 @@ bindsym $mod+Shift+KP_8 move container to workspace $workspace8
 bindsym $mod+Shift+KP_9 move container to workspace $workspace9
 bindsym $mod+Shift+KP_0 move container to workspace $workspace10
 
-# Reload configuration file
-#bindsym $mod+Shift+r reload
-
 # Restart i3
 bindsym $mod+Shift+r restart
 
@@ -171,7 +187,7 @@ exec_always --no-startup-id $HOME/.config/polybar/launch.sh
 # Custom keybinding
 #######################################
 # Screen lock controls
-bindsym $mod+l exec --no-startup-id $XDG_BIN_HOME/screenlock.sh
+#bindsym $mod+l exec --no-startup-id $XDG_BIN_HOME/screenlock.sh
 bindsym XF86Sleep exec --no-startup-id $XDG_BIN_HOME/screenlock.sh
 
 # Volume controls
@@ -195,9 +211,7 @@ bindsym $mod+Control+Right exec --no-startup-id cmus-remote -n
 bindsym XF86AudioPrev exec --no-startup-id cmus-remote -r
 bindsym $mod+Control+Left exec --no-startup-id cmus-remote -r
 
-# Moving workspaces to other displays
-bindsym $mod+$alt+Left move workspace to output left
-bindsym $mod+$alt+Right move workspace to output right
+
 
 #######################################
 # Startup applications
@@ -209,7 +223,7 @@ exec --no-startup-id dunst
 exec --no-startup-id compton -b
 
 # Background-Image
-exec_always --no-startup-id feh --bg-fill $HOME/GoogleDrive/02_Media/Images/01_Wallpaper/Desktop/Fearsome_Awakening.png
+exec_always --no-startup-id feh --randomize --bg-fill $HOME/GoogleDrive/02_Media/Images/01_Wallpaper/Desktop/*
 
 # Monitor settings
 exec_always --no-startup-id $XDG_BIN_HOME/resolution.sh
@@ -238,9 +252,9 @@ assign [class="vlc"] $workspace9
 assign [class="mpv"] $workspace9
 assign [class="Notable"] $workspace7
 
-# Disable window titlebars
+# Disable window titlebars and borders
 for_window [class="^.*"] border pixel 0
 
 # Gaps
-gaps inner 10
-gaps outer -10
+gaps inner 25
+#gaps outer -10
diff --git a/system/.config/polybar/config b/system/.config/polybar/config
index 67f9eb6..a18d9b9 100644
--- a/system/.config/polybar/config
+++ b/system/.config/polybar/config
@@ -15,8 +15,8 @@
 #######################################
 [settings]
 padding = 4
-background-color = #222D32
-foreground-color = #A1B0B8
+background-color = #BF222D32
+foreground-color = #BFA1B0B8
 bar-height = 35
 
 #######################################
diff --git a/system/.config/termite/config b/system/.config/termite/config
index 016e95f..15bd833 100644
--- a/system/.config/termite/config
+++ b/system/.config/termite/config
@@ -37,7 +37,7 @@ cursor_shape = ibeam
 foreground      = #a1b0b8
 foreground_bold = #a1b0b8
 cursor          = #a1b0b8
-background      = #263238
+background      = rgba(38,50,56, 0.75)
 
 # black
 color0  = #252525
diff --git a/system/.local/bin/power.sh b/system/.local/bin/power.sh
index 8588092..7bd6ae1 100755
--- a/system/.local/bin/power.sh
+++ b/system/.local/bin/power.sh
@@ -19,8 +19,9 @@ PROMPT="Power Options"
 ACTIONS=(
     "1: Reboot"
     "2: Shutdown"
-    "3: Performance Mode"
-    "4: Powersave Mode"
+    "3: Lock Screen"
+    "4: Performance Mode"
+    "5: Powersave Mode"
 )
 
 SELECTION=$(printf '%s\n' "${ACTIONS[@]}" | rofi -dmenu -p "${PROMPT}" | cut -d ":" -f1)
@@ -32,10 +33,13 @@ case "${SELECTION}" in
         systemctl poweroff
         ;;
     "3")
+        screenlock.sh
+        ;;
+    "5")
         gksudo "cpupower frequency-set -g performance"
         optirun -b primus nvidia-settings -a '[gpu:0]/GPUPowerMizerMode=2' -c :8 > /dev/null
         ;;
-    "4")
+    "6")
         gksudo "cpupower frequency-set -g powersave"
         optirun -b primus nvidia-settings -a '[gpu:0]/GPUPowerMizerMode=0' -c :8 > /dev/null
         ;;