diff --git a/os/arch/bin/bspc-win b/os/arch/bin/bspc-win
new file mode 100755
index 00000000..fc753626
--- /dev/null
+++ b/os/arch/bin/bspc-win
@@ -0,0 +1,44 @@
+#!/usr/bin/env bash
+set -e
+
+# A helper script for bspwm; makes the act of switching and swapping nodes act more
+# intuitive.
+
+if (( $# < 2 )); then
+    >&2 echo "Usage: $0 [fFsS] DIRECTION"
+    exit 1
+fi
+
+cmd=$1
+dir=$2
+
+case $cmd in
+    # focus
+    f) if ! bspc node -f "$dir.local"; then
+           if [[ $(bspc query -M -m "$dir") ]]; then
+               bspc monitor -f "$dir"
+           fi
+       fi
+       ;;
+
+    # focus monitor
+    F) bspc monitor -f "$dir" ;;
+
+    # swap
+    s) old_id=$(bspc query -N -n focused)
+       if bspc node -s "$dir.local"; then
+           bspc node -f "$old_id"
+       elif [[ $(bspc query -M -m "$dir") ]]; then
+           bspc node -m "$dir"
+           bspc node -f "$old_id"
+       fi
+       ;;
+
+    # swap to monitor
+    S) old_id=$(bspc query -N -n focused)
+       if [[ $(bspc query -M -m "$dir") ]]; then
+           bspc node -m "$dir"
+           bspc node -f "$old_id"
+       fi
+       ;;
+esac
diff --git a/weechat/plugins.txt b/weechat/plugins.txt
new file mode 100644
index 00000000..1abf35a5
--- /dev/null
+++ b/weechat/plugins.txt
@@ -0,0 +1,44 @@
+# WeeChat plugin settings
+# By Henrik Lissner <henrik@lissner.net
+#
+# Pass this file to `./bin/wee` while weechat is running.
+
+# Interactive configuring
+/script install iset.pl
+
+# Separate buffer for highlights
+/script install highmon.pl
+/set plugins.var.perl.highmon.alighnment "nchannel"
+
+# Sidebar for buffers
+/script install buffers.pl
+/set weechat.bar.buffers.hidden off
+/set weechat.bar.buffers.items buffers
+/set weechat.bar.buffers.position left
+/set weechat.bar.buffers.size 20
+
+# Automatically keep buffers grouped by server and sorted by name
+/script install autosort.py
+/autosort replacements add ## #
+/autosort rules add irc.server.*.&* = 0
+/autosort rules add irc.server.*.#* = 1
+/autosort rules add irc.server.*.\*status = 2
+
+# Jump-to-buffer with fuzzy completion
+/script install go.py
+
+# Search buffers and logs
+/script install grep.py
+
+# Different colors for different users
+/script install colorize_nicks.py
+/set colorize_nicks.look.colorize_input on
+/set colorize_nicks.look.ignore_nicks_in_urls on
+
+# Colorize whole lines using nick colors
+/script install colorize_lines.pl
+/set plugins.var.perl.colorize_lines.lines on
+
+# notifications via pushover.net
+/script install pushover.pl
+/set plugins.var.ruby.pushover-weechat.userkey "${sec.data.pushover_key}"
diff --git a/weechat/settings.txt b/weechat/settings.txt
index db53cf6f..a99a34ef 100644
--- a/weechat/settings.txt
+++ b/weechat/settings.txt
@@ -7,30 +7,6 @@
 
 /set irc.server_default.ssl on
 /set irc.server_default.ssl_verify on
-/set irc.look.server_buffer independent
-
-
-
-########################################
-#
-# Plugins
-#
-########################################
-
-/script install iset.pl
-/script install buffers.pl
-/script install go.py
-
-/script install colorize_lines.pl
-/set plugins.var.perl.colorize_lines.lines on
-
-/script install colorize_nicks.py
-/set colorize_nicks.look.colorize_input on
-/set colorize_nicks.look.ignore_nicks_in_urls on
-
-/script install pushover.pl
-/set plugins.var.ruby.pushover-weechat.userkey "${sec.data.pushover_key}"
-
 
 
 ########################################
@@ -39,25 +15,28 @@
 #
 ########################################
 
+# unmerge server buffers from core
+/set irc.look.server_buffer independent
+# ...extra indentation for buffers
+/set buffers.look.indenting on
+
 # One single input bar for all windows
 /bar add rootinput root bottom 1 0 buffer_name+[input_prompt]+(away),[input_search],[input_paste],> input_text
 /bar del input
+/set weechat.bar.rootinput.color_bg 0
 
 # Statusbar
-/set weechat.bar.status.items [buffer_last_number],[buffer_plugin],buffer_number+:+buffer_name+{buffer_nicklist_count}+buffer_zoom+buffer_filter,scroll,[lag],[hotlist],completion
+/set weechat.bar.status.items buffer_name:+{buffer_nicklist_count}+buffer_filter,scroll,[lag],[hotlist],completion
+# Titlebar (statusbar on top)
+/set weechat.bar.title.color_bg 8
+/set weechat.bar.title.position top
 
 # Buffer list
-/set weechat.bar.buffers.position left
-#/set weechat.bar.buffers.filling_top_bottom horizontal
-/set buffers.look.prefix on
-/set buffers.look.hide_merged_buffers all
-/set buffers.color.none_channel_fg 244
-/set buffers.color.current_bg blue
-/set buffers.color.current_fg default
-
+/set buffers.color.none_channel_fg 243
+/set buffers.color.number 240
+/set buffers.color.number_char 242
 /set weechat.look.prefix_same_nick "*"
 /set weechat.bar.nicklist.size 15
-/set weechat.bar.buffers.size 20
 /set weechat.color.chat_channel 247
 /set irc.look.color_nicks_in_nicklist on
 /set irc.look.color_nicks_in_server_messages off
@@ -75,9 +54,9 @@
 /set weechat.color.chat_nick_self *white
 /set weechat.color.chat_delimiters 243
 /set weechat.color.chat_time_delimiters 243
-/set logger.color.backlog.end lightgreen
-/set logger.color.backlog.line 243
 /set weechat.color.nicklist_away 243
+/set logger.color.backlog_end  245
+/set logger.color.backlog_line 241
 
 
 ###