diff --git a/config/herbstluftwm/autostart b/config/herbstluftwm/autostart
deleted file mode 100755
index efe39b1..0000000
--- a/config/herbstluftwm/autostart
+++ /dev/null
@@ -1,241 +0,0 @@
-#!/bin/bash
-
-# this is a simple config for herbstluftwm
-
-hc() {
-    herbstclient "$@"
-}
-
-hc emit_hook reload
-
-hc set default_frame_layout 2
-
-# xsetroot -solid '#5A8E3A'
-
-# keybindings {{{
-# remove all existing keybindings
-hc keyunbind --all
-
-# if you have a super key you will be much happier with Mod set to Mod4
-#Mod=Mod1    # Use alt as the main modifier
-Mod=Mod4   # Use the super key as the main modifier
-
-# herbstluft control
-hc keybind $Mod-Shift-q quit
-hc keybind $Mod-Shift-r reload
-hc keybind $Mod-q close
-
-# application spawning
-hc keybind $Mod-Return spawn urxvtc
-hc keybind $Mod-Shift-s spawn systemctl suspend
-hc keybind $Mod-e spawn dmenu_run -z
-hc keybind Scroll_Lock spawn dmenu_run
-hc keybind $Mod-b spawn urxvtc -name ranger -e ranger
-hc keybind $Mod-Control-c spawn urxvtc -name weechat -e weechat
-hc keybind $Mod-Control-n spawn urxvtc -name newsbeuter -e newsbeuter
-hc keybind $Mod-Control-m spawn urxvtc -name sup -e sup
-
-# Media buttons
-hc keybind XF86AudioMute spawn sound_control.sh toggle
-hc keybind XF86AudioRaiseVolume spawn sound_control.sh up
-hc keybind XF86AudioLowerVolume spawn sound_control.sh down
-hc keybind XF86AudioNext spawn quodlibet --next
-hc keybind XF86AudioPlay spawn quodlibet --play-pause
-hc keybind XF86AudioPrev spawn quodlibet --previous
-hc keybind XF86MonBrightnessUp spawn xbacklight -inc 10
-hc keybind XF86MonBrightnessDown spawn xbacklight -dec 10
-#hc keybind XF86MonBrightnessUp
-#hc keybind XF86MonBrightnessDown
-
-# basic movement
-# 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
-hc keybind $Mod-h     focus left
-hc keybind $Mod-j     focus down
-hc keybind $Mod-k     focus up
-hc keybind $Mod-l     focus right
-
-# moving clients
-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-Shift-h     shift left
-hc keybind $Mod-Shift-j     shift down
-hc keybind $Mod-Shift-k     shift up
-hc keybind $Mod-Shift-l     shift right
-
-# splitting frames
-# create an empty frame at the specified direction
-hc keybind $Mod-u       split   bottom  0.5
-hc keybind $Mod-o       split   right   0.5
-# let the current frame explode into subframes
-hc keybind $Mod-Control-space split explode
-
-# resizing frames
-resizestep=0.05
-hc keybind $Mod-Control-h       resize left +$resizestep
-hc keybind $Mod-Control-j       resize down +$resizestep
-hc keybind $Mod-Control-k       resize up +$resizestep
-hc keybind $Mod-Control-l       resize right +$resizestep
-hc keybind $Mod-Control-Left    resize left +$resizestep
-hc keybind $Mod-Control-Down    resize down +$resizestep
-hc keybind $Mod-Control-Up      resize up +$resizestep
-hc keybind $Mod-Control-Right   resize right +$resizestep
-
-# tags
-tag_names=( {1..9} mail news chat )
-tag_keys=( {1..9} m n c 0 )
-
-hc rename default "${tag_names[0]}" || true
-for i in ${!tag_names[@]} ; do
-    name="${tag_names[$i]}"
-    key="${tag_keys[$i]}"
-    hc add "$name"
-    if ! [ -z "$key" ] ; then
-        hc keybind "$Mod-$key" use "$name"
-        hc keybind "$Mod-Shift-$key" move "$name"
-        hc set_layout max
-    fi
-done
-
-# cycle through tags
-hc keybind $Mod-period use_index +1 --skip-visible
-hc keybind $Mod-comma  use_index -1 --skip-visible
-
-# layouting
-hc keybind $Mod-r remove
-hc keybind $Mod-space cycle_layout 1
-hc keybind $Mod-s floating toggle
-hc keybind $Mod-f fullscreen toggle
-hc keybind $Mod-p pseudotile toggle
-
-# 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-i jumpto urgent
-
-# }}} keybindings
-
-# mouse bindings {{{
-hc mouseunbind --all
-hc mousebind $Mod-Button1 move
-hc mousebind $Mod-Button2 zoom
-hc mousebind $Mod-Button3 resize
-# }}} mousebindings
-
-# theme {{{
-hc attr theme.tiling.reset 1
-hc attr theme.floating.reset 1
-hc set frame_border_active_color '#222222'
-hc set frame_border_normal_color '#101010'
-hc set frame_bg_normal_color '#565656'
-hc set frame_bg_active_color '#345F0C'
-hc set frame_border_width 1
-hc set always_show_frame 1
-hc set frame_bg_transparent 1
-hc set frame_transparent_width 5
-hc set frame_gap 4
-
-hc attr theme.active.color '#9fbc00'
-hc attr theme.normal.color '#454545'
-hc attr theme.urgent.color orange
-hc attr theme.inner_width 1
-hc attr theme.inner_color black
-hc attr theme.border_width 3
-hc attr theme.floating.border_width 4
-hc attr theme.floating.outer_width 1
-hc attr theme.floating.outer_color black
-hc attr theme.active.inner_color '#3E4A00'
-hc attr theme.active.outer_color '#3E4A00'
-hc attr theme.background_color '#141414'
-
-hc set window_gap 0
-hc set frame_padding 0
-hc set smart_window_surroundings 0
-hc set smart_frame_surroundings 1
-hc set mouse_recenter_gap 0
-# }}} theme
-
-# general rules {{{
-hc unrule -F
-#hc rule class=XTerm tag=3 # move all xterms to tag 3
-hc rule focus=on # normally focus new clients
-#hc rule focus=off # normally do not focus new clients
-# give focus to most common terminals
-#hc rule class~'(.*[Rr]xvt.*|.*[Tt]erm|Konsole)' focus=on
-hc rule windowtype~'_NET_WM_WINDOW_TYPE_(DIALOG|UTILITY|SPLASH)' pseudotile=on
-hc rule windowtype='_NET_WM_WINDOW_TYPE_DIALOG' focus=on
-hc rule windowtype~'_NET_WM_WINDOW_TYPE_(NOTIFICATION|DOCK|DESKTOP)' manage=off
-# }}} general rules
-
-# Application Specific {{{
-
-# GIMP {{{
-# ensure there is a gimp tag
-hc add gimp
-hc load gimp '
-(split horizontal:0.850000:0
-  (split horizontal:0.200000:1
-    (clients vertical:0)
-    (clients grid:0))
-  (clients vertical:0))
-'               # load predefined layout
-# center all other gimp windows on gimp tag
-hc rule class=Gimp tag=gimp index=01 pseudotile=on
-hc rule class=Gimp windowrole~'gimp-(image-window|toolbox|dock)' \
-    pseudotile=off
-hc rule class=Gimp windowrole=gimp-toolbox focus=off index=00
-hc rule class=Gimp windowrole=gimp-dock focus=off index=1
-# }}} Gimp
-
-# Additional Pseudotilers {{{
-hc rule class="zenity" pseudotile=on
-hc rule class="mpv" pseudotile=on
-hc rule instance="pinentry-gtk-2" pseudotile=on
-# }}}
-
-# Application tags {{{
-hc rule instance="Mail" tag=mail
-hc rule title="weechat" tag=chat
-hc rule title="newsbeuter" tag=news
-hc rule title="sup" tag=mail
-# }}}
-
-# }}} Application Specific
-
-# unlock, just to be sure
-hc unlock
-
-herbstclient set tree_style '╾│ ├└╼─┐'
-
-# monitors {{{
-# do multi monitor setup here, e.g.:
-# hc set_monitors 1280x1024+0+0 1280x1024+1280+0
-# or simply:
-xrandr --output LVDS1 --auto
-if grep -q "HDMI1 connected" <(xrandr); then
- xrandr --output HDMI1 --auto --${ORIENTATION:-right}-of LVDS1
-fi
-hc detect_monitors
-# }}} monitors
-
-# panel {{{
-# find the panel
-panel=~/.config/herbstluftwm/panel.sh
-[ -x "$panel" ] || panel=/etc/xdg/herbstluftwm/panel.sh
-for monitor in $(herbstclient list_monitors | cut -d: -f1) ; do
-    # start it on each monitor
-    "$panel" $monitor &
-done
-# }}} panel
-
-# background {{{
-sh ~/.fehbg &
-# }}} background
-
-# vim: foldmethod=marker
diff --git a/config/herbstluftwm/panel.sh b/config/herbstluftwm/panel.sh
deleted file mode 100755
index 859b467..0000000
--- a/config/herbstluftwm/panel.sh
+++ /dev/null
@@ -1,252 +0,0 @@
-#!/bin/bash
-
-
-hc() { "${herbstclient_command[@]:-herbstclient}" "$@" ;}
-monitor=${1:-0}
-geometry=( $(herbstclient monitor_rect "$monitor") )
-if [ -z "$geometry" ] ;then
-    echo "Invalid monitor $monitor"
-    exit 1
-fi
-# geometry has the format W H X Y
-x=${geometry[0]}
-y=${geometry[1]}
-panel_width=${geometry[2]}
-panel_height=16
-font="-*-fixed-medium-*-*-*-12-*-*-*-*-*-*-*"
-bgcolor=$(hc get frame_border_normal_color)
-selbg=$(hc get window_border_active_color)
-selfg='#101010'
-
-####
-# Try to find textwidth binary.
-# In e.g. Ubuntu, this is named dzen2-textwidth.
-if which textwidth &> /dev/null ; then
-    textwidth="textwidth";
-elif which dzen2-textwidth &> /dev/null ; then
-    textwidth="dzen2-textwidth";
-else
-    echo "This script requires the textwidth tool of the dzen2 project."
-    exit 1
-fi
-####
-# true if we are using the svn version of dzen2
-# depending on version/distribution, this seems to have version strings like
-# "dzen-" or "dzen-x.x.x-svn"
-if dzen2 -v 2>&1 | head -n 1 | grep -q '^dzen-\([^,]*-svn\|\),'; then
-    dzen2_svn="true"
-else
-    dzen2_svn=""
-fi
-
-if awk -Wv 2>/dev/null | head -1 | grep -q '^mawk'; then
-    # mawk needs "-W interactive" to line-buffer stdout correctly
-    # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=593504
-    uniq_linebuffered() {
-      awk -W interactive '$0 != l { print ; l=$0 ; fflush(); }' "$@"
-    }
-else
-    # other awk versions (e.g. gawk) issue a warning with "-W interactive", so
-    # we don't want to use it there.
-    uniq_linebuffered() {
-      awk '$0 != l { print ; l=$0 ; fflush(); }' "$@"
-    }
-fi
-
-hc pad $monitor $panel_height
-
-{
-    ### Event generator ###
-    # based on different input data (mpc, date, hlwm hooks, ...) this generates events, formed like this:
-    #   <eventname>\t<data> [...]
-    # e.g.
-    #   date    ^fg(#efefef)18:33^fg(#909090), 2013-10-^fg(#efefef)29
-
-    #mpc idleloop player &
-
-    # time/date events
-    while true ; do
-        # "date" output is checked once a second, but an event is only
-        # generated if the output changed compared to the previous run.
-        date +$'date\t^fg(#efefef)%H:%M^fg(#909090), ^fg(#efefef)%a %Y-%m-^fg(#efefef)%d'
-        sleep 1 || break
-    done > >(uniq_linebuffered) &
-    timeloop=$!
-
-    # battery events
-    while true ; do
-        ac="$(cat /sys/class/power_supply/AC/online)"
-        current="$(cat /sys/class/power_supply/BAT0/charge_now)"
-        full="$(cat /sys/class/power_supply/BAT0/charge_full)"
-        percent="$((current * 100 / full))"
-
-        if (( current > full )); then
-            current="$full"
-            percent="100"
-        fi
-
-        if (( percent < 5 && ac == 0 )); then
-            sb="^fg(#ff0000)"
-            eb="^fg(#900000)"
-        else
-            sb="^fg(#efefef)"
-            eb="^fg(#909090)"
-        fi
-        printf "power\t${eb}Bat: ${sb}%s%2d${eb}%%\n" \
-            "$(echo $ac | tr '01' '-+')" \
-            "$((current * 100 / full))"
-
-        sleep 5 || break
-    done > >(uniq_linebuffered) &
-    batteryloop=$!
-
-    # quodlibet events
-    while true ; do
-        status=$(quodlibet --status | cut -d' ' -f1)
-        ts="^ca(1,quodlibet --toggle-window)"
-        te="^ca()"
-        case $status in
-            "playing")
-                echo -en "music\t$ts^fg(#909090)"
-                echo -n "$(quodlibet --print-playing "<title~album>" | iconv -f utf-8 -t ascii//translit)"
-                echo "$te"
-                ;;
-            "paused")
-                echo -e "music\t$ts^fg(#909090)pauzed$te"
-                ;;
-            *)
-                ;;
-        esac
-        sleep 5 || break
-    done > >(uniq_linebuffered) &
-    quodloop=$!
-
-    # hc events
-    hc --idle
-    kill $timeloop
-    kill $batteryloop
-    kill $quodloop
-} 2> /dev/null | {
-    IFS=$'\t' read -ra tags <<< "$(hc tag_status $monitor)"
-    visible=true
-    date=""
-    power=""
-    music=""
-    windowtitle=""
-    while true ; do
-
-        ### Output ###
-        # This part prints dzen data based on the _previous_ data handling run,
-        # and then waits for the next event to happen.
-
-        bordercolor="#26221C"
-        separator="^bg()^fg($selbg)|"
-        # draw tags
-        for i in "${tags[@]}" ; do
-            if [ "$(hc get_attr tags.by-name.$i.client_count)" = "0" ]; then
-                continue
-            fi
-            case ${i:0:1} in
-                '#')
-                    echo -n "^bg($selbg)^fg($selfg)"
-                    ;;
-                '+')
-                    echo -n "^bg(#9CA668)^fg(#141414)"
-                    ;;
-                ':')
-                    echo -n "^bg()^fg(#ffffff)"
-                    ;;
-                '!')
-                    echo -n "^bg(#FF0675)^fg(#141414)"
-                    ;;
-                *)
-                    echo -n "^bg()^fg(#ababab)"
-                    ;;
-            esac
-            if [ ! -z "$dzen2_svn" ] ; then
-                # clickable tags if using SVN dzen
-                echo -n "^ca(1,\"${herbstclient_command[@]:-herbstclient}\" "
-                echo -n "focus_monitor \"$monitor\" && "
-                echo -n "\"${herbstclient_command[@]:-herbstclient}\" "
-                echo -n "use \"${i:1}\") ${i:1} ^ca()"
-            else
-                # non-clickable tags if using older dzen
-                echo -n " ${i:1} "
-            fi
-        done
-        echo -n "$separator"
-        echo -n "^bg()^fg() ${windowtitle//^/^^}"
-        # small adjustments
-        right="$music $separator^bg() $power $separator $date $separator"
-        right_text_only=$(echo -n "$right" | sed 's.\^[^(]*([^)]*)..g')
-        # get width of right aligned text.. and add some space..
-        width=$($textwidth "$font" "$right_text_only    ")
-        echo -n "^pa($(($panel_width - $width)))$right"
-        echo
-
-        ### Data handling ###
-        # This part handles the events generated in the event loop, and sets
-        # internal variables based on them. The event and its arguments are
-        # read into the array cmd, then action is taken depending on the event
-        # name.
-        # "Special" events (quit_panel/togglehidepanel/reload) are also handled
-        # here.
-
-        # wait for next event
-        IFS=$'\t' read -ra cmd || break
-        # find out event origin
-        case "${cmd[0]}" in
-            tag*)
-                #echo "resetting tags" >&2
-                IFS=$'\t' read -ra tags <<< "$(hc tag_status $monitor)"
-                ;;
-            date)
-                #echo "resetting date" >&2
-                date="${cmd[@]:1}"
-                ;;
-            power)
-                power="${cmd[@]:1}"
-                ;;
-            music)
-                music="${cmd[@]:1}"
-                ;;
-            quit_panel)
-                exit
-                ;;
-            togglehidepanel)
-                currentmonidx=$(hc list_monitors | sed -n '/\[FOCUS\]$/s/:.*//p')
-                if [ "${cmd[1]}" -ne "$monitor" ] ; then
-                    continue
-                fi
-                if [ "${cmd[1]}" = "current" ] && [ "$currentmonidx" -ne "$monitor" ] ; then
-                    continue
-                fi
-                echo "^togglehide()"
-                if $visible ; then
-                    visible=false
-                    hc pad $monitor 0
-                else
-                    visible=true
-                    hc pad $monitor $panel_height
-                fi
-                ;;
-            reload)
-                exit
-                ;;
-            focus_changed|window_title_changed)
-                windowtitle="${cmd[@]:2}"
-                ;;
-            #player)
-            #    ;;
-        esac
-    done
-
-    ### dzen2 ###
-    # After the data is gathered and processed, the output of the previous block
-    # gets piped to dzen2.
-
-} 2> /dev/null | dzen2 -w $panel_width -x $x -y $y -fn "$font" -h $panel_height \
-    -e 'button3=;button4=exec:herbstclient use_index -1;button5=exec:herbstclient use_index +1' \
-    -ta l -bg "$bgcolor" -fg '#efefef'
-
-# vim: foldmethod=marker
diff --git a/config/xmobar/icons/bat-ac/0.xpm b/config/icons/bat-ac/0.xpm
similarity index 100%
rename from config/xmobar/icons/bat-ac/0.xpm
rename to config/icons/bat-ac/0.xpm
diff --git a/config/xmobar/icons/bat-ac/1.xpm b/config/icons/bat-ac/1.xpm
similarity index 100%
rename from config/xmobar/icons/bat-ac/1.xpm
rename to config/icons/bat-ac/1.xpm
diff --git a/config/xmobar/icons/bat-ac/2.xpm b/config/icons/bat-ac/2.xpm
similarity index 100%
rename from config/xmobar/icons/bat-ac/2.xpm
rename to config/icons/bat-ac/2.xpm
diff --git a/config/xmobar/icons/bat-ac/3.xpm b/config/icons/bat-ac/3.xpm
similarity index 100%
rename from config/xmobar/icons/bat-ac/3.xpm
rename to config/icons/bat-ac/3.xpm
diff --git a/config/xmobar/icons/bat-ac/4.xpm b/config/icons/bat-ac/4.xpm
similarity index 100%
rename from config/xmobar/icons/bat-ac/4.xpm
rename to config/icons/bat-ac/4.xpm
diff --git a/config/xmobar/icons/bat-ac/5.xpm b/config/icons/bat-ac/5.xpm
similarity index 100%
rename from config/xmobar/icons/bat-ac/5.xpm
rename to config/icons/bat-ac/5.xpm
diff --git a/config/xmobar/icons/bat-ac/6.xpm b/config/icons/bat-ac/6.xpm
similarity index 100%
rename from config/xmobar/icons/bat-ac/6.xpm
rename to config/icons/bat-ac/6.xpm
diff --git a/config/xmobar/icons/bat-ac/7.xpm b/config/icons/bat-ac/7.xpm
similarity index 100%
rename from config/xmobar/icons/bat-ac/7.xpm
rename to config/icons/bat-ac/7.xpm
diff --git a/config/xmobar/icons/bat-ac/8.xpm b/config/icons/bat-ac/8.xpm
similarity index 100%
rename from config/xmobar/icons/bat-ac/8.xpm
rename to config/icons/bat-ac/8.xpm
diff --git a/config/xmobar/icons/bat/0.xpm b/config/icons/bat/0.xpm
similarity index 100%
rename from config/xmobar/icons/bat/0.xpm
rename to config/icons/bat/0.xpm
diff --git a/config/xmobar/icons/bat/1.xpm b/config/icons/bat/1.xpm
similarity index 100%
rename from config/xmobar/icons/bat/1.xpm
rename to config/icons/bat/1.xpm
diff --git a/config/xmobar/icons/bat/2.xpm b/config/icons/bat/2.xpm
similarity index 100%
rename from config/xmobar/icons/bat/2.xpm
rename to config/icons/bat/2.xpm
diff --git a/config/xmobar/icons/bat/3.xpm b/config/icons/bat/3.xpm
similarity index 100%
rename from config/xmobar/icons/bat/3.xpm
rename to config/icons/bat/3.xpm
diff --git a/config/xmobar/icons/bat/4.xpm b/config/icons/bat/4.xpm
similarity index 100%
rename from config/xmobar/icons/bat/4.xpm
rename to config/icons/bat/4.xpm
diff --git a/config/xmobar/icons/bat/5.xpm b/config/icons/bat/5.xpm
similarity index 100%
rename from config/xmobar/icons/bat/5.xpm
rename to config/icons/bat/5.xpm
diff --git a/config/xmobar/icons/bat/6.xpm b/config/icons/bat/6.xpm
similarity index 100%
rename from config/xmobar/icons/bat/6.xpm
rename to config/icons/bat/6.xpm
diff --git a/config/xmobar/icons/bat/7.xpm b/config/icons/bat/7.xpm
similarity index 100%
rename from config/xmobar/icons/bat/7.xpm
rename to config/icons/bat/7.xpm
diff --git a/config/xmobar/icons/bat/8.xpm b/config/icons/bat/8.xpm
similarity index 100%
rename from config/xmobar/icons/bat/8.xpm
rename to config/icons/bat/8.xpm
diff --git a/config/xmobar/icons/battery-all.png b/config/icons/battery-all.png
similarity index 100%
rename from config/xmobar/icons/battery-all.png
rename to config/icons/battery-all.png
diff --git a/config/xmobar/icons/battery.xcf b/config/icons/battery.xcf
similarity index 100%
rename from config/xmobar/icons/battery.xcf
rename to config/icons/battery.xcf
diff --git a/config/xmobar/icons/brightness.xcf b/config/icons/brightness.xcf
similarity index 100%
rename from config/xmobar/icons/brightness.xcf
rename to config/icons/brightness.xcf
diff --git a/config/xmobar/icons/brightness/0.xpm b/config/icons/brightness/0.xpm
similarity index 100%
rename from config/xmobar/icons/brightness/0.xpm
rename to config/icons/brightness/0.xpm
diff --git a/config/xmobar/icons/brightness/1.xpm b/config/icons/brightness/1.xpm
similarity index 100%
rename from config/xmobar/icons/brightness/1.xpm
rename to config/icons/brightness/1.xpm
diff --git a/config/xmobar/icons/brightness/2.xpm b/config/icons/brightness/2.xpm
similarity index 100%
rename from config/xmobar/icons/brightness/2.xpm
rename to config/icons/brightness/2.xpm
diff --git a/config/xmobar/icons/brightness/3.xpm b/config/icons/brightness/3.xpm
similarity index 100%
rename from config/xmobar/icons/brightness/3.xpm
rename to config/icons/brightness/3.xpm
diff --git a/config/xmobar/icons/brightness/4.xpm b/config/icons/brightness/4.xpm
similarity index 100%
rename from config/xmobar/icons/brightness/4.xpm
rename to config/icons/brightness/4.xpm
diff --git a/config/xmobar/icons/brightness/5.xpm b/config/icons/brightness/5.xpm
similarity index 100%
rename from config/xmobar/icons/brightness/5.xpm
rename to config/icons/brightness/5.xpm
diff --git a/config/xmobar/icons/brightness/6.xpm b/config/icons/brightness/6.xpm
similarity index 100%
rename from config/xmobar/icons/brightness/6.xpm
rename to config/icons/brightness/6.xpm
diff --git a/config/xmobar/icons/brightness/7.xpm b/config/icons/brightness/7.xpm
similarity index 100%
rename from config/xmobar/icons/brightness/7.xpm
rename to config/icons/brightness/7.xpm
diff --git a/config/xmobar/icons/brightness/8.xpm b/config/icons/brightness/8.xpm
similarity index 100%
rename from config/xmobar/icons/brightness/8.xpm
rename to config/icons/brightness/8.xpm
diff --git a/config/xmobar/icons/cpu.xcf b/config/icons/cpu.xcf
similarity index 100%
rename from config/xmobar/icons/cpu.xcf
rename to config/icons/cpu.xcf
diff --git a/config/xmobar/icons/cpu/0.xpm b/config/icons/cpu/0.xpm
similarity index 100%
rename from config/xmobar/icons/cpu/0.xpm
rename to config/icons/cpu/0.xpm
diff --git a/config/xmobar/icons/cpu/1.xpm b/config/icons/cpu/1.xpm
similarity index 100%
rename from config/xmobar/icons/cpu/1.xpm
rename to config/icons/cpu/1.xpm
diff --git a/config/xmobar/icons/cpu/2.xpm b/config/icons/cpu/2.xpm
similarity index 100%
rename from config/xmobar/icons/cpu/2.xpm
rename to config/icons/cpu/2.xpm
diff --git a/config/xmobar/icons/cpu/3.xpm b/config/icons/cpu/3.xpm
similarity index 100%
rename from config/xmobar/icons/cpu/3.xpm
rename to config/icons/cpu/3.xpm
diff --git a/config/xmobar/icons/cpu/4.xpm b/config/icons/cpu/4.xpm
similarity index 100%
rename from config/xmobar/icons/cpu/4.xpm
rename to config/icons/cpu/4.xpm
diff --git a/config/xmobar/icons/cpu/5.xpm b/config/icons/cpu/5.xpm
similarity index 100%
rename from config/xmobar/icons/cpu/5.xpm
rename to config/icons/cpu/5.xpm
diff --git a/config/xmobar/icons/cpu/6.xpm b/config/icons/cpu/6.xpm
similarity index 100%
rename from config/xmobar/icons/cpu/6.xpm
rename to config/icons/cpu/6.xpm
diff --git a/config/xmobar/icons/cpu/7.xpm b/config/icons/cpu/7.xpm
similarity index 100%
rename from config/xmobar/icons/cpu/7.xpm
rename to config/icons/cpu/7.xpm
diff --git a/config/xmobar/icons/cpu/8.xpm b/config/icons/cpu/8.xpm
similarity index 100%
rename from config/xmobar/icons/cpu/8.xpm
rename to config/icons/cpu/8.xpm
diff --git a/config/xmobar/icons/cpu1/0.xpm b/config/icons/cpu1/0.xpm
similarity index 100%
rename from config/xmobar/icons/cpu1/0.xpm
rename to config/icons/cpu1/0.xpm
diff --git a/config/xmobar/icons/cpu1/1.xpm b/config/icons/cpu1/1.xpm
similarity index 100%
rename from config/xmobar/icons/cpu1/1.xpm
rename to config/icons/cpu1/1.xpm
diff --git a/config/xmobar/icons/cpu1/2.xpm b/config/icons/cpu1/2.xpm
similarity index 100%
rename from config/xmobar/icons/cpu1/2.xpm
rename to config/icons/cpu1/2.xpm
diff --git a/config/xmobar/icons/cpu1/3.xpm b/config/icons/cpu1/3.xpm
similarity index 100%
rename from config/xmobar/icons/cpu1/3.xpm
rename to config/icons/cpu1/3.xpm
diff --git a/config/xmobar/icons/cpu1/4.xpm b/config/icons/cpu1/4.xpm
similarity index 100%
rename from config/xmobar/icons/cpu1/4.xpm
rename to config/icons/cpu1/4.xpm
diff --git a/config/xmobar/icons/cpu1/5.xpm b/config/icons/cpu1/5.xpm
similarity index 100%
rename from config/xmobar/icons/cpu1/5.xpm
rename to config/icons/cpu1/5.xpm
diff --git a/config/xmobar/icons/cpu1/6.xpm b/config/icons/cpu1/6.xpm
similarity index 100%
rename from config/xmobar/icons/cpu1/6.xpm
rename to config/icons/cpu1/6.xpm
diff --git a/config/xmobar/icons/cpu1/7.xpm b/config/icons/cpu1/7.xpm
similarity index 100%
rename from config/xmobar/icons/cpu1/7.xpm
rename to config/icons/cpu1/7.xpm
diff --git a/config/xmobar/icons/cpu1/8.xpm b/config/icons/cpu1/8.xpm
similarity index 100%
rename from config/xmobar/icons/cpu1/8.xpm
rename to config/icons/cpu1/8.xpm
diff --git a/config/xmobar/icons/cpu4/0.xpm b/config/icons/cpu4/0.xpm
similarity index 100%
rename from config/xmobar/icons/cpu4/0.xpm
rename to config/icons/cpu4/0.xpm
diff --git a/config/xmobar/icons/cpu4/1.xpm b/config/icons/cpu4/1.xpm
similarity index 100%
rename from config/xmobar/icons/cpu4/1.xpm
rename to config/icons/cpu4/1.xpm
diff --git a/config/xmobar/icons/cpu4/2.xpm b/config/icons/cpu4/2.xpm
similarity index 100%
rename from config/xmobar/icons/cpu4/2.xpm
rename to config/icons/cpu4/2.xpm
diff --git a/config/xmobar/icons/cpu4/3.xpm b/config/icons/cpu4/3.xpm
similarity index 100%
rename from config/xmobar/icons/cpu4/3.xpm
rename to config/icons/cpu4/3.xpm
diff --git a/config/xmobar/icons/cpu4/4.xpm b/config/icons/cpu4/4.xpm
similarity index 100%
rename from config/xmobar/icons/cpu4/4.xpm
rename to config/icons/cpu4/4.xpm
diff --git a/config/xmobar/icons/cpu4/5.xpm b/config/icons/cpu4/5.xpm
similarity index 100%
rename from config/xmobar/icons/cpu4/5.xpm
rename to config/icons/cpu4/5.xpm
diff --git a/config/xmobar/icons/cpu4/6.xpm b/config/icons/cpu4/6.xpm
similarity index 100%
rename from config/xmobar/icons/cpu4/6.xpm
rename to config/icons/cpu4/6.xpm
diff --git a/config/xmobar/icons/cpu4/7.xpm b/config/icons/cpu4/7.xpm
similarity index 100%
rename from config/xmobar/icons/cpu4/7.xpm
rename to config/icons/cpu4/7.xpm
diff --git a/config/xmobar/icons/cpu4/8.xpm b/config/icons/cpu4/8.xpm
similarity index 100%
rename from config/xmobar/icons/cpu4/8.xpm
rename to config/icons/cpu4/8.xpm
diff --git a/config/xmobar/icons/music.xcf b/config/icons/music.xcf
similarity index 100%
rename from config/xmobar/icons/music.xcf
rename to config/icons/music.xcf
diff --git a/config/xmobar/icons/music/pause.xpm b/config/icons/music/pause.xpm
similarity index 100%
rename from config/xmobar/icons/music/pause.xpm
rename to config/icons/music/pause.xpm
diff --git a/config/xmobar/icons/music/play.xpm b/config/icons/music/play.xpm
similarity index 100%
rename from config/xmobar/icons/music/play.xpm
rename to config/icons/music/play.xpm
diff --git a/config/xmobar/icons/sound.xcf b/config/icons/sound.xcf
similarity index 100%
rename from config/xmobar/icons/sound.xcf
rename to config/icons/sound.xcf
diff --git a/config/xmobar/icons/sound/high.xpm b/config/icons/sound/high.xpm
similarity index 100%
rename from config/xmobar/icons/sound/high.xpm
rename to config/icons/sound/high.xpm
diff --git a/config/xmobar/icons/sound/low.xpm b/config/icons/sound/low.xpm
similarity index 100%
rename from config/xmobar/icons/sound/low.xpm
rename to config/icons/sound/low.xpm
diff --git a/config/xmobar/icons/sound/medium.xpm b/config/icons/sound/medium.xpm
similarity index 100%
rename from config/xmobar/icons/sound/medium.xpm
rename to config/icons/sound/medium.xpm
diff --git a/config/xmobar/icons/sound/mute.xpm b/config/icons/sound/mute.xpm
similarity index 100%
rename from config/xmobar/icons/sound/mute.xpm
rename to config/icons/sound/mute.xpm
diff --git a/config/xmobar/icons/sound/none.xpm b/config/icons/sound/none.xpm
similarity index 100%
rename from config/xmobar/icons/sound/none.xpm
rename to config/icons/sound/none.xpm
diff --git a/config/xmobar/icons/wired.xcf b/config/icons/wired.xcf
similarity index 100%
rename from config/xmobar/icons/wired.xcf
rename to config/icons/wired.xcf
diff --git a/config/xmobar/icons/wired/0.xpm b/config/icons/wired/0.xpm
similarity index 100%
rename from config/xmobar/icons/wired/0.xpm
rename to config/icons/wired/0.xpm
diff --git a/config/xmobar/icons/wired/1.xpm b/config/icons/wired/1.xpm
similarity index 100%
rename from config/xmobar/icons/wired/1.xpm
rename to config/icons/wired/1.xpm
diff --git a/config/xmobar/icons/wired/2.xpm b/config/icons/wired/2.xpm
similarity index 100%
rename from config/xmobar/icons/wired/2.xpm
rename to config/icons/wired/2.xpm
diff --git a/config/xmobar/icons/wired/3.xpm b/config/icons/wired/3.xpm
similarity index 100%
rename from config/xmobar/icons/wired/3.xpm
rename to config/icons/wired/3.xpm
diff --git a/config/xmobar/icons/wired/4.xpm b/config/icons/wired/4.xpm
similarity index 100%
rename from config/xmobar/icons/wired/4.xpm
rename to config/icons/wired/4.xpm
diff --git a/config/xmobar/icons/wired/5.xpm b/config/icons/wired/5.xpm
similarity index 100%
rename from config/xmobar/icons/wired/5.xpm
rename to config/icons/wired/5.xpm
diff --git a/config/xmobar/icons/wired/6.xpm b/config/icons/wired/6.xpm
similarity index 100%
rename from config/xmobar/icons/wired/6.xpm
rename to config/icons/wired/6.xpm
diff --git a/config/xmobar/icons/wired/7.xpm b/config/icons/wired/7.xpm
similarity index 100%
rename from config/xmobar/icons/wired/7.xpm
rename to config/icons/wired/7.xpm
diff --git a/config/xmobar/icons/wired/8.xpm b/config/icons/wired/8.xpm
similarity index 100%
rename from config/xmobar/icons/wired/8.xpm
rename to config/icons/wired/8.xpm
diff --git a/config/xmobar/icons/wireless.xcf b/config/icons/wireless.xcf
similarity index 100%
rename from config/xmobar/icons/wireless.xcf
rename to config/icons/wireless.xcf
diff --git a/config/xmobar/icons/wireless/0.xpm b/config/icons/wireless/0.xpm
similarity index 100%
rename from config/xmobar/icons/wireless/0.xpm
rename to config/icons/wireless/0.xpm
diff --git a/config/xmobar/icons/wireless/1.xpm b/config/icons/wireless/1.xpm
similarity index 100%
rename from config/xmobar/icons/wireless/1.xpm
rename to config/icons/wireless/1.xpm
diff --git a/config/xmobar/icons/wireless/2.xpm b/config/icons/wireless/2.xpm
similarity index 100%
rename from config/xmobar/icons/wireless/2.xpm
rename to config/icons/wireless/2.xpm
diff --git a/config/xmobar/icons/wireless/3.xpm b/config/icons/wireless/3.xpm
similarity index 100%
rename from config/xmobar/icons/wireless/3.xpm
rename to config/icons/wireless/3.xpm
diff --git a/config/xmobar/icons/wireless/4.xpm b/config/icons/wireless/4.xpm
similarity index 100%
rename from config/xmobar/icons/wireless/4.xpm
rename to config/icons/wireless/4.xpm
diff --git a/config/xmobar/icons/wireless/5.xpm b/config/icons/wireless/5.xpm
similarity index 100%
rename from config/xmobar/icons/wireless/5.xpm
rename to config/icons/wireless/5.xpm
diff --git a/config/xmobar/icons/wireless/6.xpm b/config/icons/wireless/6.xpm
similarity index 100%
rename from config/xmobar/icons/wireless/6.xpm
rename to config/icons/wireless/6.xpm
diff --git a/config/xmobar/icons/wireless/7.xpm b/config/icons/wireless/7.xpm
similarity index 100%
rename from config/xmobar/icons/wireless/7.xpm
rename to config/icons/wireless/7.xpm
diff --git a/config/xmobar/icons/wireless/8.xpm b/config/icons/wireless/8.xpm
similarity index 100%
rename from config/xmobar/icons/wireless/8.xpm
rename to config/icons/wireless/8.xpm
diff --git a/config/sxhkd/sxhkd.conf b/config/sxhkd/sxhkd.conf
deleted file mode 100644
index 7a196c0..0000000
--- a/config/sxhkd/sxhkd.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-super + Return
-    urxvt
-
-~button1
-    nwmctl focus pointer
-
-super + {_, shift + } {h, t, n, s}
-    nwmctl {focus, push} {left, down, up, right}
-
-super + shift + w
-    killw $(pfw)
-
-super + shift + q
-    pkill nwm
-
-Scroll_Lock
-    dmenu_run
diff --git a/config/xmobar/scripts/music b/config/xmobar/scripts/music
deleted file mode 100755
index 9426f58..0000000
--- a/config/xmobar/scripts/music
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-if mpc -q; then
-    case "$(mpc status | sed -n '2s/\[\(\w*\)\].*/\1/p')" in
-        "playing") icon="<icon=music/play.xpm/>"  ;;
-        *)         icon="<icon=music/pause.xpm/>" ;;
-    esac
-    echo '<action=`urxvtc -e "ncmpcpp" "-c" "~/.config/ncmpcpp/config"`>'"$icon"'</action>'
-fi
-
diff --git a/config/xmobar/scripts/sound b/config/xmobar/scripts/sound
deleted file mode 100755
index 94abb80..0000000
--- a/config/xmobar/scripts/sound
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-sound="mute"
-
-if grep -q "\[on\]" <(amixer get Master); then
-    current="$(amixer get Master | sed -n '/%/s/.*\[\(.*\)%\].*/\1/p' | head -1)"
-    if (( current <= 25 )); then
-        sound="none"
-    elif (( current <= 50 )); then
-        sound="low"
-    elif (( current <= 75 )); then
-        sound="medium"
-    else
-        sound="high"
-    fi
-fi
-
-echo '<action=`pavucontrol`><icon=sound/'"$sound.xpm"'/></action>'
-
diff --git a/config/yabar/yabar.conf b/config/yabar/yabar.conf
deleted file mode 100644
index ebe80b0..0000000
--- a/config/yabar/yabar.conf
+++ /dev/null
@@ -1,40 +0,0 @@
-bar-list = ["topbar"];
-topbar:{
-    font: "Droid Sans, FontAwesome Bold 9";
-    block-list: ["date", "wifi", "battery"];
-    position: "top";
-    gap-horizontal: 0;
-    gap-vertical: 0;
-    height: 20;
-    background-color-argb: 0x0;
-    underline-size: 2;
-    oveerline-size: 2;
-    slack-size: 4; // unused space between blocks
-    date:{
-        exec: "date +'%a %d %b, %I:%M'";
-        align: "center";
-        fixed-size: 150;
-        type: "periodic";
-        interval: 1;
-        foreground-color-rgb:0xFFFFFF;
-        underline-color-rgb:0x0;
-    }
-    battery:{
-        exec: "acpi -b | tr -d ' ' | cut -d',' -f2";
-        align: "right";
-        fixed-size: 50;
-        type: "periodic";
-        interval: 3;
-        foreground-color-rgb:0xFFFFFF;
-        underline-color-rgb:0x0;
-    }
-    wifi:{
-        exec: "wpa_cli status | sed -n 's/^ssid=//p'";
-        align: "right";
-        fixed-size: 100;
-        type: "periodic";
-        interval: 5;
-        foreground-color-rgb:0xFFFFFF;
-        underline-color-rgb:0x0;
-    }
-}
diff --git a/vimusrc b/vimusrc
deleted file mode 100644
index 75f66d6..0000000
--- a/vimusrc
+++ /dev/null
@@ -1,12 +0,0 @@
-
-set-library-path /mnt/lexicon/Music
-
-# a light-on-dark color scheme
-color tab green black
-color main cyan black
-color ruler green black
-color songstatus blue black
-color playstatus blue black
-color error white red
-color input white black
-color suggestions green black
diff --git a/xmobarrc b/xmobarrc
deleted file mode 100644
index 6f02317..0000000
--- a/xmobarrc
+++ /dev/null
@@ -1,58 +0,0 @@
-
-Config { font = "xft:Source Code Pro:size=9"
-       , additionalFonts = []
-       , bgColor = "#000000"
-       , fgColor = "#bfbfbf"
-       , sepChar = "%"
-       , alignSep = "}{"
-       , border = NoBorder
-       , borderColor = "#000000"
-       , position = Top
-       , lowerOnStart = False
-       , hideOnStart = False
-       , allDesktops = True
-       , overrideRedirect = True
-       , pickBroadest = False
-       , persistent = False
-       , textOffset = 13
-       , alpha = 200
-       , iconRoot = ".config/xmobar/icons"
-       , iconOffset = 8
-       , commands = [ Run Date "%B, %a %0d, %H:%M" "date" 10
-                    --, Run Mpris2 "org.mpris.quodlibet" [] 100
-                    , Run Battery
-                        [ "-t", "<leftipat>"
-                        , "--"
-                        , "--on-icon-pattern", "<icon=bat-ac/%%.xpm/>"
-                        , "--off-icon-pattern", "<icon=bat/%%.xpm/>"
-                        ] 50
-                    , Run Network "enp9s0"
-                        [ "--template", "<rxipat>"
-                        , "--"
-                        , "--rx-icon-pattern", "<icon=wired/%%.xpm/>"
-                        ] 50
-                    , Run Wireless "wlp7s0"
-                        [ "--template", "<qualityipat>"
-                        , "--"
-                        , "--quality-icon-pattern", "<icon=wireless/%%.xpm/>"
-                        ] 50
-                    , Run Brightness
-                        [ "--template", "<ipat>"
-                        , "--"
-                        , "-D", "intel_backlight"
-                        , "--brightness-icon-pattern", "<icon=brightness/%%.xpm/>"
-                        ] 50
-                    , Run MultiCpu
-                        [ "--template", "<ipat0><ipat1><ipat2><ipat3>"
-                        , "--"
-                        , "--load-icon-patterns", "<icon=cpu1/%%.xpm/>"
-                        , "--load-icon-patterns", "<icon=cpu/%%.xpm/>"
-                        , "--load-icon-patterns", "<icon=cpu/%%.xpm/>"
-                        , "--load-icon-patterns", "<icon=cpu4/%%.xpm/>"
-                        ] 50
-                    , Run Com ".config/xmobar/scripts/music" [] "music" 10
-                    , Run Com ".config/xmobar/scripts/sound" [] "sound" 10
-                    , Run StdinReader
-                    ]
-       , template = " %StdinReader%} %date% {%multicpu%%music%%sound%%wlp7s0wi%%enp9s0%%bright%%battery% "
-       }