diff --git a/README.md b/README.md
index 9b06dc3..f52f194 100644
--- a/README.md
+++ b/README.md
@@ -6,54 +6,20 @@ I have implemented a manual switching mechanism so that I can switch configurati
# Components
* [i3-gaps](https://github.com/Airblader/i3)
-* [Polybar](https://github.com/jaagr/polybar)
-* [i3lock-fancy](https://github.com/guimeira/i3lock-fancy-multimonitor)
* [Rofi](https://github.com/DaveDavenport/rofi)
* [Dunst](https://github.com/dunst-project/dunst)
-* [Gnome Terminal](https://github.com/GNOME/gnome-terminal)
+* [URxvt](https://github.com/exg/rxvt-unicode)
## Applications
-* [WeeChat](https://github.com/weechat/weechat)
-* [ncmpc](https://github.com/MusicPlayerDaemon/ncmpc)
-* [Newsbeuter](https://github.com/akrennmair/newsbeuter)
+* [ncmpcpp](https://github.com/arybczak/ncmpcpp)
+* [NewsBoat](https://github.com/newsboat/newsboat)
-# Themes
-## Master Branch
-### GTK
-[Materia-dark](https://github.com/nana-4/materia-theme)
-
-### Icons
-[Papirus](https://github.com/PapirusDevelopmentTeam/papirus-icon-theme)
-
-### ZSH Prompt
-[Spaceship](https://github.com/denysdovhan/spaceship-prompt)
-
-### Colors
-Backgrounds: #263238
-
-#### Polybar
-Focused Foreground: #009688
-Unfocused Foreground: #BDBDBD
-Urgent Foreground: #BF360C
-
-#### Gnome Terminal
-I've overridden some colors in Gnome Terminal to make the theming for some apps look right
-
-### Weechat
-I'm using the theme script to theme my weechat.
# Stow Commands
I use Gnu Stow to manage my dotfiles. Dotfiles from this repository can be used by issuing:
~~~
stow -t ~ i3
-stow -t ~ dunst
-stow -t ~ polybar
stow -t ~ rofi
-stow -t ~ gtk
-stow -t ~ zsh
stow -t ~ urxvt
-
-stow -t ~ weechat
-stow -t ~ ncmpc
-stow -t ~ newsbeuter
+stow -t ~ newsboat
~~~
diff --git a/dunst/.config/dunst/dunstrc b/dunst/.config/dunst/dunstrc
deleted file mode 100644
index 94a25b5..0000000
--- a/dunst/.config/dunst/dunstrc
+++ /dev/null
@@ -1,245 +0,0 @@
-[global]
- font = Roboto 10
-
- # Allow a small subset of html markup:
- # bold
- # italic
- # strikethrough
- # underline
- #
- # For a complete reference see
- # .
- # If markup is not allowed, those tags will be stripped out of the
- # message.
- allow_markup = yes
-
- # The format of the message. Possible variables are:
- # %a appname
- # %s summary
- # %b body
- # %i iconname (including its path)
- # %I iconname (without its path)
- # %p progress value if set ([ 0%] to [100%]) or nothing
- # Markup is allowed
- format = "%s\n%b"
-
- # Sort messages by urgency.
- sort = yes
-
- # Show how many messages are currently hidden (because of geometry).
- indicate_hidden = yes
-
- # Alignment of message text.
- # Possible values are "left", "center" and "right".
- alignment = left
-
- # The frequency with wich text that is longer than the notification
- # window allows bounces back and forth.
- # This option conflicts with "word_wrap".
- # Set to 0 to disable.
- bounce_freq = 0
-
- # Show age of message if message is older than show_age_threshold
- # seconds.
- # Set to -1 to disable.
- show_age_threshold = 60
-
- # Split notifications into multiple lines if they don't fit into
- # geometry.
- word_wrap = yes
-
- # Ignore newlines '\n' in notifications.
- ignore_newline = no
-
-
- # The geometry of the window:
- # [{width}]x{height}[+/-{x}+/-{y}]
- # The geometry of the message window.
- # The height is measured in number of notifications everything else
- # in pixels. If the width is omitted but the height is given
- # ("-geometry x2"), the message window expands over the whole screen
- # (dmenu-like). If width is 0, the window expands to the longest
- # message displayed. A positive x is measured from the left, a
- # negative from the right side of the screen. Y is measured from
- # the top and down respectevly.
- # The width can be negative. In this case the actual width is the
- # screen width minus the width defined in within the geometry option.
- geometry = "400x10-5+35"
-
- # Shrink window if it's smaller than the width. Will be ignored if
- # width is 0.
- shrink = no
-
- # The transparency of the window. Range: [0; 100].
- # This option will only work if a compositing windowmanager is
- # present (e.g. xcompmgr, compiz, etc.).
- transparency = 0
-
- # Don't remove messages, if the user is idle (no mouse or keyboard input)
- # for longer than idle_threshold seconds.
- # Set to 0 to disable.
- idle_threshold = 120
-
- # Which monitor should the notifications be displayed on.
- #monitor = 0
-
- # Display notification on focused monitor. Possible modes are:
- # mouse: follow mouse pointer
- # keyboard: follow window with keyboard focus
- # none: don't follow anything
- #
- # "keyboard" needs a windowmanager that exports the
- # _NET_ACTIVE_WINDOW property.
- # This should be the case for almost all modern windowmanagers.
- #
- # If this option is set to mouse or keyboard, the monitor option
- # will be ignored.
- follow = mouse
-
- # Should a notification popped up from history be sticky or timeout
- # as if it would normally do.
- sticky_history = yes
-
- # Maximum amount of notifications kept in history
- history_length = 20
-
- # Display indicators for URLs (U) and actions (A).
- show_indicators = yes
-
- # The height of a single line. If the height is smaller than the
- # font height, it will get raised to the font height.
- # This adds empty space above and under the text.
- line_height = 0
-
- # Draw a line of "separatpr_height" pixel height between two
- # notifications.
- # Set to 0 to disable.
- separator_height = 2
-
- # Padding between text and separator.
- padding = 8
-
- # Horizontal padding.
- horizontal_padding = 8
-
- # Define a color for the separator.
- # possible values are:
- # * auto: dunst tries to find a color fitting to the background;
- # * foreground: use the same color as the foreground;
- # * frame: use the same color as the frame;
- # * anything else will be interpreted as a X color.
- separator_color = frame
-
- # Print a notification on startup.
- # This is mainly for error detection, since dbus (re-)starts dunst
- # automatically after a crash.
- startup_notification = false
-
- # dmenu path.
- dmenu = /usr/bin/dmenu -p dunst:
-
- # Browser for opening urls in context menu.
- browser = /usr/bin/firefox -new-tab
-
- # Align icons left/right/off
- icon_position = off
-
- # Paths to default icons.
- icon_folders = /usr/share/icons/gnome/16x16/status/:/usr/share/icons/gnome/16x16/devices/
-
-[frame]
- width = 2
- color = "#26C6DA"
-
-[shortcuts]
-
- # Shortcuts are specified as [modifier+][modifier+]...key
- # Available modifiers are "ctrl", "mod1" (the alt-key), "mod2",
- # "mod3" and "mod4" (windows-key).
- # Xev might be helpful to find names for keys.
-
- # Close notification.
- close = ctrl+space
-
- # Close all notifications.
- close_all = ctrl+shift+space
-
- # Redisplay last message(s).
- # On the US keyboard layout "grave" is normally above TAB and left
- # of "1".
- history = ctrl+grave
-
- # Context menu.
- context = ctrl+shift+period
-
-[urgency_low]
- # IMPORTANT: colors have to be defined in quotation marks.
- # Otherwise the "#" and following would be interpreted as a comment.
- background = "#26C6DA"
- foreground = "#424242"
- timeout = 10
-
-[urgency_normal]
- background = "#26C6DA"
- foreground = "#424242"
- timeout = 10
-
-[urgency_critical]
- background = "#26C6DA"
- foreground = "#424242"
- timeout = 0
-
-
-# Every section that isn't one of the above is interpreted as a rules to
-# override settings for certain messages.
-# Messages can be matched by "appname", "summary", "body", "icon", "category",
-# "msg_urgency" and you can override the "timeout", "urgency", "foreground",
-# "background", "new_icon" and "format".
-# Shell-like globbing will get expanded.
-#
-# SCRIPTING
-# You can specify a script that gets run when the rule matches by
-# setting the "script" option.
-# The script will be called as follows:
-# script appname summary body icon urgency
-# where urgency can be "LOW", "NORMAL" or "CRITICAL".
-#
-# NOTE: if you don't want a notification to be displayed, set the format
-# to "".
-# NOTE: It might be helpful to run dunst -print in a terminal in order
-# to find fitting options for rules.
-
-#[espeak]
-# summary = "*"
-# script = dunst_espeak.sh
-
-#[script-test]
-# summary = "*script*"
-# script = dunst_test.sh
-
-#[ignore]
-# # This notification will not be displayed
-# summary = "foobar"
-# format = ""
-
-#[signed_on]
-# appname = Pidgin
-# summary = "*signed on*"
-# urgency = low
-#
-#[signed_off]
-# appname = Pidgin
-# summary = *signed off*
-# urgency = low
-#
-#[says]
-# appname = Pidgin
-# summary = *says*
-# urgency = critical
-#
-#[twitter]
-# appname = Pidgin
-# summary = *twitter.com*
-# urgency = normal
-#
-# vim: ft=cfg
diff --git a/gtk/.config/gtk-3.0/gtk.css b/gtk/.config/gtk-3.0/gtk.css
deleted file mode 100644
index ca625b1..0000000
--- a/gtk/.config/gtk-3.0/gtk.css
+++ /dev/null
@@ -1,3 +0,0 @@
-vte-terminal {
- padding: 10px;
-}
\ No newline at end of file
diff --git a/gtk/.config/gtk-3.0/settings.ini b/gtk/.config/gtk-3.0/settings.ini
deleted file mode 100644
index 541d3fe..0000000
--- a/gtk/.config/gtk-3.0/settings.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-[Settings]
-gtk-theme-name=Materia-dark
-gtk-icon-theme-name=Papirus
-gtk-font-name=Google Sans Regular 10
-gtk-cursor-theme-name=Adwaita
-gtk-cursor-theme-size=48
-gtk-toolbar-style=GTK_TOOLBAR_BOTH_HORIZ
-gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
-gtk-button-images=0
-gtk-menu-images=0
-gtk-enable-event-sounds=1
-gtk-enable-input-feedback-sounds=0
-gtk-xft-antialias=1
-gtk-xft-hinting=1
-gtk-xft-hintstyle=hintmedium
-gtk-xft-rgba=rgb
-gtk-application-prefer-dark-theme=1
diff --git a/ncmpc/.ncmpc/config b/ncmpc/.ncmpc/config
deleted file mode 100644
index 574f841..0000000
--- a/ncmpc/.ncmpc/config
+++ /dev/null
@@ -1,14 +0,0 @@
-enable-colors = yes
-color background = none
-color title = 001
-color title-bold = 001
-color line = 001
-color line-flags = 001
-color list = white
-color list-bold = 001
-color progressbar = 001
-color status-state = 001
-color status-song = 001
-color status-time = 001
-color alert = white
-
\ No newline at end of file
diff --git a/newsbeuter/.newsbeuter/config b/newsbeuter/.newsbeuter/config
deleted file mode 100644
index dd336f4..0000000
--- a/newsbeuter/.newsbeuter/config
+++ /dev/null
@@ -1,5 +0,0 @@
-auto-reload yes
-reload-time 60
-browser "w3m %u"
-articlelist-format "%4i %f %D %t"
-
diff --git a/polybar/.config/polybar/config b/polybar/.config/polybar/config
deleted file mode 100644
index 3676aec..0000000
--- a/polybar/.config/polybar/config
+++ /dev/null
@@ -1,189 +0,0 @@
-
- ;=====================================================
-;
-; To learn more about how to configure Polybar
-; go to https://github.com/jaagr/polybar
-;
-; The README contains alot of information
-;
-;=====================================================
-
-[global/wm]
-margin-top = 5
-margin-bottom = 5
-
-[colors]
-label-color = #BDBDBD
-
-visible-background = #263238
-visible-foreground = #009688
-visible-underline = #FF009688
-unfocused-background = #263238
-unfocused-foreground = #BDBDBD
-unfocused-underline= #FFBDBDBD
-focused-background = #263238
-focused-foreground = #009688
-focused-underline = #FF009688
-urgent-background = #263238
-urgent-foreground = #BF360C
-urgent-underline = #FFBF360C
-
-[bar/primary]
-monitor = ${env:PRIMARY}
-width = 100%
-height = 25
-offset-x = 0
-offset-y = 0
-padding-right = 7
-padding-left = 7
-
-underline-size = 3
-underline-color = ${colors.visible-foreground}
-
-background = #263238
-foreground = #FFFFFF00
-
-font-0 = Roboto:size=14:weight=bold;2
-font-1 = unifont:size=6:heavy:fontformat=truetype;-2
-font-2 = siji:pixelsize=10;0
-font-3 = FontAwesome:pixelsize=14;0
-
-modules-left = date
-modules-center = i3
-modules-right = mpd
-
-tray-position = right
-tray-padding = 5
-tray-transparent = false
-
-override-redirect = false
-;wm-restack = i3
-
-scroll-up = i3wm-wsnext
-scroll-down = i3wm-wsprev
-
-[bar/secondary]
-monitor = ${env:SECONDARY}
-width = 100%
-height = 25
-offset-x = 0
-offset-y = 0
-padding-right = 7
-padding-left = 7
-
-underline-size = 3
-underline-color = ${colors.visible-foreground}
-
-background = #263238
-foreground = #00000000
-
-font-0 = Roboto:size=14:weight=bold;2
-font-1 = unifont:size=6:heavy:fontformat=truetype;-2
-font-2 = siji:pixelsize=10;0
-font-3 = FontAwesome:pixelsize=14;0
-
-modules-left =
-modules-center = i3
-modules-right =
-
-override-redirect = false
-;wm-restack = i3
-
-scroll-up = i3wm-wsnext
-scroll-down = i3wm-wsprev
-
-[bar/laptop]
-monitor = ${env:LAPTOP}
-width = 100%
-height = 25
-offset-x = 0
-offset-y = 0
-padding-right = 7
-padding-left = 7
-
-underline-size = 3
-underline-color = ${colors.visible-foreground}
-
-background = #263238
-foreground = #00000000
-
-font-0 = Roboto:size=14:weight=bold;2
-font-1 = unifont:size=6:heavy:fontformat=truetype;-2
-font-2 = siji:pixelsize=10;0
-font-3 = FontAwesome:pixelsize=14;0
-
-modules-left =
-modules-center = i3
-modules-right =
-
-override-redirect = false
-;wm-restack = i3
-
-scroll-up = i3wm-wsnext
-scroll-down = i3wm-wsprev
-
-[module/i3]
-type = internal/i3
-format =
-index-sort = true
-wrapping-scroll = true
-strip-wsnumbers = false
-pin-workspaces = true
-
-label-mode-padding = 5
-
-label-visible-foreground = ${colors.visible-foreground}
-label-visible-background = ${colors.visible-background}
-label-visible-padding = 1
-
-label-unfocused-foreground = ${colors.unfocused-foreground}
-label-unfocused-background = ${colors.unfocused-background}
-label-unfocused-underline = ${colors.unfocused-underline}
-label-unfocused-margin = 1
-label-unfocused-padding-right = 1
-
-label-focused-foreground = ${colors.focused-foreground}
-label-focused-background = ${colors.focused-background}
-label-focused-underline = ${colors.focused-underline}
-label-focused-margin = 1
-label-focused-padding-right = 1
-
-label-urgent-foreground = ${colors.urgent-foreground}
-label-urgent-background = ${colors.urgent-background}
-label-urgent-underline = ${colors.urgent-underline}
-label-urgent-margin = 1
-label-urgent-padding-right = 1
-
-[module/date]
-type = internal/date
-interval = 5
-
-label-foreground = ${colors.label-color}
-label-underline = ${colors.label-color}
-
-date = "%d/%m-%y"
-date-alt = " %d"
-
-time = " %H:%M"
-time-alt = %H:%M
-
-label = %date% %time%
-
-[module/mpd]
-type = internal/mpd
-
-host = 127.0.0.1
-port = 6600
-#password = mysecretpassword
-
-; Seconds to sleep between progressbar/song timer sync
-; Default: 1
-interval = 1
-
-format-online =
-label-song = %artist% - %title%
-label-offline = MPD is offline
-
-label-time-foreground = ${colors.label-color}
-label-song-foreground = ${colors.label-color}
-label-offline-foreground = ${colors.label-color}
diff --git a/polybar/.config/polybar/home-config b/polybar/.config/polybar/home-config
deleted file mode 100644
index 7a9b198..0000000
--- a/polybar/.config/polybar/home-config
+++ /dev/null
@@ -1,158 +0,0 @@
-
-;=====================================================
-;
-; To learn more about how to configure Polybar
-; go to https://github.com/jaagr/polybar
-;
-; The README contains alot of information
-;
-;=====================================================
-
-[global/wm]
-margin-top = 5
-margin-bottom = 5
-
-[colors]
-label-color = #BDBDBD
-
-visible-background = #263238
-visible-foreground = #009688
-visible-underline = #FF009688
-unfocused-background = #263238
-unfocused-foreground = #BDBDBD
-unfocused-underline= #FFBDBDBD
-focused-background = #263238
-focused-foreground = #009688
-focused-underline = #FF009688
-urgent-background = #263238
-urgent-foreground = #BF360C
-urgent-underline = #FFBF360C
-
-[bar/topbar1]
-monitor = DP-2-2
-width = 100%
-height = 25
-offset-x = 0
-offset-y = 0
-padding-right = 7
-padding-left = 7
-
-underline-size = 3
-underline-color = ${colors.visible-foreground}
-
-background = #263238
-foreground = #FFFFFF00
-
-font-0 = Roboto:size=14:weight=bold;2
-font-1 = unifont:size=6:heavy:fontformat=truetype;-2
-font-2 = siji:pixelsize=10;0
-font-3 = FontAwesome:pixelsize=14;0
-
-modules-left = i3
-modules-center = date
-modules-right = mpd
-
-tray-position = right
-tray-padding = 5
-tray-transparent = false
-
-override-redirect = false
-;wm-restack = i3
-
-scroll-up = i3wm-wsnext
-scroll-down = i3wm-wsprev
-
-[bar/topbar2]
-monitor = DP-2-1
-width = 100%
-height = 25
-offset-x = 0
-offset-y = 0
-padding-right = 7
-padding-left = 7
-
-underline-size = 3
-underline-color = ${colors.visible-foreground}
-
-background = #263238
-foreground = #FFFFFF00
-
-font-0 = Roboto:size=14:weight=bold;2
-font-1 = unifont:size=6:heavy:fontformat=truetype;-2
-font-2 = siji:pixelsize=10;0
-font-3 = FontAwesome:pixelsize=14;0
-
-modules-left =
-modules-center = i3
-modules-right =
-
-override-redirect = false
-;wm-restack = i3
-
-scroll-up = i3wm-wsnext
-scroll-down = i3wm-wsprev
-
-[module/i3]
-type = internal/i3
-format =
-index-sort = true
-wrapping-scroll = true
-strip-wsnumbers = false
-pin-workspaces = true
-
-label-mode-padding = 5
-
-label-visible-foreground = ${colors.visible-foreground}
-label-visible-background = ${colors.visible-background}
-label-visible-padding = 1
-
-label-unfocused-foreground = ${colors.unfocused-foreground}
-label-unfocused-background = ${colors.unfocused-background}
-label-unfocused-underline = ${colors.unfocused-underline}
-label-unfocused-margin = 1
-label-unfocused-padding-right = 1
-
-label-focused-foreground = ${colors.focused-foreground}
-label-focused-background = ${colors.focused-background}
-label-focused-underline = ${colors.focused-underline}
-label-focused-margin = 1
-label-focused-padding-right = 1
-
-label-urgent-foreground = ${colors.urgent-foreground}
-label-urgent-background = ${colors.urgent-background}
-label-urgent-underline = ${colors.urgent-underline}
-label-urgent-margin = 1
-label-urgent-padding-right = 1
-
-[module/date]
-type = internal/date
-interval = 5
-
-label-foreground = ${colors.label-color}
-
-date = "%d/%m-%y"
-date-alt = " %d"
-
-time = " %H:%M"
-time-alt = %H:%M
-
-label = %date% %time%
-
-[module/mpd]
-type = internal/mpd
-
-host = 127.0.0.1
-port = 6600
-#password = mysecretpassword
-
-; Seconds to sleep between progressbar/song timer sync
-; Default: 1
-interval = 1
-
-format-online =
-label-song = %artist% - %title%
-label-offline = MPD is offline
-
-label-time-foreground = ${colors.label-color}
-label-song-foreground = ${colors.label-color}
-label-offline-foreground = ${colors.label-color}
diff --git a/polybar/.config/polybar/home-polybar.sh b/polybar/.config/polybar/home-polybar.sh
deleted file mode 100755
index a8fff50..0000000
--- a/polybar/.config/polybar/home-polybar.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-killall polybar
-polybar topbar1 -c ~/.config/polybar/home-config &
-polybar topbar2 -c ~/.config/polybar/home-config &
\ No newline at end of file
diff --git a/polybar/.config/polybar/laptop-config b/polybar/.config/polybar/laptop-config
deleted file mode 100644
index 7b4262b..0000000
--- a/polybar/.config/polybar/laptop-config
+++ /dev/null
@@ -1,153 +0,0 @@
-;=====================================================
-;
-; To learn more about how to configure Polybar
-; go to https://github.com/jaagr/polybar
-;
-; The README contains alot of information
-;
-;=====================================================
-
-[global/wm]
-margin-top = 5
-margin-bottom = 5
-
-[colors]
-label-color = #BDBDBD
-
-visible-background = #263238
-visible-foreground = #009688
-visible-underline = #FF009688
-unfocused-background = #263238
-unfocused-foreground = #BDBDBD
-unfocused-underline= #FFBDBDBD
-focused-background = #263238
-focused-foreground = #009688
-focused-underline = #FF009688
-urgent-background = #263238
-urgent-foreground = #BF360C
-urgent-underline = #FFBF360C
-
-[bar/topbar1]
-monitor = eDP-1
-width = 100%
-height = 30
-offset-x = 0
-;offset-right-x = 15
-offset-y = 0
-padding-right = 7
-padding-left = 7
-fixed-center = true
-
-underline-size = 3
-underline-color = ${colors.visible-foreground}
-
-background = #263238
-foreground = #FFFFFF00
-
-font-0 = Roboto:size=14:weight=bold;2
-font-1 = unifont:size=6:heavy:fontformat=truetype;-2
-font-2 = siji:pixelsize=10;0
-font-3 = FontAwesome:pixelsize=14;0
-
-modules-left = date
-modules-center = i3
-modules-right = mpd battery
-
-tray-position = right
-tray-padding = 5
-tray-transparent = false
-
-override-redirect = false
-
-scroll-up = i3wm-wsnext
-scroll-down = i3wm-wsprev
-
-[module/i3]
-type = internal/i3
-format =
-index-sort = true
-wrapping-scroll = true
-strip-wsnumbers = false
-pin-workspaces = true
-
-label-visible-foreground = ${colors.visible-foreground}
-label-visible-background = ${colors.visible-background}
-label-visible-padding = 1
-
-label-unfocused-foreground = ${colors.unfocused-foreground}
-label-unfocused-background = ${colors.unfocused-background}
-label-unfocused-underline = ${colors.unfocused-underline}
-label-unfocused-margin = 1
-label-unfocused-padding-right = 1
-
-label-focused-foreground = ${colors.focused-foreground}
-label-focused-background = ${colors.focused-background}
-label-focused-underline = ${colors.focused-underline}
-label-focused-margin = 1
-label-focused-padding-right = 1
-
-label-urgent-foreground = ${colors.urgent-foreground}
-label-urgent-background = ${colors.urgent-background}
-label-urgent-underline = ${colors.urgent-underline}
-label-urgent-margin = 1
-label-urgent-padding-right = 1
-
-[module/date]
-type = internal/date
-interval = 5
-
-label-foreground = ${colors.label-color}
-label-underline = ${colors.label-color}
-
-
-date = "%d/%m-%y"
-date-alt = " %d"
-
-time = " %H:%M"
-time-alt = %H:%M
-
-label = %date% %time%
-
-[module/mpd]
-type = internal/mpd
-
-host = 127.0.0.1
-port = 6600
-#password = mysecretpassword
-
-; Seconds to sleep between progressbar/song timer sync
-; Default: 1
-interval = 1
-
-format-online =
-label-song = %artist% - %title%
-label-offline = MPD is offline
-
-label-time-foreground = ${colors.label-color}
-label-song-foreground = ${colors.label-color}
-label-offline-foreground = ${colors.label-color}
-
-[module/battery]
-type = internal/battery
-
-; This is useful in case the battery never reports 100% charge
-full-at = 99
-
-; Use the following command to list batteries and adapters:
-; $ ls -1 /sys/class/power_supply/
-battery = BAT0
-adapter = AC
-
-label-charging = Battery: +%percentage%%
-format-charging =
-label-charging-foreground = ${colors.label-color}
-label-charging-underline = ${colors.label-color}
-label-charging-padding = 1
-
-label-discharging = Battery: -%percentage%%
-format-discharging =
-label-discharging-foreground = ${colors.label-color}
-label-discharging-underline = ${colors.label-color}
-label-discharging-padding = 1
-
-poll-interval = 5
\ No newline at end of file
diff --git a/polybar/.config/polybar/laptop-polybar.sh b/polybar/.config/polybar/laptop-polybar.sh
deleted file mode 100755
index 01bb49e..0000000
--- a/polybar/.config/polybar/laptop-polybar.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-killall polybar
-polybar topbar1 -c ~/.config/polybar/laptop-config &
-feh --bg-scale --zoom fill ~/.config/i3/wallpaper/fedora_simple.jpg &
\ No newline at end of file
diff --git a/polybar/.config/polybar/polybar.sh b/polybar/.config/polybar/polybar.sh
deleted file mode 100755
index 6c96120..0000000
--- a/polybar/.config/polybar/polybar.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-killall polybar
-polybar topbar1 -c ~/.config/polybar/config &
diff --git a/polybar/.config/polybar/work-config b/polybar/.config/polybar/work-config
deleted file mode 100644
index 0e19778..0000000
--- a/polybar/.config/polybar/work-config
+++ /dev/null
@@ -1,189 +0,0 @@
-
- ;=====================================================
-;
-; To learn more about how to configure Polybar
-; go to https://github.com/jaagr/polybar
-;
-; The README contains alot of information
-;
-;=====================================================
-
-[global/wm]
-margin-top = 5
-margin-bottom = 5
-
-[colors]
-label-color = #BDBDBD
-
-visible-background = #263238
-visible-foreground = #009688
-visible-underline = #FF009688
-unfocused-background = #263238
-unfocused-foreground = #BDBDBD
-unfocused-underline= #FFBDBDBD
-focused-background = #263238
-focused-foreground = #009688
-focused-underline = #FF009688
-urgent-background = #263238
-urgent-foreground = #BF360C
-urgent-underline = #FFBF360C
-
-[bar/topbar1]
-monitor = DP-2-2
-width = 100%
-height = 25
-offset-x = 0
-offset-y = 0
-padding-right = 7
-padding-left = 7
-
-underline-size = 3
-underline-color = ${colors.visible-foreground}
-
-background = #263238
-foreground = #FFFFFF00
-
-font-0 = Roboto:size=14:weight=bold;2
-font-1 = unifont:size=6:heavy:fontformat=truetype;-2
-font-2 = siji:pixelsize=10;0
-font-3 = FontAwesome:pixelsize=14;0
-
-modules-left = date
-modules-center = i3
-modules-right = mpd
-
-tray-position = right
-tray-padding = 5
-tray-transparent = false
-
-override-redirect = false
-;wm-restack = i3
-
-scroll-up = i3wm-wsnext
-scroll-down = i3wm-wsprev
-
-[bar/topbar2]
-monitor = DP-2-1
-width = 100%
-height = 25
-offset-x = 0
-offset-y = 0
-padding-right = 7
-padding-left = 7
-
-underline-size = 3
-underline-color = ${colors.visible-foreground}
-
-background = #263238
-foreground = #00000000
-
-font-0 = Roboto:size=14:weight=bold;2
-font-1 = unifont:size=6:heavy:fontformat=truetype;-2
-font-2 = siji:pixelsize=10;0
-font-3 = FontAwesome:pixelsize=14;0
-
-modules-left =
-modules-center = i3
-modules-right =
-
-override-redirect = false
-;wm-restack = i3
-
-scroll-up = i3wm-wsnext
-scroll-down = i3wm-wsprev
-
-[bar/topbar3]
-monitor = eDP-1
-width = 100%
-height = 25
-offset-x = 0
-offset-y = 0
-padding-right = 7
-padding-left = 7
-
-underline-size = 3
-underline-color = ${colors.visible-foreground}
-
-background = #263238
-foreground = #00000000
-
-font-0 = Roboto:size=14:weight=bold;2
-font-1 = unifont:size=6:heavy:fontformat=truetype;-2
-font-2 = siji:pixelsize=10;0
-font-3 = FontAwesome:pixelsize=14;0
-
-modules-left =
-modules-center = i3
-modules-right =
-
-override-redirect = false
-;wm-restack = i3
-
-scroll-up = i3wm-wsnext
-scroll-down = i3wm-wsprev
-
-[module/i3]
-type = internal/i3
-format =
-index-sort = true
-wrapping-scroll = true
-strip-wsnumbers = false
-pin-workspaces = true
-
-label-mode-padding = 5
-
-label-visible-foreground = ${colors.visible-foreground}
-label-visible-background = ${colors.visible-background}
-label-visible-padding = 1
-
-label-unfocused-foreground = ${colors.unfocused-foreground}
-label-unfocused-background = ${colors.unfocused-background}
-label-unfocused-underline = ${colors.unfocused-underline}
-label-unfocused-margin = 1
-label-unfocused-padding-right = 1
-
-label-focused-foreground = ${colors.focused-foreground}
-label-focused-background = ${colors.focused-background}
-label-focused-underline = ${colors.focused-underline}
-label-focused-margin = 1
-label-focused-padding-right = 1
-
-label-urgent-foreground = ${colors.urgent-foreground}
-label-urgent-background = ${colors.urgent-background}
-label-urgent-underline = ${colors.urgent-underline}
-label-urgent-margin = 1
-label-urgent-padding-right = 1
-
-[module/date]
-type = internal/date
-interval = 5
-
-label-foreground = ${colors.label-color}
-label-underline = ${colors.label-color}
-
-date = "%d/%m-%y"
-date-alt = " %d"
-
-time = " %H:%M"
-time-alt = %H:%M
-
-label = %date% %time%
-
-[module/mpd]
-type = internal/mpd
-
-host = 127.0.0.1
-port = 6600
-#password = mysecretpassword
-
-; Seconds to sleep between progressbar/song timer sync
-; Default: 1
-interval = 1
-
-format-online =
-label-song = %artist% - %title%
-label-offline = MPD is offline
-
-label-time-foreground = ${colors.label-color}
-label-song-foreground = ${colors.label-color}
-label-offline-foreground = ${colors.label-color}
diff --git a/polybar/.config/polybar/work-polybar.sh b/polybar/.config/polybar/work-polybar.sh
deleted file mode 100755
index 915fa2f..0000000
--- a/polybar/.config/polybar/work-polybar.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-killall polybar
-polybar topbar1 -c ~/.config/polybar/work-config &
-polybar topbar2 -c ~/.config/polybar/work-config &
-polybar topbar3 -c ~/.config/polybar/work-config &
\ No newline at end of file
diff --git a/weechat/.weechat/themes/material.theme b/weechat/.weechat/themes/material.theme
deleted file mode 100644
index 5dce4e6..0000000
--- a/weechat/.weechat/themes/material.theme
+++ /dev/null
@@ -1,133 +0,0 @@
-#
-# -- WeeChat theme --
-# $name: material.theme
-# $date: 2018-02-10
-# $weechat: 1.9.1
-# $script: theme.py 0.1-dev
-#
-aspell.color.misspelled = "lightred"
-aspell.color.suggestion = "default"
-aspell.color.suggestion_delimiter_dict = "cyan"
-aspell.color.suggestion_delimiter_word = "cyan"
-irc.color.input_nick = "lightcyan"
-irc.color.item_channel_modes = "default"
-irc.color.item_lag_counting = "default"
-irc.color.item_lag_finished = "yellow"
-irc.color.item_nick_modes = "default"
-irc.color.message_join = "green"
-irc.color.message_quit = "red"
-irc.color.mirc_remap = "1,-1:darkgray"
-irc.color.nick_prefixes = "q:lightred;a:lightcyan;o:lightgreen;h:lightmagenta;v:yellow;*:lightblue"
-irc.color.notice = "green"
-irc.color.reason_quit = "default"
-irc.color.topic_current = "default"
-irc.color.topic_new = "white"
-irc.color.topic_old = "default"
-logger.color.backlog_end = "default"
-logger.color.backlog_line = "default"
-relay.color.client = "cyan"
-relay.color.status_active = "lightblue"
-relay.color.status_auth_failed = "lightred"
-relay.color.status_connecting = "yellow"
-relay.color.status_disconnected = "lightred"
-relay.color.status_waiting_auth = "brown"
-relay.color.text = "default"
-relay.color.text_bg = "default"
-relay.color.text_selected = "white"
-weechat.bar.input.color_bg = "default"
-weechat.bar.input.color_delim = "cyan"
-weechat.bar.input.color_fg = "default"
-weechat.bar.nicklist.color_bg = "default"
-weechat.bar.nicklist.color_delim = "cyan"
-weechat.bar.nicklist.color_fg = "default"
-weechat.bar.status.color_bg = "001"
-weechat.bar.status.color_delim = "002"
-weechat.bar.status.color_fg = "002"
-weechat.bar.title.color_bg = "001"
-weechat.bar.title.color_delim = "002"
-weechat.bar.title.color_fg = "002"
-weechat.color.bar_more = "lightmagenta"
-weechat.color.chat = "default"
-weechat.color.chat_bg = "default"
-weechat.color.chat_buffer = "white"
-weechat.color.chat_channel = "white"
-weechat.color.chat_day_change = "cyan"
-weechat.color.chat_delimiters = "green"
-weechat.color.chat_highlight = "yellow"
-weechat.color.chat_highlight_bg = "magenta"
-weechat.color.chat_host = "cyan"
-weechat.color.chat_inactive_buffer = "default"
-weechat.color.chat_inactive_window = "default"
-weechat.color.chat_nick = "lightcyan"
-weechat.color.chat_nick_colors = "cyan,magenta,green,brown,lightblue,default,lightcyan,lightmagenta,lightgreen,blue"
-weechat.color.chat_nick_offline = "default"
-weechat.color.chat_nick_offline_highlight = "default"
-weechat.color.chat_nick_offline_highlight_bg = "001"
-weechat.color.chat_nick_other = "cyan"
-weechat.color.chat_nick_prefix = "green"
-weechat.color.chat_nick_self = "white"
-weechat.color.chat_nick_suffix = "green"
-weechat.color.chat_prefix_action = "white"
-weechat.color.chat_prefix_buffer = "brown"
-weechat.color.chat_prefix_buffer_inactive_buffer = "default"
-weechat.color.chat_prefix_error = "yellow"
-weechat.color.chat_prefix_join = "lightgreen"
-weechat.color.chat_prefix_more = "lightmagenta"
-weechat.color.chat_prefix_network = "magenta"
-weechat.color.chat_prefix_quit = "lightred"
-weechat.color.chat_prefix_suffix = "green"
-weechat.color.chat_read_marker = "magenta"
-weechat.color.chat_read_marker_bg = "default"
-weechat.color.chat_server = "brown"
-weechat.color.chat_tags = "red"
-weechat.color.chat_text_found = "yellow"
-weechat.color.chat_text_found_bg = "lightmagenta"
-weechat.color.chat_time = "default"
-weechat.color.chat_time_delimiters = "brown"
-weechat.color.chat_value = "cyan"
-weechat.color.chat_value_null = "blue"
-weechat.color.emphasized = "yellow"
-weechat.color.emphasized_bg = "magenta"
-weechat.color.input_actions = "lightgreen"
-weechat.color.input_text_not_found = "red"
-weechat.color.item_away = "yellow"
-weechat.color.nicklist_away = "cyan"
-weechat.color.nicklist_group = "green"
-weechat.color.separator = "001"
-weechat.color.status_count_highlight = "002"
-weechat.color.status_count_msg = "002"
-weechat.color.status_count_other = "002"
-weechat.color.status_count_private = "002"
-weechat.color.status_data_highlight = "002"
-weechat.color.status_data_msg = "002"
-weechat.color.status_data_other = "002"
-weechat.color.status_data_private = "002"
-weechat.color.status_filter = "002"
-weechat.color.status_more = "002"
-weechat.color.status_mouse = "002"
-weechat.color.status_name = "002"
-weechat.color.status_name_ssl = "002"
-weechat.color.status_nicklist_count = "002"
-weechat.color.status_number = "002"
-weechat.color.status_time = "002"
-weechat.look.buffer_time_format = "%H:%M:%S"
-weechat.look.color_inactive_buffer = "on"
-weechat.look.color_inactive_message = "on"
-weechat.look.color_inactive_prefix = "on"
-weechat.look.color_inactive_prefix_buffer = "on"
-weechat.look.color_inactive_time = "off"
-weechat.look.color_inactive_window = "on"
-weechat.look.color_nick_offline = "off"
-weechat.look.nick_color_force = ""
-weechat.look.nick_color_hash = "djb2"
-weechat.look.nick_color_stop_chars = "_|["
-xfer.color.status_aborted = "lightred"
-xfer.color.status_active = "lightblue"
-xfer.color.status_connecting = "yellow"
-xfer.color.status_done = "lightgreen"
-xfer.color.status_failed = "lightred"
-xfer.color.status_waiting = "lightcyan"
-xfer.color.text = "default"
-xfer.color.text_bg = "default"
-xfer.color.text_selected = "white"
-buflist.format.buffer_current = "${color:,001}${format_buffer}"
\ No newline at end of file
diff --git a/zsh/.zshrc b/zsh/.zshrc
deleted file mode 100644
index 7223c5c..0000000
--- a/zsh/.zshrc
+++ /dev/null
@@ -1,39 +0,0 @@
-# If you come from bash you might have to change your $PATH.
-# export PATH=$HOME/bin:/usr/local/bin:$PATH
-
-#Path to your oh-my-zsh installation.
-export ZSH=/home/jfm/.oh-my-zsh
-
-export TERM="xterm-256color"
-
-## Theme
-ZSH_THEME="spaceship"
-
-## Plugins
-plugins=(git gradle mvn docker sublime dnf taskwarrior)
-
-source $ZSH/oh-my-zsh.sh
-
-## Exports
-export ANT_HOME=/home/jfm/Tools/apache-ant-1.9.4
-export MVN_HOME=/home/jfm/Tools/apache-maven-3.2.5
-export GRADLE_HOME=/home/jfm/Tools/gradle-4.0.1
-export JAVA_HOME=/home/jfm/Tools/jdk1.8.0_111
-export FLY_HOME=/home/jfm/Tools/fly
-export PATH=$FLY_HOME:$JAVA_HOME/bin:$ANT_HOME/bin:$MVN_HOME/bin:$GRADLE_HOME/bin:/usr/bin:$PATH:
-
-## Alias
-alias oc="/home/jfm/Tools/openshift-origin-client-tools-v3.6.0/oc"
-alias ocdel="/home/jfm/Tools/openshift-origin-client-tools-v3.6.0/oc delete bc,builds,dc,rc,routes,svc,po -l"
-alias portfwd="/home/jfm/Customers/TDC/Scripts/portforwards.sh"
-alias mopd="nohup mopidy >/dev/null 2>&1 &"
-
-# Disable history Sharing
-unsetopt share_history
-
-#Add OC support
-source <(oc completion zsh)
-
-#HOME/END Support
-bindkey "\e[7~" beginning-of-line
-bindkey "\e[8~" end-of-line
\ No newline at end of file