diff --git a/i3/conf/build.sh b/i3/conf/build.sh
index 7d5cca6..101a45d 100755
--- a/i3/conf/build.sh
+++ b/i3/conf/build.sh
@@ -10,4 +10,4 @@ if [ ! -d $CLIENT ]; then
     cp -r ~/.dotfiles/i3/conf/client/default ~/.dotfiles/i3/conf/client/$(hostname)
 fi
 
-cat ${CLIENT}header ${COMMON}base ${CLIENT}assignments ${COMMON}footer > ~/.dotfiles/i3/config
+cat ${CLIENT}header ${COMMON}base ${CLIENT}bar ${CLIENT}assignments ${COMMON}footer > ~/.dotfiles/i3/config
diff --git a/i3/conf/client/Cyb3r/bar b/i3/conf/client/Cyb3r/bar
new file mode 100644
index 0000000..1321f76
--- /dev/null
+++ b/i3/conf/client/Cyb3r/bar
@@ -0,0 +1,7 @@
+set $CLIENT_BUMBLEBEE -m mpd load memory disk nic caffeine amixer datetime -p nic.states=^down -p amixer.left-click="pavucontrol" -t gruvbox-powerline
+
+# {{{ STATUS BAR }}}
+bar {
+    position       top
+    status_command bumblebee-status $CLIENT_BUMBLEBEE
+}
diff --git a/i3/conf/client/Cyb3r/header b/i3/conf/client/Cyb3r/header
index 4bc8df9..c55af69 100644
--- a/i3/conf/client/Cyb3r/header
+++ b/i3/conf/client/Cyb3r/header
@@ -1,4 +1,3 @@
-set $CLIENT_BUMBLEBEE -m mpd load memory disk nic caffeine amixer datetime -p nic.states=^down -p amixer.left-click="pavucontrol" -t gruvbox-powerline
 
 # {{{ VARIABLES  }}}
 
diff --git a/i3/conf/client/ThinkPad/bar b/i3/conf/client/ThinkPad/bar
new file mode 100644
index 0000000..d4bc8d5
--- /dev/null
+++ b/i3/conf/client/ThinkPad/bar
@@ -0,0 +1,5 @@
+# {{{ STATUS BAR }}}
+bar {
+    position       top
+    status_command /usr/bin/goblocks
+}
diff --git a/i3/conf/client/ThinkPad/header b/i3/conf/client/ThinkPad/header
index d22beb3..b78aa28 100644
--- a/i3/conf/client/ThinkPad/header
+++ b/i3/conf/client/ThinkPad/header
@@ -1,6 +1,3 @@
-set $CLIENT_BUMBLEBEE -m disk nic sensors battery caffeine amixer brightness datetime -p battery.device=BAT0,BAT1 brightness.device_path=/sys/class/backlight/acpi_video0 disk.format={left} nic.states=^down sensors.path=/sys/class/thermal/thermal_zone2/temp  -t gruvbox-powerline
-
-
 # {{{ VARIABLES  }}}
 
     set $mod Mod4
diff --git a/i3/conf/client/default/bar b/i3/conf/client/default/bar
new file mode 100644
index 0000000..ff1b21e
--- /dev/null
+++ b/i3/conf/client/default/bar
@@ -0,0 +1,7 @@
+set $CLIENT_BUMBLEBEE -m disk nic sensors battery caffeine amixer brightness datetime -p battery.device=BAT0,BAT1 brightness.device_path=/sys/class/backlight/acpi_video0 disk.format={left} nic.states=^down sensors.path=/sys/class/thermal/thermal_zone2/temp  -t gruvbox-powerline
+
+# {{{ STATUS BAR }}}
+bar {
+    position       top
+    status_command bumblebee-status $CLIENT_BUMBLEBEE
+}
diff --git a/i3/conf/client/default/header b/i3/conf/client/default/header
index d22beb3..b78aa28 100644
--- a/i3/conf/client/default/header
+++ b/i3/conf/client/default/header
@@ -1,6 +1,3 @@
-set $CLIENT_BUMBLEBEE -m disk nic sensors battery caffeine amixer brightness datetime -p battery.device=BAT0,BAT1 brightness.device_path=/sys/class/backlight/acpi_video0 disk.format={left} nic.states=^down sensors.path=/sys/class/thermal/thermal_zone2/temp  -t gruvbox-powerline
-
-
 # {{{ VARIABLES  }}}
 
     set $mod Mod4
diff --git a/i3/conf/common/base b/i3/conf/common/base
index 88966f4..ebf70a6 100644
--- a/i3/conf/common/base
+++ b/i3/conf/common/base
@@ -190,11 +190,6 @@ floating_modifier $mod
     }
     bindsym $mod+g mode "gaps"
 
-# {{{ STATUS BAR }}}
-bar {
-    position       top
-    status_command bumblebee-status $CLIENT_BUMBLEBEE
-}
 
 # {{{ GAPS }}}
     gaps inner $gap_inner