diff --git a/herbstluftwm/autostart b/herbstluftwm/autostart
index 24a1ed0..fdf7fa4 100755
--- a/herbstluftwm/autostart
+++ b/herbstluftwm/autostart
@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 
-HOSTNAME=$(hostname)
 PATH="$PATH:$HOME/.local/bin"
 
 hc() {
@@ -8,10 +7,8 @@ hc() {
 }
 
 # don't need sticky win on pinebook
-if [ "$HOSTNAME" != "ellison" ]; then
-  hc new_attr string my_sticky
-  refresh_panel="pgrep -f 'bash.*panel\.sh' | xargs -n1 kill -s USR1"
-fi
+hc new_attr string my_sticky
+refresh_panel="pgrep -f 'bash.*panel\.sh' | xargs -n1 kill -s USR1"
 
 hc emit_hook reload
 
@@ -91,57 +88,54 @@ hc set focus_follows_monitor_boundaries true
 hc mousebind $Mod-Button1 move
 hc mousebind $Mod-Button3 resize
 
-# no tags on pinebook pro
-if [ "$HOSTNAME" != "ellison" ]; then
-  # basic movement in tiling and floating mode
-  # focusing clients
-  hc keybind $Mod-Left focus left
-  hc keybind $Mod-Down focus down
-  hc keybind $Mod-Up focus up
-  hc keybind $Mod-Right focus right
+# basic movement in tiling and floating mode
+# focusing clients
+hc keybind $Mod-Left focus left
+hc keybind $Mod-Down focus down
+hc keybind $Mod-Up focus up
+hc keybind $Mod-Right focus right
 
-  # moving clients in tiling and floating mode
-  hc keybind $Mod-Shift-Left shift left
-  hc keybind $Mod-Shift-Down shift down
-  hc keybind $Mod-Shift-Up shift up
-  hc keybind $Mod-Shift-Right shift right
+# moving clients in tiling and floating mode
+hc keybind $Mod-Shift-Left shift left
+hc keybind $Mod-Shift-Down shift down
+hc keybind $Mod-Shift-Up shift up
+hc keybind $Mod-Shift-Right shift right
 
-  hc keybind $Mod-j spawn ~/skynet/bin/stickyctl stick
-  hc keybind $Mod-Shift-j spawn ~/skynet/bin/stickyctl unstick
+hc keybind $Mod-j spawn ~/skynet/bin/stickyctl stick
+hc keybind $Mod-Shift-j spawn ~/skynet/bin/stickyctl unstick
 
-  # tags
-  tag_names=( {1..9} 0 )
-  tag_keys=( {1..9} 0 )
+# tags
+tag_names=( {1..9} 0 )
+tag_keys=( {1..9} 0 )
 
-  hc rename default "${tag_names[0]}" || true
-  for i in "${!tag_names[@]}" ; do
-      hc add "${tag_names[$i]}"
-      key="${tag_keys[$i]}"
-      if ! [ -z "$key" ] ; then
-          hc keybind "$Mod-$key" chain , lock , use_index "$i" , spawn ~/skynet/bin/stickyctl get-sticky , unlock
-          hc keybind "$Mod-Shift-$key" move_index "$i"
-      fi
-  done
+hc rename default "${tag_names[0]}" || true
+for i in "${!tag_names[@]}" ; do
+    hc add "${tag_names[$i]}"
+    key="${tag_keys[$i]}"
+    if ! [ -z "$key" ] ; then
+        hc keybind "$Mod-$key" chain , lock , use_index "$i" , spawn ~/skynet/bin/stickyctl get-sticky , unlock
+        hc keybind "$Mod-Shift-$key" move_index "$i"
+    fi
+done
 
-  # cycle through tags
-  hc keybind $Mod-Control-Right use_index +1 --skip-visible
-  hc keybind $Mod-Control-Left use_index -1 --skip-visible
+# cycle through tags
+hc keybind $Mod-Control-Right use_index +1 --skip-visible
+hc keybind $Mod-Control-Left use_index -1 --skip-visible
 
-  # layouting
-  hc keybind $Mod-f fullscreen toggle
-  hc keybind $Mod-Shift-f set_attr clients.focus.floating toggle
-  # The following cycles through the available layouts within a frame, but skips
-  # layouts, if the layout change wouldn't affect the actual window positions.
-  # I.e. if there are two windows within a frame, the grid layout is skipped.
-  hc keybind $Mod-space or , and . compare tags.focus.curframe_wcount = 2 . cycle_layout +1 vertical horizontal max vertical grid , cycle_layout +1
+# layouting
+hc keybind $Mod-f fullscreen toggle
+hc keybind $Mod-Shift-f set_attr clients.focus.floating toggle
+# The following cycles through the available layouts within a frame, but skips
+# layouts, if the layout change wouldn't affect the actual window positions.
+# I.e. if there are two windows within a frame, the grid layout is skipped.
+hc keybind $Mod-space or , and . compare tags.focus.curframe_wcount = 2 . cycle_layout +1 vertical horizontal max vertical grid , cycle_layout +1
 
 
-  # focus
-  hc keybind $Mod-BackSpace cycle_monitor
-  hc keybind $Mod-Tab cycle_all +1
-  hc keybind $Mod-Shift-Tab cycle_all -1
-  hc keybind $Mod-Alt-Tab jumpto urgent
-fi
+# focus
+hc keybind $Mod-BackSpace cycle_monitor
+hc keybind $Mod-Tab cycle_all +1
+hc keybind $Mod-Shift-Tab cycle_all -1
+hc keybind $Mod-Alt-Tab jumpto urgent
 
 # rules
 hc unrule -F
@@ -168,12 +162,9 @@ hc unlock
 # or simply:
 hc detect_monitors
 
-# no panel on pinebook pro
-if [ "$HOSTNAME" != "ellison" ]; then
-  # restart panel
-  ~/.config/herbstluftwm/killpanel.sh
-  { exec ~/.config/herbstluftwm/panel.sh; } &
-fi
+# restart panel
+~/.config/herbstluftwm/killpanel.sh
+{ exec ~/.config/herbstluftwm/panel.sh; } &
 
 # restart xob
 pgrep xob | xargs -n1 kill -9