diff --git a/.config/i3/config b/.config/i3/config
index 4c0a698b..0e2d40a4 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -81,7 +81,7 @@ gaps outer 0
 ## Statusbars and Daemons
 ###################
 
-exec_always --no-startup-id "killall polybar; sleep 1; polybar -r alpha"
+exec_always --no-startup-id "killall polybar && polybar -r alpha"
 #exec --no-startup-id "redshift"
 #exec_always --no-startup-id "compton --config ~/.config/compton.conf"
 #exec_always --no-startup-id "dunst"
diff --git a/.config/polybar/config b/.config/polybar/config
index 25619720..937efa90 100644
--- a/.config/polybar/config
+++ b/.config/polybar/config
@@ -79,7 +79,7 @@ font-4 = ${res/fonts.font-4}
 inherit = template/bar
 tray-position = right
 
-modules-left = i3 bspwm | cpu-label memory-label temperature-label update-arch | xwindow-label
+modules-left = i3 | cpu-label memory-label temperature-label update-arch | xwindow-label
 modules-center = 
 modules-right = | xbacklight-label volume-ramp wlan-network eth-network battery-ramp | date
 
@@ -88,7 +88,7 @@ inherit = template/bar
 bottom = true
 tray-position = right
 
-modules-left = i3 bspwm | 
+modules-left = i3 | 
 modules-center = xwindow-label
 modules-right = | mpd-mini temperature-label-alert wlan-network-mini volume-ramp-mini battery-ramp-mini | date-mini
 
@@ -178,47 +178,6 @@ label-urgent-padding = ${self.label-focused-padding}
 label-urgent-foreground = ${self.label-focused-foreground}
 label-urgent-background = ${res/colors.alert}
 
-[module/bspwm]
-inherit = template/module
-type = internal/bspwm
-enable-click = true
-enable-scroll = true
-format = <label-state> <label-mode>
-pin-workspaces = true
-
-ws-icon-0 = I;
-ws-icon-1 = II;
-ws-icon-2 = III;
-ws-icon-3 = IX;
-ws-icon-4 = X;
-ws-icon-default = 
-
-# Active workspace on focused monitor
-label-focused = %icon%
-label-focused-padding = 2
-label-focused-foreground = ${res/colors.primary}
-label-focused-overline = ${res/colors.primary}
-
-# Inactive filled workspace on focused monitor
-label-occupied = ${self.label-focused}
-label-occupied-padding = ${self.label-focused-padding}
-label-occupied-foreground = ${res/colors.primary}
-
-# Inactive empty workspace on focused monitor
-label-empty = ${self.label-focused}
-label-empty-padding = ${self.label-focused-padding}
-label-empty-foreground = ${res/colors.background-4}
-
-# Filled workspace on unfocused monitor
-label-dimmed-padding = ${self.label-focused-padding}
-label-dimmed-foreground = ${res/colors.primary-dark}
-label-dimmed-background = ${res/colors.background-4}
-
-# Urgent workspace on any monitor
-label-urgent = ${self.label-focused}
-label-urgent-padding = ${self.label-focused-padding}
-label-urgent-foreground = ${res/colors.alert}
-
 [module/battery-ramp]
 inherit = template/module/battery
 format-charging = <animation-charging> <label-charging>
diff --git a/.config/polybar/weather.sh b/.config/polybar/weather.sh
deleted file mode 100755
index d83034c4..00000000
--- a/.config/polybar/weather.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-source $HOME/.config/polybar/location.sh
-
-# write xml to variable
-w_xml=$(curl --silent "https://weather.tuxnet24.de/?id=$location&mode=xml&unit=imperial");
-# get fields from xml via xmllint | xargs for trimming
-# weather description
-w_txt=$(xmllint --xpath "string(//current_text)" - <<<"$w_xml" | xargs);
-# temperature | remove spaces from text (&#176;C prepended by space)
-w_tpc=$(xmllint --xpath "string(//current_temp)"  - <<<"$w_xml" | xargs); w_tpc=${w_tpc//[[:blank:]]/};
-# further fields not used atm
-# w_tph=$(xmllint --xpath "string(//current_temp_high)"  - <<<"$w_xml" | xargs);
-# w_tpl=$(xmllint --xpath "string(//current_temp_low)"  - <<<"$w_xml" | xargs);
-
-# set $w_sym according to $w_txt
-if   [ "$w_txt" == "Sunny" ]; then w_sym="";
-elif [ "$w_txt" == "Mostly Sunny" ]; then w_sym="~";
-elif [ "$w_txt" == "Showers" ]; then w_sym="";
-elif [ "$w_txt" == "Clear" ]; then w_sym="";
-elif [ "$w_txt" == "Mostly Clear" ]; then w_sym="~";
-elif [ "$w_txt" == "Thunderstorms" ]; then w_sym="";
-elif [ "$w_txt" == "Scattered Thunderstorms" ]; then w_sym="~";
-elif [ "$w_txt" == "Isolated Thundershovers" ]; then w_sym="~~";
-elif [ "$w_txt" == "Scattered Showers" ]; then w_sym="";
-elif [ "$w_txt" == "Rain" ]; then w_sym="";
-elif [ "$w_txt" == "Cloudy" ]; then w_sym="";
-elif [ "$w_txt" == "Mostly Cloudy" ]; then w_sym="~";
-elif [ "$w_txt" == "Partly Cloudy" ]; then w_sym="";
-elif [ "$w_txt" == "Breezy" ]; then w_sym="";
-# if unknown text, set text instead of symbol
-else w_sym=$w_txt; 
-fi
-# output <symbol><space><temp>
-echo "$w_sym"" ""$w_tpc";
-
-exit 0