diff --git a/home/.config/bspwm/bspwmrc b/home/.config/bspwm/bspwmrc
index 47efcf73..54123290 100755
--- a/home/.config/bspwm/bspwmrc
+++ b/home/.config/bspwm/bspwmrc
@@ -10,7 +10,7 @@ nitrogen --restore &
 al-compositor --start &
 
 # panel
-sleep 1; al-polybar-session &
+al-polybar-session &
 
 # polkit, required for authentication
 /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 &
@@ -22,7 +22,6 @@ gnome-keyring-daemon --start --components=pkcs11 &
 ksuperkey -e 'Super_L=Alt_L|F1' &
 ksuperkey -e 'Super_R=Alt_L|F1' &
 
-
 # Set some bsp specific stuff
 bspc monitor -d I II III IV V VI VII VIII IX X
 
@@ -46,5 +45,3 @@ bspc config pointer_action3 resize_corner
 
 bspc rule -a thunar desktop='^1' state=floating follow=on
 bspc rule -a firefox desktop='^2'
-bspc rule -a Void_Exit_Session state=floating layer=above
-bspc rule -a Exit_Session state=floating layer=above
diff --git a/home/.config/i3/config b/home/.config/i3/config
index 605c3ab4..2a59b2f5 100644
--- a/home/.config/i3/config
+++ b/home/.config/i3/config
@@ -96,6 +96,7 @@ bindsym Mod1+F1 exec --no-startup-id rofr.sh -r
 # core
 bindsym $Mod+e exec --no-startup-id geany
 bindsym $Mod+t exec exo-open --launch TerminalEmulator
+bindsym $Mod+Return exec exo-open --launch TerminalEmulator
 bindsym $Mod+w exec exo-open --launch WebBrowser
 bindsym $Mod+f exec exo-open --launch FileManager
 
diff --git a/home/.config/openbox/rc.xml b/home/.config/openbox/rc.xml
index f05a69ce..d501d326 100644
--- a/home/.config/openbox/rc.xml
+++ b/home/.config/openbox/rc.xml
@@ -387,6 +387,11 @@
         <command>exo-open --launch TerminalEmulator</command>
       </action>
     </keybind>
+    <keybind key="W-Enter">
+      <action name="Execute">
+        <command>exo-open --launch TerminalEmulator</command>
+      </action>
+    </keybind>
     <keybind key="W-w">
       <action name="Execute">
         <command>exo-open --launch WebBrowser</command>
diff --git a/home/.config/polybar/config b/home/.config/polybar/config
index d4ce6961..0f31cd5e 100644
--- a/home/.config/polybar/config
+++ b/home/.config/polybar/config
@@ -19,7 +19,7 @@ monitor =
 
 modules-left   = jgmenu workspaces
 modules-center = window_switch clock
-modules-right  = temperature pkg network volume
+modules-right  = ${env:POLYBAR_MODULES:temperature pkg network volume}
 
 
 ;=====================================================
@@ -34,7 +34,7 @@ monitor =
 
 modules-left   = jgmenu i3 menu
 modules-center = clock
-modules-right  = coreuse temperature memory pkg network volume
+modules-right  = ${env:POLYBAR_MODULES:coreuse temperature memory pkg network volume}
 
 
 ;=====================================================
@@ -49,4 +49,4 @@ monitor =
 
 modules-left   = bspwm menu
 modules-center = clock
-modules-right  = coreuse temperature memory pkg network volume
+modules-right  = ${env:POLYBAR_MODULES:coreuse temperature memory pkg network volume}
diff --git a/home/.config/polybar/modules.conf b/home/.config/polybar/modules.conf
index 0c40a191..6fe07f74 100644
--- a/home/.config/polybar/modules.conf
+++ b/home/.config/polybar/modules.conf
@@ -274,9 +274,9 @@ ramp-volume-3-foreground = ${colors.urgent}
 [module/battery]
 type = internal/battery
 ; Use $ ls -1 /sys/class/power_supply/
-battery = BAT0
-adapter = AC
-full-at = 98
+battery = ${env:LAPTOP_BATTERY:BAT1}
+adapter = ${env:LAPTOP_ADAPTER:ACAD}
+full-at = 99
 poll-interval = 5
 time-format = %H:%M
 
diff --git a/home/.config/polybar/sessions/openbox-sessionfile b/home/.config/polybar/sessions/openbox-sessionfile
index 66a11df7..03e9a286 100644
--- a/home/.config/polybar/sessions/openbox-sessionfile
+++ b/home/.config/polybar/sessions/openbox-sessionfile
@@ -4,4 +4,4 @@
 # To load session at startup use the following line
 # sleep 1; al-polybar-session &
 
-/home/liveuser/.config/polybar/config openbox-bar
\ No newline at end of file
+/home/liveuser/.config/polybar/config openbox-bar
diff --git a/home/.config/sxhkd/sxhkdrc b/home/.config/sxhkd/sxhkdrc
index 7c82a57d..9302648b 100644
--- a/home/.config/sxhkd/sxhkdrc
+++ b/home/.config/sxhkd/sxhkdrc
@@ -6,6 +6,10 @@ super + w
 super + t
     exo-open --launch TerminalEmulator
 
+# terminal emulator
+super + Return
+    exo-open --launch TerminalEmulator
+
 # file manager
 super + f
     exo-open --launch FileManager
diff --git a/home/bin/toggle.sh b/home/bin/toggle.sh
index c5bf608a..d0d21439 100755
--- a/home/bin/toggle.sh
+++ b/home/bin/toggle.sh
@@ -4,7 +4,7 @@ NAME=$(basename "$0")
 VER="0.3"
 
 usage() {
-    cat <<EOF
+    cat <<- EOF
 
  USAGE:  $NAME [OPTIONS [ADDITIONAL]]