diff --git a/setup/linux/include_x/airootfs/etc/skel/.config/i3/config b/setup/linux/include_x/airootfs/etc/skel/.config/i3/config
index bc92b2d8..170cd333 100644
--- a/setup/linux/include_x/airootfs/etc/skel/.config/i3/config
+++ b/setup/linux/include_x/airootfs/etc/skel/.config/i3/config
@@ -9,6 +9,8 @@
 #
 # Please see http://i3wm.org/docs/userguide.html for a complete reference!
 
+set $alt Mod1
+set $ctrl Control
 set $mod Mod4
 
 # Configure border style <normal|1pixel|pixel xx|none|pixel>
@@ -24,8 +26,8 @@ bindsym XF86AudioLowerVolume exec --no-startup-id amixer set Master 5%- #decreas
 bindsym XF86AudioMute exec --no-startup-id amixer set Master toggle # mute sound
 
 # alt+tab navi
-bindsym Mod1+Tab workspace next
-bindsym Mod1+Shift+Tab workspace prev
+bindsym $alt+Tab workspace next
+bindsym $alt+Shift+Tab workspace prev
 
 # change borders
 bindsym $mod+u border none
@@ -57,7 +59,7 @@ bindsym $mod+Return exec i3-sensible-terminal
 # kill focused window
 bindsym $mod+Shift+q kill
 bindsym $mod+q kill
-bindsym Mod1+F4 kill
+bindsym $alt+F4 kill
 
 # start dmenu (a program launcher)
 #bindsym $mod+Shift+d exec dmenu_run
@@ -66,8 +68,17 @@ bindsym Mod1+F4 kill
 # installed.
 #bindsym $mod+Shift+d exec --no-startup-id i3-dmenu-desktop
 bindsym $mod+r exec "rofi -combi-modi window,drun,run -show combi -modi combi"
+bindsym $ctrl+$alt+r exec "rofi -combi-modi window,drun,run -show combi -modi combi"
 
 # misc app shortcuts
+bindsym $ctrl+$alt+d exec "urxvt -title 'Hardware Diagnostics' -e hw-diags"
+bindsym $ctrl+$alt+f exec "thunar ~"
+bindsym $ctrl+$alt+i exec "hardinfo"
+bindsym $ctrl+$alt+m exec "urxvt -title 'Mount All Volumes' -e mount-all-volumes gui"
+bindsym $ctrl+$alt+s exec "urxvt -title 'Hardware Diagnostics' -e hw-diags --quick"
+bindsym $ctrl+$alt+t exec "urxvt"
+bindsym $ctrl+$alt+v exec "urxvt -title 'Hardware Sensors' -e watch -c -n1 -t hw-sensors"
+bindsym $ctrl+$alt+w exec "firefox"
 bindsym $mod+d exec "urxvt -title 'Hardware Diagnostics' -e hw-diags"
 bindsym $mod+f exec "thunar ~"
 bindsym $mod+i exec "hardinfo"
@@ -239,6 +250,7 @@ mode "resize" {
 bindsym $mod+Shift+r mode "resize"
 
 # "System" menu
+bindsym $ctrl+$alt+x mode "$mode_system"
 bindsym $mod+x mode "$mode_system"
 set $mode_system (l)ock, (e)xit, (r)eboot, (s)hutdown, (c)onfig, (i)3
 mode "$mode_system" {
diff --git a/setup/linux/include_x/airootfs/etc/skel/.config/openbox/rc.xml b/setup/linux/include_x/airootfs/etc/skel/.config/openbox/rc.xml
index e99f37ad..a61daa47 100644
--- a/setup/linux/include_x/airootfs/etc/skel/.config/openbox/rc.xml
+++ b/setup/linux/include_x/airootfs/etc/skel/.config/openbox/rc.xml
@@ -297,6 +297,56 @@
         <menu>root-menu</menu>
       </action>
     </keybind>
+    <keybind key="C-A-d">
+      <action name="Execute">
+        <command>urxvt -title "Hardware Diagnostics" -e hw-diags</command>
+      </action>
+    </keybind>
+    <keybind key="C-A-f">
+      <action name="Execute">
+        <command>thunar</command>
+      </action>
+    </keybind>
+    <keybind key="C-A-i">
+      <action name="Execute">
+        <command>hardinfo</command>
+      </action>
+    </keybind>
+    <keybind key="C-A-m">
+      <action name="Execute">
+        <command>urxvt -title "Mount all Volumes" -e mount-all-volumes gui</command>
+      </action>
+    </keybind>
+    <keybind key="C-A-r">
+      <action name="Execute">
+        <command>rofi -combi-modi window,drun,run -show combi -modi combi</command>
+      </action>
+    </keybind>
+    <keybind key="C-A-s">
+      <action name="Execute">
+        <command>urxvt -title "Hardware Diagnostics" -e hw-diags --quick</command>
+      </action>
+    </keybind>
+    <keybind key="C-A-t">
+      <action name="Execute">
+        <command>urxvt</command>
+      </action>
+    </keybind>
+    <keybind key="C-A-v">
+      <action name="Execute">
+        <command>urxvt -title "Hardware Sensors" -e watch -c -n1 -t hw-sensors</command>
+      </action>
+    </keybind>
+    <keybind key="C-A-w">
+      <action name="Execute">
+        <command>firefox</command>
+      </action>
+    </keybind>
+    <keybind key="C-A-x">
+      <action name="Execute">
+        <command>oblogout</command>
+      </action>
+    </keybind>
     <keybind key="W-d">
       <action name="Execute">
         <command>urxvt -title "Hardware Diagnostics" -e hw-diags</command>