Remove unneeded

61 files changed, 0 insertions, 4176 deletions

diff --git a/alacritty/alacritty.yml b/alacritty/alacritty.yml
deleted file mode 100644
index d87e07a..0000000
--- a/alacritty/alacritty.yml
+++ /dev/null
@@ -1,569 +0,0 @@
-# Configuration for Alacritty, the GPU enhanced terminal emulator.
-
-# Any items in the `env` entry below will be added as
-# environment variables. Some entries may override variables
-# set by alacritty itself.
-#env:
-  # TERM variable
-  #
-  # This value is used to set the `$TERM` environment variable for
-  # each instance of Alacritty. If it is not present, alacritty will
-  # check the local terminfo database and use `alacritty` if it is
-  # available, otherwise `xterm-256color` is used.
-  #TERM: xterm-256color
-
-#window:
-  # Window dimensions (changes require restart)
-  #
-  # Specified in number of columns/lines, not pixels.
-  # If both are `0`, this setting is ignored.
-  #dimensions:
-  #  columns: 0
-  #  lines: 0
-
-  # Window position (changes require restart)
-  #
-  # Specified in number of pixels.
-  # If the position is not set, the window manager will handle the placement.
-  #position:
-  #  x: 0
-  #  y: 0
-
-  # Window padding (changes require restart)
-  #
-  # Blank space added around the window in pixels. This padding is scaled
-  # by DPI and the specified value is always added at both opposing sides.
-  #padding:
-  #  x: 0
-  #  y: 0
-
-  # Spread additional padding evenly around the terminal content.
-  #dynamic_padding: false
-
-  # Window decorations
-  #
-  # Values for `decorations`:
-  #     - full: Borders and title bar
-  #     - none: Neither borders nor title bar
-  #
-  # Values for `decorations` (macOS only):
-  #     - transparent: Title bar, transparent background and title bar buttons
-  #     - buttonless: Title bar, transparent background, but no title bar buttons
-  #decorations: full
-
-  # Startup Mode (changes require restart)
-  #
-  # Values for `startup_mode`:
-  #   - Windowed
-  #   - Maximized
-  #   - Fullscreen
-  #
-  # Values for `startup_mode` (macOS only):
-  #   - SimpleFullscreen
-  #startup_mode: Windowed
-
-  # Window title
-  #title: Alacritty
-
-  # Window class (Linux/BSD only):
-  #class:
-    # Application instance name
-    #instance: Alacritty
-    # General application class
-    #general: Alacritty
-
-  # GTK theme variant (Linux/BSD only)
-  #
-  # Override the variant of the GTK theme. Commonly supported values are `dark` and `light`.
-  # Set this to `None` to use the default theme variant.
-  #gtk_theme_variant: None
-
-#scrolling:
-  # Maximum number of lines in the scrollback buffer.
-  # Specifying '0' will disable scrolling.
-  #history: 10000
-
-  # Number of lines the viewport will move for every line scrolled when
-  # scrollback is enabled (history > 0).
-  #multiplier: 3
-
-  # Scroll to the bottom when new text is written to the terminal.
-  #auto_scroll: false
-
-# Spaces per Tab (changes require restart)
-#
-# This setting defines the width of a tab in cells.
-#
-# Some applications, like Emacs, rely on knowing about the width of a tab.
-# To prevent unexpected behavior in these applications, it's also required to
-# change the `it` value in terminfo when altering this setting.
-#tabspaces: 8
-
-# Font configuration
-font:
-  # Normal (roman) font face
-  #normal:
-    # Font family
-    #
-    # Default:
-    #   - (macOS) Menlo
-    #   - (Linux/BSD) monospace
-    #   - (Windows) Consolas
-    #family: monospace
-
-    # The `style` can be specified to pick a specific face.
-    #style: Regular
-
-  # Bold font face
-  #bold:
-    # Font family
-    #
-    # If the bold family is not specified, it will fall back to the
-    # value specified for the normal font.
-    #family: monospace
-
-    # The `style` can be specified to pick a specific face.
-    #style: Bold
-
-  # Italic font face
-  #italic:
-    # Font family
-    #
-    # If the italic family is not specified, it will fall back to the
-    # value specified for the normal font.
-    #family: monospace
-
-    # The `style` can be specified to pick a specific face.
-    #style: Italic
-
-  # Bold italic font face
-  #bold_italic:
-    # Font family
-    #
-    # If the bold italic family is not specified, it will fall back to the
-    # value specified for the normal font.
-    #family: monospace
-
-    # The `style` can be specified to pick a specific face.
-    #style: Bold Italic
-
-  # Point size
-  size: 12.0
-
-  # Offset is the extra space around each character. `offset.y` can be thought of
-  # as modifying the line spacing, and `offset.x` as modifying the letter spacing.
-  #offset:
-  #  x: 0
-  #  y: 0
-
-  # Glyph offset determines the locations of the glyphs within their cells with
-  # the default being at the bottom. Increasing `x` moves the glyph to the right,
-  # increasing `y` moves the glyph upwards.
-  #glyph_offset:
-  #  x: 0
-  #  y: 0
-
-  # Thin stroke font rendering (macOS only)
-  #
-  # Thin strokes are suitable for retina displays, but for non-retina screens
-  # it is recommended to set `use_thin_strokes` to `false`
-  #
-  # macOS >= 10.14.x:
-  #
-  # If the font quality on non-retina display looks bad then set
-  # `use_thin_strokes` to `true` and enable font smoothing by running the
-  # following command:
-  #   `defaults write -g CGFontRenderingFontSmoothingDisabled -bool NO`
-  #
-  # This is a global setting and will require a log out or restart to take
-  # effect.
-  #use_thin_strokes: true
-
-# If `true`, bold text is drawn using the bright color variants.
-#draw_bold_text_with_bright_colors: true
-
-# Colors (Tomorrow Night Bright)
-colors:
-  # Default colors
-  primary:
-          background: '0x000000ff'
-  #  foreground: '0xeaeaea'
-
-    # Bright and dim foreground colors
-    #
-    # The dimmed foreground color is calculated automatically if it is not present.
-    # If the bright foreground color is not set, or `draw_bold_text_with_bright_colors`
-    # is `false`, the normal foreground color will be used.
-    #dim_foreground: '0x9a9a9a'
-    #bright_foreground: '0xffffff'
-
-  # Cursor colors
-  #
-  # Colors which should be used to draw the terminal cursor. If these are unset,
-  # the cursor color will be the inverse of the cell color.
-  #cursor:
-  #  text: '0x000000'
-  #  cursor: '0xffffff'
-
-  # Selection colors
-  #
-  # Colors which should be used to draw the selection area. If selection
-  # background is unset, selection color will be the inverse of the cell colors.
-  # If only text is unset the cell text color will remain the same.
-  #selection:
-  #  text: '0xeaeaea'
-  #  background: '0x404040'
-
-  # Normal colors
-  #normal:
-  #  black:   '0x000000'
-  #  red:     '0xd54e53'
-  #  green:   '0xb9ca4a'
-  #  yellow:  '0xe6c547'
-  #  blue:    '0x7aa6da'
-  #  magenta: '0xc397d8'
-  #  cyan:    '0x70c0ba'
-  #  white:   '0xeaeaea'
-
-  # Bright colors
-  #bright:
-  #  black:   '0x666666'
-  #  red:     '0xff3334'
-  #  green:   '0x9ec400'
-  #  yellow:  '0xe7c547'
-  #  blue:    '0x7aa6da'
-  #  magenta: '0xb77ee0'
-  #  cyan:    '0x54ced6'
-  #  white:   '0xffffff'
-
-  # Dim colors
-  #
-  # If the dim colors are not set, they will be calculated automatically based
-  # on the `normal` colors.
-  #dim:
-  #  black:   '0x000000'
-  #  red:     '0x8c3336'
-  #  green:   '0x7a8530'
-  #  yellow:  '0x97822e'
-  #  blue:    '0x506d8f'
-  #  magenta: '0x80638e'
-  #  cyan:    '0x497e7a'
-  #  white:   '0x9a9a9a'
-
-  # Indexed Colors
-  #
-  # The indexed colors include all colors from 16 to 256.
-  # When these are not set, they're filled with sensible defaults.
-  #
-  # Example:
-  #   `- { index: 16, color: '0xff00ff' }`
-  #
-  #indexed_colors: []
-
-# Visual Bell
-#
-# Any time the BEL code is received, Alacritty "rings" the visual bell. Once
-# rung, the terminal background will be set to white and transition back to the
-# default background color. You can control the rate of this transition by
-# setting the `duration` property (represented in milliseconds). You can also
-# configure the transition function by setting the `animation` property.
-#
-# Values for `animation`:
-#   - Ease
-#   - EaseOut
-#   - EaseOutSine
-#   - EaseOutQuad
-#   - EaseOutCubic
-#   - EaseOutQuart
-#   - EaseOutQuint
-#   - EaseOutExpo
-#   - EaseOutCirc
-#   - Linear
-#
-# Specifying a `duration` of `0` will disable the visual bell.
-#visual_bell:
-#  animation: EaseOutExpo
-#  duration: 0
-#  color: '0xffffff'
-
-# Background opacity
-#
-# Window opacity as a floating point number from `0.0` to `1.0`.
-# The value `0.0` is completely transparent and `1.0` is opaque.
-background_opacity: 0.7
-
-#selection:
-  #semantic_escape_chars: ",│`|:\"' ()[]{}<>\t"
-
-  # When set to `true`, selected text will be copied to the primary clipboard.
-  #save_to_clipboard: false
-
-# Allow terminal applications to change Alacritty's window title.
-#dynamic_title: true
-
-#cursor:
-  # Cursor style
-  #
-  # Values for `style`:
-  #   - ▇ Block
-  #   - _ Underline
-  #   - | Beam
-  #style: Block
-
-  # If this is `true`, the cursor will be rendered as a hollow box when the
-  # window is not focused.
-  #unfocused_hollow: true
-
-# Live config reload (changes require restart)
-#live_config_reload: true
-
-# Shell
-#
-# You can set `shell.program` to the path of your favorite shell, e.g. `/bin/fish`.
-# Entries in `shell.args` are passed unmodified as arguments to the shell.
-#
-# Default:
-#   - (macOS) /bin/bash --login
-#   - (Linux/BSD) user login shell
-#   - (Windows) powershell
-#shell:
-#  program: /bin/bash
-#  args:
-#    - --login
-
-# Startup directory
-#
-# Directory the shell is started in. If this is unset, or `None`, the working
-# directory of the parent process will be used.
-#working_directory: None
-
-# WinPTY backend (Windows only)
-#
-# Alacritty defaults to using the newer ConPTY backend if it is available,
-# since it resolves a lot of bugs and is quite a bit faster. If it is not
-# available, the the WinPTY backend will be used instead.
-#
-# Setting this option to `true` makes Alacritty use the legacy WinPTY backend,
-# even if the ConPTY backend is available.
-#winpty_backend: false
-
-# Send ESC (\x1b) before characters when alt is pressed.
-#alt_send_esc: true
-
-#debug:
-  # Display the time it takes to redraw each frame.
-  #render_timer: false
-
-  # Keep the log file after quitting Alacritty.
-  #persistent_logging: false
-
-  # Log level
-  #
-  # Values for `log_level`:
-  #   - None
-  #   - Error
-  #   - Warn
-  #   - Info
-  #   - Debug
-  #   - Trace
-  #log_level: Warn
-
-  # Print all received window events.
-  #print_events: false
-
-  # Record all characters and escape sequences as test data.
-  #ref_test: false
-
-#mouse:
-  # Click settings
-  #
-  # The `double_click` and `triple_click` settings control the time
-  # alacritty should wait for accepting multiple clicks as one double
-  # or triple click.
-  #double_click: { threshold: 300 }
-  #triple_click: { threshold: 300 }
-
-  # If this is `true`, the cursor is temporarily hidden when typing.
-  #hide_when_typing: false
-
-  #url:
-    # URL launcher
-    #
-    # This program is executed when clicking on a text which is recognized as a URL.
-    # The URL is always added to the command as the last parameter.
-    #
-    # When set to `None`, URL launching will be disabled completely.
-    #
-    # Default:
-    #   - (macOS) open
-    #   - (Linux/BSD) xdg-open
-    #   - (Windows) explorer
-    #launcher:
-    #  program: xdg-open
-    #  args: []
-
-    # URL modifiers
-    #
-    # These are the modifiers that need to be held down for opening URLs when clicking
-    # on them. The available modifiers are documented in the key binding section.
-    #modifiers: None
-
-# Mouse bindings
-#
-# Mouse bindings are specified as a list of objects, much like the key
-# bindings further below.
-#
-# Each mouse binding will specify a:
-#
-# - `mouse`:
-#
-#   - Middle
-#   - Left
-#   - Right
-#   - Numeric identifier such as `5`
-#
-# - `action` (see key bindings)
-#
-# And optionally:
-#
-# - `mods` (see key bindings)
-#mouse_bindings:
-#  - { mouse: Middle, action: PasteSelection }
-
-# Key bindings
-#
-# Key bindings are specified as a list of objects. For example, this is the
-# default paste binding:
-#
-# `- { key: V, mods: Control|Shift, action: Paste }`
-#
-# Each key binding will specify a:
-#
-# - `key`: Identifier of the key pressed
-#
-#    - A-Z
-#    - F1-F24
-#    - Key0-Key9
-#
-#    A full list with available key codes can be found here:
-#    https://docs.rs/glutin/*/glutin/event/enum.VirtualKeyCode.html#variants
-#
-#    Instead of using the name of the keys, the `key` field also supports using
-#    the scancode of the desired key. Scancodes have to be specified as a
-#    decimal number. This command will allow you to display the hex scancodes
-#    for certain keys:
-#
-#       `showkey --scancodes`.
-#
-# Then exactly one of:
-#
-# - `chars`: Send a byte sequence to the running application
-#
-#    The `chars` field writes the specified string to the terminal. This makes
-#    it possible to pass escape sequences. To find escape codes for bindings
-#    like `PageUp` (`"\x1b[5~"`), you can run the command `showkey -a` outside
-#    of tmux. Note that applications use terminfo to map escape sequences back
-#    to keys. It is therefore required to update the terminfo when changing an
-#    escape sequence.
-#
-# - `action`: Execute a predefined action
-#
-#   - Copy
-#   - Paste
-#   - PasteSelection
-#   - IncreaseFontSize
-#   - DecreaseFontSize
-#   - ResetFontSize
-#   - ScrollPageUp
-#   - ScrollPageDown
-#   - ScrollLineUp
-#   - ScrollLineDown
-#   - ScrollToTop
-#   - ScrollToBottom
-#   - ClearHistory
-#   - Hide
-#   - Minimize
-#   - Quit
-#   - ToggleFullscreen
-#   - SpawnNewInstance
-#   - ClearLogNotice
-#   - ReceiveChar
-#   - None
-#
-#   (macOS only):
-#   - ToggleSimpleFullscreen: Enters fullscreen without occupying another space
-#
-# - `command`: Fork and execute a specified command plus arguments
-#
-#    The `command` field must be a map containing a `program` string and an
-#    `args` array of command line parameter strings. For example:
-#       `{ program: "alacritty", args: ["-e", "vttest"] }`
-#
-# And optionally:
-#
-# - `mods`: Key modifiers to filter binding actions
-#
-#    - Command
-#    - Control
-#    - Option
-#    - Super
-#    - Shift
-#    - Alt
-#
-#    Multiple `mods` can be combined using `|` like this:
-#       `mods: Control|Shift`.
-#    Whitespace and capitalization are relevant and must match the example.
-#
-# - `mode`: Indicate a binding for only specific terminal reported modes
-#
-#    This is mainly used to send applications the correct escape sequences
-#    when in different modes.
-#
-#    - AppCursor
-#    - AppKeypad
-#    - Alt
-#
-#    A `~` operator can be used before a mode to apply the binding whenever
-#    the mode is *not* active, e.g. `~Alt`.
-#
-# Bindings are always filled by default, but will be replaced when a new
-# binding with the same triggers is defined. To unset a default binding, it can
-# be mapped to the `ReceiveChar` action. Alternatively, you can use `None` for
-# a no-op if you do not wish to receive input characters for that binding.
-#key_bindings:
-  # (Windows, Linux, and BSD only)
-  #- { key: V,        mods: Control|Shift, action: Paste            }
-  #- { key: C,        mods: Control|Shift, action: Copy             }
-  #- { key: Insert,   mods: Shift,         action: PasteSelection   }
-  #- { key: Key0,     mods: Control,       action: ResetFontSize    }
-  #- { key: Equals,   mods: Control,       action: IncreaseFontSize }
-  #- { key: Add,      mods: Control,       action: IncreaseFontSize }
-  #- { key: Subtract, mods: Control,       action: DecreaseFontSize }
-  #- { key: Minus,    mods: Control,       action: DecreaseFontSize }
-
-  # (Windows only)
-  #- { key: Return,   mods: Alt,           action: ToggleFullscreen }
-
-  # (macOS only)
-  #- { key: Key0,   mods: Command,         action: ResetFontSize    }
-  #- { key: Equals, mods: Command,         action: IncreaseFontSize }
-  #- { key: Add,    mods: Command,         action: IncreaseFontSize }
-  #- { key: Minus,  mods: Command,         action: DecreaseFontSize }
-  #- { key: K,      mods: Command,         action: ClearHistory     }
-  #- { key: K,      mods: Command,         chars: "\x0c"            }
-  #- { key: V,      mods: Command,         action: Paste            }
-  #- { key: C,      mods: Command,         action: Copy             }
-  #- { key: H,      mods: Command,         action: Hide             }
-  #- { key: M,      mods: Command,         action: Minimize         }
-  #- { key: Q,      mods: Command,         action: Quit             }
-  #- { key: W,      mods: Command,         action: Quit             }
-  #- { key: F,      mods: Command|Control, action: ToggleFullscreen }
-
-  #- { key: Paste,                    action: Paste                            }
-  #- { key: Copy,                     action: Copy                             }
-  #- { key: L,         mods: Control, action: ClearLogNotice                   }
-  #- { key: L,         mods: Control, chars: "\x0c"                            }
-  #- { key: PageUp,    mods: Shift,   action: ScrollPageUp,   mode: ~Alt       }
-  #- { key: PageDown,  mods: Shift,   action: ScrollPageDown, mode: ~Alt       }
-  #- { key: Home,      mods: Shift,   action: ScrollToTop,    mode: ~Alt       }
-  #- { key: End,       mods: Shift,   action: ScrollToBottom, mode: ~Alt       }
diff --git a/pictures/b_2.jpg b/pictures/b_2.jpg
deleted file mode 100644
index 08c26d4..0000000
--- a/pictures/b_2.jpg
+++ /dev/null
diff --git a/pictures/b_3.jpg b/pictures/b_3.jpg
deleted file mode 100644
index a037558..0000000
--- a/pictures/b_3.jpg
+++ /dev/null
diff --git a/pictures/b_4.jpg b/pictures/b_4.jpg
deleted file mode 100644
index 6ba8e9c..0000000
--- a/pictures/b_4.jpg
+++ /dev/null
diff --git a/pictures/b_5.jpg b/pictures/b_5.jpg
deleted file mode 100644
index acae7e8..0000000
--- a/pictures/b_5.jpg
+++ /dev/null
diff --git a/pictures/b_wp.jpg b/pictures/b_wp.jpg
deleted file mode 100644
index e6aabe5..0000000
--- a/pictures/b_wp.jpg
+++ /dev/null
diff --git a/pictures/lock.png b/pictures/lock.png
deleted file mode 100644
index f9791c4..0000000
--- a/pictures/lock.png
+++ /dev/null
diff --git a/pictures/missing.txt b/pictures/missing.txt
deleted file mode 100644
index 320d3ff..0000000
--- a/pictures/missing.txt
+++ /dev/null
@@ -1 +0,0 @@
-DSC_0255.JPG  DSC_0256.JPG  DSC_0258.JPG  DSC_0262.JPG  DSC_0308.JPG  DSC_0346.JPG
diff --git a/polybar/config b/polybar/config
deleted file mode 100644
index 8d1e26b..0000000
--- a/polybar/config
+++ /dev/null
@@ -1,400 +0,0 @@
-;==========================================================
-;
-;
-;   ██████╗  ██████╗ ██╗  ██╗   ██╗██████╗  █████╗ ██████╗
-;   ██╔══██╗██╔═══██╗██║  ╚██╗ ██╔╝██╔══██╗██╔══██╗██╔══██╗
-;   ██████╔╝██║   ██║██║   ╚████╔╝ ██████╔╝███████║██████╔╝
-;   ██╔═══╝ ██║   ██║██║    ╚██╔╝  ██╔══██╗██╔══██║██╔══██╗
-;   ██║     ╚██████╔╝███████╗██║   ██████╔╝██║  ██║██║  ██║
-;   ╚═╝      ╚═════╝ ╚══════╝╚═╝   ╚═════╝ ╚═╝  ╚═╝╚═╝  ╚═╝
-;
-;
-;   To learn more about how to configure Polybar
-;   go to https://github.com/jaagr/polybar
-;
-;   The README contains alot of information
-;
-;==========================================================
-
-[colors]
-background = #000000
-background-alt = #222222
-;foreground = ${xrdb:color7:#222}
-foreground = #dfdfdf
-foreground-alt = #555
-primary = #ffb52a
-secondary = #e60053
-alert = #bd2c40
-
-[bar/jonny]
-monitor = ${env:MONITOR:DP-2}
-width = 100%
-height = 27
-;offset-x = 1%
-;offset-y = 1%
-;radius = 6.0
-fixed-center = true
-
-background = ${colors.background}
-foreground = ${colors.foreground}
-
-line-size = 3
-line-color = #f00
-
-;border-size = 4
-Iborder-color = #00000000
-
-padding-left = 0
-padding-right = 2
-
-module-margin-left = 3
-module-margin-right = 3
-
-font-0 = fixed:pixelsize=10;1
-font-1 = unifont:fontformat=truetype:size=8:antialias=false;0
-font-2 = siji:pixelsize=10;1
-
-modules-left = i3
-modules-center = date
-modules-right = filesystem backlight-acpi pulseaudio memory cpu wlan eth battery temperature powermenu
-
-separator = |
-
-tray-position = right
-tray-padding = 2
-;tray-background = #0063ff
-
-;wm-restack = bspwm
-wm-restack = i3
-bottom = true
-;override-redirect = true
-
-;scroll-up = bspwm-desknext
-;scroll-down = bspwm-deskprev
-
-;scroll-up = i3wm-wsnext
-;scroll-down = i3wm-wsprev
-
-cursor-click = pointer
-cursor-scroll = ns-resize
-
-[module/xwindow]
-type = internal/xwindow
-label = %title:0:30:...%
-
-[module/xkeyboard]
-type = internal/xkeyboard
-blacklist-0 = num lock
-
-format-prefix = " "
-format-prefix-foreground = ${colors.foreground-alt}
-format-prefix-underline = ${colors.secondary}
-
-label-layout = %layout%
-label-layout-underline = ${colors.secondary}
-
-label-indicator-padding = 2
-label-indicator-margin = 1
-label-indicator-background = ${colors.secondary}
-label-indicator-underline = ${colors.secondary}
-
-[module/filesystem]
-type = internal/fs
-interval = 25
-
-mount-0 = /
-
-label-mounted = %{F#0a81f5}%mountpoint%%{F-}: %percentage_used%%
-label-unmounted = %mountpoint% not mounted
-label-unmounted-foreground = ${colors.foreground-alt}
-
-[module/bspwm]
-type = internal/bspwm
-
-label-focused = %index%
-label-focused-background = ${colors.background-alt}
-label-focused-underline= ${colors.primary}
-label-focused-padding = 2
-
-label-occupied = %index%
-label-occupied-padding = 2
-
-label-urgent = %index%!
-label-urgent-background = ${colors.alert}
-label-urgent-padding = 2
-
-label-empty = %index%
-label-empty-foreground = ${colors.foreground-alt}
-label-empty-padding = 2
-
-; Separator in between workspaces
-; label-separator = |
-
-[module/i3]
-type = internal/i3
-format = <label-state> <label-mode>
-index-sort = true
-wrapping-scroll = false
-
-; Only show workspaces on the same output as the bar
-;pin-workspaces = true
-
-label-mode-padding = 2
-label-mode-foreground = #000
-label-mode-background = ${colors.primary}
-
-; focused = Active workspace on focused monitor
-label-focused = %index%
-label-focused-background = ${module/bspwm.label-focused-background}
-;label-focused-underline = ${module/bspwm.label-focused-underline}
-label-focused-padding = ${module/bspwm.label-focused-padding}
-
-; unfocused = Inactive workspace on any monitor
-label-unfocused = %index%
-label-unfocused-padding = ${module/bspwm.label-occupied-padding}
-
-; visible = Active workspace on unfocused monitor
-label-visible = %index%
-label-visible-background = ${self.label-focused-background}
-;label-visible-underline = ${self.label-focused-underline}
-label-visible-padding = ${self.label-focused-padding}
-
-; urgent = Workspace with urgency hint set
-label-urgent = %index%
-label-urgent-background = ${module/bspwm.label-urgent-background}
-label-urgent-padding = ${module/bspwm.label-urgent-padding}
-
-; Separator in between workspaces
- label-separator =  
-
-
-[module/mpd]
-type = internal/mpd
-format-online = <label-song>  <icon-prev> <icon-stop> <toggle> <icon-next>
-
-icon-prev = 
-icon-stop = 
-icon-play = 
-icon-pause = 
-icon-next = 
-
-label-song-maxlen = 25
-label-song-ellipsis = true
-
-[module/xbacklight]
-type = internal/xbacklight
-
-format = <label> <bar>
-label = BL
-
-bar-width = 10
-bar-indicator = |
-bar-indicator-foreground = #fff
-bar-indicator-font = 2
-bar-fill = ─
-bar-fill-font = 2
-bar-fill-foreground = #9f78e1
-bar-empty = ─
-bar-empty-font = 2
-bar-empty-foreground = ${colors.foreground-alt}
-
-[module/backlight-acpi]
-inherit = module/xbacklight
-type = internal/backlight
-card = intel_backlight
-
-[module/cpu]
-type = internal/cpu
-interval = 2
-format-prefix = "CPU "
-format-prefix-foreground = ${colors.foreground-alt}
-;format-underline = #f90000
-label = %percentage:2%%
-
-[module/memory]
-type = internal/memory
-interval = 2
-format-prefix = "RAM "
-format-prefix-foreground = ${colors.foreground-alt}
-;format-underline = #4bffdc
-label = %percentage_used%%
-
-[module/wlan]
-type = internal/network
-interface = wlp3s0
-interval = 3.0
-
-format-connected-prefix = "WLAN "
-format-connected-prefix-foreground = ${colors.foreground-alt}
-format-connected = <ramp-signal> <label-connected>
-format-connected-underline = 
-
-label-connected = %essid%
-
-format-disconnected =
-;format-disconnected = <label-disconnected>
-;format-disconnected-underline = ${self.format-connected-underline}
-;label-disconnected = %ifname% disconnected
-;label-disconnected-foreground = ${colors.foreground-alt}
-
-ramp-signal-0 = 
-ramp-signal-1 = 
-ramp-signal-2 = 
-ramp-signal-3 = 
-ramp-signal-4 = 
-ramp-signal-foreground = ${colors.foreground-alt}
-
-[module/eth]
-type = internal/network
-interface = enp2s0
-interval = 3.0
-
-format-connected-underline = 
-format-connected-prefix = "ETH "
-format-connected-prefix-foreground = ${colors.foreground-alt}
-label-connected = %local_ip%
-
-format-disconnected =
-;format-disconnected = <label-disconnected>
-;format-disconnected-underline = ${self.format-connected-underline}
-;label-disconnected = %ifname% disconnected
-;label-disconnected-foreground = ${colors.foreground-alt}
-
-[module/date]
-type = internal/date
-interval = 5
-
-date = %d.%m.%Y
-date-alt = " %Y-%m-%d"
-
-time = %H:%M
-time-alt = %H:%M:%S
-
-format-prefix = 
-format-prefix-foreground = ${colors.foreground-alt}
-;format-underline = #0a6cf5
-
-label = %date% %time%
-
-[module/pulseaudio]
-type = internal/pulseaudio
-
-format-volume = <label-volume> <bar-volume>
-label-volume = VOL %percentage%%
-label-volume-foreground = ${root.foreground}
-
-label-muted = 🔇 muted
-label-muted-foreground = #666
-
-bar-volume-width = 10
-bar-volume-foreground-0 = #55aa55
-bar-volume-foreground-1 = #55aa55
-bar-volume-foreground-2 = #55aa55
-bar-volume-foreground-3 = #55aa55
-bar-volume-foreground-4 = #55aa55
-bar-volume-foreground-5 = #f5a70a
-bar-volume-foreground-6 = #ff5555
-bar-volume-gradient = false
-bar-volume-indicator = |
-bar-volume-indicator-font = 2
-bar-volume-fill = ─
-bar-volume-fill-font = 2
-bar-volume-empty = ─
-bar-volume-empty-font = 2
-bar-volume-empty-foreground = ${colors.foreground-alt}
-
-[module/battery]
-type = internal/battery
-battery = BAT1
-adapter = ACAD
-full-at = 98
-time-format = %H:%M
-
-label-charging = %percentage%% %time% %consumption%W
-format-charging = <animation-charging> <label-charging>
-format-charging-underline = 
-
-label-discharging = %percentage%% %time% %consumption%W
-format-discharging = <animation-discharging> <label-discharging>
-format-discharging-underline = ${self.format-charging-underline}
-
-format-full-prefix = "F "
-format-full-prefix-foreground = ${colors.foreground-alt}
-format-full-underline = ${self.format-charging-underline}
-
-ramp-capacity-0 = 
-ramp-capacity-1 = 
-ramp-capacity-2 = 
-ramp-capacity-foreground = ${colors.foreground-alt}
-
-animation-charging-0 = +
-animation-charging-1 = :
-animation-charging-foreground = ${colors.foreground-alt}
-animation-charging-framerate = 750
-
-animation-discharging-0 = :
-animation-discharging-1 = -
-animation-discharging-foreground = ${colors.foreground-alt}
-animation-discharging-framerate = 750
-
-[module/temperature]
-type = internal/temperature
-thermal-zone = 0
-warn-temperature = 60
-
-format = <ramp> <label>
-format-underline = 
-format-warn = <ramp> <label-warn>
-format-warn-underline = ${self.format-underline}
-
-label = %temperature-c%
-label-warn = %temperature-c%
-label-warn-foreground = ${colors.secondary}
-
-ramp-0 = 
-ramp-1 = 
-ramp-2 = 
-ramp-foreground = ${colors.foreground-alt}
-
-[module/powermenu]
-type = custom/menu
-
-expand-right = true
-
-format-spacing = 1
-
-label-open = 
-label-open-foreground = ${colors.secondary}
-label-close =  cancel
-label-close-foreground = ${colors.secondary}
-label-separator = |
-label-separator-foreground = ${colors.foreground-alt}
-
-menu-0-0 = reboot
-menu-0-0-exec = menu-open-1
-menu-0-1 = power off
-menu-0-1-exec = menu-open-2
-
-menu-1-0 = cancel
-menu-1-0-exec = menu-open-0
-menu-1-1 = reboot
-menu-1-1-exec = sudo reboot
-
-menu-2-0 = power off
-menu-2-0-exec = sudo poweroff
-menu-2-1 = cancel
-menu-2-1-exec = menu-open-0
-
-[settings]
-screenchange-reload = true
-;compositing-background = xor
-;compositing-background = screen
-;compositing-foreground = source
-;compositing-border = over
-;pseudo-transparency = false
-
-[global/wm]
-margin-top = 5
-margin-bottom = 5
-
-; vim:ft=dosini
diff --git a/powerline/colors.json b/powerline/colors.json
deleted file mode 100644
index 744e611..0000000
--- a/powerline/colors.json
+++ /dev/null
@@ -1,124 +0,0 @@
-{
-	"colors": {
-		"black": 16,
-		"white": 231,
-
-		"green": 2,
-		"darkestgreen": 22,
-		"darkgreen": 28,
-		"mediumgreen": 70,
-		"brightgreen": 148,
-
-		"darkestcyan": 23,
-		"darkcyan": 74,
-		"mediumcyan": 117,
-		"brightcyan": 159,
-
-		"darkestblue": 24,
-		"darkblue": 31,
-
-		"red": 1,
-		"darkestred": 52,
-		"darkred": 88,
-		"mediumred": 124,
-		"brightred": 160,
-		"brightestred": 196,
-
-		"darkestpurple": 55,
-		"mediumpurple": 98,
-		"brightpurple": 189,
-
-		"darkorange": 94,
-		"mediumorange": 166,
-		"brightorange": 208,
-		"brightestorange": 214,
-
-		"yellow": 11,
-		"brightyellow": 220,
-
-		"gray0": [233, "12121270"],
-		"gray1": 235,
-		"gray2": [236, "30303070"],
-		"gray3": 239,
-		"gray4": 240,
-		"gray5": 241,
-		"gray6": 244,
-		"gray7": 245,
-		"gray8": 247,
-		"gray9": 250,
-		"gray10": 252,
-
-		"gray11": 234,
-		"gray90": 254,
-
-		"gray70": [249, "b3b3b3"],
-
-		"lightyellowgreen": 106,
-		"gold3": 178,
-		"orangered": 202,
-
-		"steelblue": 67,
-		"darkorange3": 166,
-		"skyblue1": 117,
-		"khaki1": 228,
-
-		"solarized:base03": [8, "002b36"],
-		"solarized:base02": [0, "073642"],
-		"solarized:base01": [10, "586e75"],
-		"solarized:base00": [11, "657b83"],
-		"solarized:base0": [12, "839496"],
-		"solarized:base1": [14, "93a1a1"],
-		"solarized:base2": [7, "eee8d5"],
-		"solarized:base3": [15, "fdf6e3"],
-		"solarized:yellow": [3, "b58900"],
-		"solarized:orange": [9, "cb4b16"],
-		"solarized:red": [1, "dc322f"],
-		"solarized:magenta": [5, "d33682"],
-		"solarized:violet": [13, "6c71c4"],
-		"solarized:blue": [4, "268bd2"],
-		"solarized:cyan": [6, "2aa198"],
-		"solarized:green": [2, "859900"]
-	},
-	"gradients": {
-		"dark_GREEN_Orange_red": [
-			[22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 94, 94, 94, 94, 94, 94, 94, 88, 52],
-			["006000", "006000", "006000", "006000", "006000", "006000", "006000", "006000", "006000", "036000", "076000", "0a6000", "0d6000", "106000", "126000", "146000", "166000", "186000", "1a6000", "1b6000", "1d6000", "1e6000", "206000", "216000", "236000", "246000", "256000", "266000", "286000", "296000", "2a6000", "2b6000", "2c6100", "2d6100", "2f6100", "306100", "316100", "326100", "336100", "346100", "356100", "366100", "376100", "386100", "386100", "396100", "3a6100", "3b6100", "3c6100", "3d6100", "3e6100", "3f6100", "406100", "406100", "416100", "426000", "436000", "446000", "456000", "456000", "466000", "476000", "486000", "496000", "496000", "4a6000", "4b6000", "4c6000", "4d6000", "4d6000", "4e6000", "4f6000", "506000", "506000", "516000", "526000", "536000", "536000", "546000", "556000", "566000", "566000", "576000", "586000", "596000", "596000", "5a6000", "5d6000", "616000", "646000", "686000", "6b6000", "6f6000", "726000", "766000", "796000", "7d6000", "806000", "7e5500", "6f3105", "5d0001"]
-		],
-		"GREEN_Orange_red": [
-			[2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 1],
-			["005f00", "015f00", "025f00", "035f00", "045f00", "055f00", "065f00", "075f00", "085f00", "095f00", "0b5f00", "0c5f00", "0d5f00", "0e5f00", "0f5f00", "105f00", "115f00", "125f00", "135f00", "145f00", "165f00", "175f00", "185f00", "195f00", "1a5f00", "1b5f00", "1c5f00", "1d5f00", "1e5f00", "1f5f00", "215f00", "225f00", "235f00", "245f00", "255f00", "265f00", "275f00", "285f00", "295f00", "2a5f00", "2c5f00", "2d5f00", "2e5f00", "2f5f00", "305f00", "315f00", "325f00", "335f00", "345f00", "355f00", "375f00", "385f00", "395f00", "3a5f00", "3b5f00", "3c5f00", "3d5f00", "3e5f00", "3f5f00", "415f00", "425f00", "435f00", "445f00", "455f00", "465f00", "475f00", "485f00", "495f00", "4a5f00", "4c5f00", "4d5f00", "4e5f00", "4f5f00", "505f00", "515f00", "525f00", "535f00", "545f00", "555f00", "575f00", "585f00", "595f00", "5a5f00", "5b5f00", "5c5f00", "5d5f00", "5e5f00", "615f00", "655f00", "685f00", "6c5f00", "6f5f00", "735f00", "765f00", "7a5f00", "7d5f00", "815f00", "845f00", "815200", "702900"]
-		],
-		"green_yellow_red": [
-			[190, 184, 178, 172, 166, 160],
-			["8ae71c", "8ce71c", "8fe71c", "92e71c", "95e71d", "98e71d", "9ae71d", "9de71d", "a0e71e", "a3e71e", "a6e71e", "a8e71e", "abe71f", "aee71f", "b1e71f", "b4e71f", "b6e720", "b9e720", "bce720", "bfe720", "c2e821", "c3e721", "c5e621", "c7e521", "c9e522", "cbe422", "cde322", "cfe222", "d1e223", "d3e123", "d5e023", "d7df23", "d9df24", "dbde24", "dddd24", "dfdc24", "e1dc25", "e3db25", "e5da25", "e7d925", "e9d926", "e9d626", "e9d426", "e9d126", "e9cf27", "e9cc27", "e9ca27", "e9c727", "e9c528", "e9c228", "e9c028", "e9bd28", "e9bb29", "e9b829", "e9b629", "e9b329", "e9b12a", "e9ae2a", "e9ac2a", "e9a92a", "eaa72b", "eaa42b", "eaa22b", "ea9f2b", "ea9d2c", "ea9b2c", "ea982c", "ea962c", "ea942d", "ea912d", "ea8f2d", "ea8d2d", "ea8a2e", "ea882e", "ea862e", "ea832e", "ea812f", "ea7f2f", "ea7c2f", "ea7a2f", "eb7830", "eb7530", "eb7330", "eb7130", "eb6f31", "eb6c31", "eb6a31", "eb6831", "eb6632", "eb6332", "eb6132", "eb5f32", "eb5d33", "eb5a33", "eb5833", "eb5633", "eb5434", "eb5134", "eb4f34", "eb4d34", "ec4b35"]
-		],
-		"green_yellow_orange_red": [
-			[2, 3, 9, 1],
-			["719e07", "739d06", "759c06", "779c06", "799b06", "7b9a05", "7d9a05", "7f9905", "819805", "839805", "859704", "879704", "899604", "8b9504", "8d9504", "8f9403", "919303", "949303", "969203", "989102", "9a9102", "9c9002", "9e9002", "a08f02", "a28e01", "a48e01", "a68d01", "a88c01", "aa8c01", "ac8b00", "ae8a00", "b08a00", "b28900", "b58900", "b58700", "b68501", "b78302", "b78102", "b87f03", "b97d04", "b97b04", "ba7905", "bb7806", "bb7606", "bc7407", "bd7208", "bd7008", "be6e09", "bf6c0a", "bf6a0a", "c0690b", "c1670c", "c1650c", "c2630d", "c3610e", "c35f0e", "c45d0f", "c55b10", "c55a10", "c65811", "c75612", "c75412", "c85213", "c95014", "c94e14", "ca4c15", "cb4b16", "cb4a16", "cc4917", "cc4818", "cd4719", "cd4719", "ce461a", "ce451b", "cf441c", "cf441c", "d0431d", "d0421e", "d1411f", "d1411f", "d24020", "d23f21", "d33e22", "d33e22", "d43d23", "d43c24", "d53b25", "d53b25", "d63a26", "d63927", "d73828", "d73828", "d83729", "d8362a", "d9352b", "d9352b", "da342c", "da332d", "db322e", "dc322f"]
-		],
-		"yellow_red": [
-			[220, 178, 172, 166, 160],
-			["ffd700", "fdd500", "fbd300", "fad200", "f8d000", "f7cf00", "f5cd00", "f3cb00", "f2ca00", "f0c800", "efc700", "edc500", "ebc300", "eac200", "e8c000", "e7bf00", "e5bd00", "e3bb00", "e2ba00", "e0b800", "dfb700", "ddb500", "dbb300", "dab200", "d8b000", "d7af00", "d7ad00", "d7ab00", "d7aa00", "d7a800", "d7a700", "d7a500", "d7a300", "d7a200", "d7a000", "d79f00", "d79d00", "d79b00", "d79a00", "d79800", "d79700", "d79500", "d79300", "d79200", "d79000", "d78f00", "d78d00", "d78b00", "d78a00", "d78800", "d78700", "d78500", "d78300", "d78200", "d78000", "d77f00", "d77d00", "d77b00", "d77a00", "d77800", "d77700", "d77500", "d77300", "d77200", "d77000", "d76f00", "d76d00", "d76b00", "d76a00", "d76800", "d76700", "d76500", "d76300", "d76200", "d76000", "d75f00", "d75b00", "d75700", "d75300", "d74f00", "d74c00", "d74800", "d74400", "d74000", "d73c00", "d73900", "d73500", "d73100", "d72d00", "d72900", "d72600", "d72200", "d71e00", "d71a00", "d71600", "d71300", "d70f00", "d70b00", "d70700"]
-		],
-		"yellow_orange_red": [
-			[3, 9, 1],
-			["b58900", "b58700", "b58600", "b68501", "b68401", "b78202", "b78102", "b88003", "b87f03", "b87d03", "b97c04", "b97b04", "ba7a05", "ba7805", "bb7706", "bb7606", "bc7507", "bc7307", "bc7207", "bd7108", "bd7008", "be6e09", "be6d09", "bf6c0a", "bf6b0a", "c06a0b", "c0680b", "c0670b", "c1660c", "c1650c", "c2630d", "c2620d", "c3610e", "c3600e", "c35e0e", "c45d0f", "c45c0f", "c55b10", "c55910", "c65811", "c65711", "c75612", "c75412", "c75312", "c85213", "c85113", "c94f14", "c94e14", "ca4d15", "ca4c15", "cb4b16", "cb4a16", "cb4a17", "cc4917", "cc4918", "cc4818", "cd4819", "cd4719", "cd471a", "ce461a", "ce461b", "ce451b", "cf451c", "cf441c", "cf441d", "d0431d", "d0431e", "d0421e", "d1421f", "d1411f", "d14120", "d24020", "d24021", "d23f21", "d33f22", "d33e22", "d33e23", "d43d23", "d43d24", "d43c24", "d53c25", "d53b25", "d53b26", "d63a26", "d63a27", "d63927", "d73928", "d73828", "d73829", "d83729", "d8372a", "d8362a", "d9362b", "d9352b", "d9352c", "da342c", "da342d", "da332d", "db332e"]
-		],
-		"blue_red": [
-			[39, 74, 68, 67, 103, 97, 96, 132, 131, 167, 203, 197],
-			["19b4fe", "1bb2fc", "1db1fa", "1faff8", "22aef6", "24adf4", "26abf2", "29aaf0", "2ba9ee", "2da7ec", "30a6ea", "32a5e8", "34a3e6", "36a2e4", "39a0e2", "3b9fe1", "3d9edf", "409cdd", "429bdb", "449ad9", "4798d7", "4997d5", "4b96d3", "4d94d1", "5093cf", "5292cd", "5490cb", "578fc9", "598dc7", "5b8cc6", "5e8bc4", "6089c2", "6288c0", "6487be", "6785bc", "6984ba", "6b83b8", "6e81b6", "7080b4", "727eb2", "757db0", "777cae", "797aac", "7b79ab", "7e78a9", "8076a7", "8275a5", "8574a3", "8772a1", "89719f", "8c709d", "8e6e9b", "906d99", "926b97", "956a95", "976993", "996791", "9c668f", "9e658e", "a0638c", "a3628a", "a56188", "a75f86", "a95e84", "ac5c82", "ae5b80", "b05a7e", "b3587c", "b5577a", "b75678", "ba5476", "bc5374", "be5273", "c05071", "c34f6f", "c54e6d", "c74c6b", "ca4b69", "cc4967", "ce4865", "d14763", "d34561", "d5445f", "d7435d", "da415b", "dc4059", "de3f58", "e13d56", "e33c54", "e53a52", "e83950", "ea384e", "ec364c", "ee354a", "f13448", "f33246", "f53144", "f83042", "fa2e40"]
-		],
-		"white_red": [
-			[231, 255, 223, 216, 209, 202, 196],
-			["ffffff", "fefefe", "fdfdfd", "fdfdfd", "fcfcfc", "fbfbfb", "fafafa", "fafafa", "f9f9f9", "f8f8f8", "f7f7f7", "f7f7f7", "f6f6f6", "f5f5f5", "f4f4f4", "f4f3f4", "f3f3f3", "f2f2f2", "f1f1f1", "f0f0f0", "f0f0f0", "efefef", "eeeeee", "efecea", "f1eae4", "f2e8de", "f3e6d8", "f5e4d3", "f6e2cd", "f7e0c7", "f8dec2", "f9dcbc", "fadab6", "fad8b1", "fbd5ac", "fbd2a9", "fbcea5", "fbcaa1", "fbc79e", "fbc39a", "fbc097", "fbbc93", "fbb88f", "fbb58c", "fab188", "faad85", "faaa81", "fba67e", "fba37a", "fb9f76", "fb9c73", "fb986f", "fb946c", "fb9168", "fa8d65", "fa8961", "fa865c", "fa8256", "fb7f4f", "fb7b48", "fb7841", "fb743a", "fb7133", "fb6d2c", "fa6a23", "fa661a", "fa620e", "fa5f03", "fa5d03", "fa5b03", "fa5a03", "fa5803", "fa5703", "fa5503", "fa5303", "fa5103", "fa4f03", "fa4e03", "fa4c03", "fa4a04", "fa4804", "fa4604", "fa4404", "fa4204", "fa3f04", "fa3d04", "fa3b04", "fa3805", "fa3605", "fa3305", "fb3105", "fb2e05", "fb2a05", "fb2705", "fb2306", "fb1f06", "fb1b06", "fb1506", "fb0e06", "fa0506", "fa0007"]
-		],
-		"dark_green_gray": [
-			[70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, 247, 247, 247, 247, 247, 247, 247, 247, 247, 247, 247],
-			["51b000", "52b000", "54b000", "55b002", "56b007", "57b00d", "58b011", "59af15", "5aaf18", "5caf1b", "5daf1e", "5eaf21", "5faf23", "60ae25", "61ae27", "62ae2a", "63ae2c", "64ae2e", "65ae30", "66ae31", "67ad33", "68ad35", "69ad37", "69ad38", "6aad3a", "6bad3c", "6cac3d", "6dac3f", "6eac40", "6fac42", "70ac44", "70ac45", "71ab47", "72ab48", "73ab49", "74ab4b", "75ab4c", "75ab4e", "76aa4f", "77aa51", "78aa52", "79aa53", "79aa55", "7aaa56", "7ba957", "7ca959", "7ca95a", "7da95b", "7ea95d", "7fa95e", "7fa85f", "80a861", "81a862", "81a863", "82a865", "83a766", "83a767", "84a768", "85a76a", "85a76b", "86a66c", "87a66d", "87a66f", "88a670", "89a671", "89a672", "8aa574", "8ba575", "8ba576", "8ca577", "8da579", "8da47a", "8ea47b", "8ea47c", "8fa47d", "90a47f", "90a380", "91a381", "91a382", "92a384", "93a385", "93a286", "94a287", "94a288", "95a28a", "95a18b", "96a18c", "97a18d", "97a18e", "98a190", "98a091", "99a092", "99a093", "9aa094", "9aa096", "9b9f97", "9b9f98", "9c9f99", "9c9f9a", "9d9e9c", "9d9e9d"]
-		],
-		"light_green_gray": [
-			[148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 149, 149, 149, 149, 149, 149, 149, 149, 149, 149, 149, 149, 149, 149, 149, 149, 149, 149, 149, 149, 149, 149, 149, 149, 149, 149, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 187, 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, 250, 250, 250, 250, 250, 250, 250, 250, 250, 250, 250],
-			["a3d900", "a4d800", "a4d800", "a5d805", "a5d80d", "a6d714", "a6d719", "a6d71d", "a7d621", "a7d625", "a8d628", "a8d62b", "a8d52e", "a9d531", "a9d533", "aad536", "aad438", "aad43a", "abd43d", "abd33f", "abd341", "acd343", "acd345", "acd247", "add249", "add24b", "add14d", "aed14f", "aed151", "aed152", "afd054", "afd056", "afd058", "b0d059", "b0cf5b", "b0cf5d", "b1cf5e", "b1ce60", "b1ce62", "b1ce63", "b2ce65", "b2cd67", "b2cd68", "b3cd6a", "b3cc6b", "b3cc6d", "b3cc6e", "b4cc70", "b4cb71", "b4cb73", "b4cb75", "b5ca76", "b5ca78", "b5ca79", "b5ca7a", "b6c97c", "b6c97d", "b6c97f", "b6c880", "b6c882", "b7c883", "b7c885", "b7c786", "b7c788", "b7c789", "b8c68a", "b8c68c", "b8c68d", "b8c68f", "b8c590", "b9c591", "b9c593", "b9c494", "b9c496", "b9c497", "b9c498", "bac39a", "bac39b", "bac39d", "bac29e", "bac29f", "bac2a1", "bac2a2", "bac1a4", "bbc1a5", "bbc1a6", "bbc0a8", "bbc0a9", "bbc0aa", "bbc0ac", "bbbfad", "bbbfae", "bbbfb0", "bbbeb1", "bcbeb3", "bcbeb4", "bcbdb5", "bcbdb7", "bcbdb8", "bcbdb9", "bcbcbb"]
-		]
-	}
-}
diff --git a/powerline/colorschemes/default.json b/powerline/colorschemes/default.json
deleted file mode 100644
index 7e271ef..0000000
--- a/powerline/colorschemes/default.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-	"name": "Default",
-	"groups": {
-		"information:additional":     { "fg": "gray9", "bg": "gray4", "attrs": [] },
-		"information:regular":        { "fg": "gray10", "bg": "gray4", "attrs": ["bold"] },
-		"information:highlighted":    { "fg": "white", "bg": "gray4", "attrs": [] },
-		"information:priority":       { "fg": "brightyellow", "bg": "mediumorange", "attrs": [] },
-		"warning:regular":            { "fg": "white", "bg": "brightred", "attrs": ["bold"] },
-		"critical:failure":           { "fg": "white", "bg": "darkestred", "attrs": [] },
-		"critical:success":           { "fg": "white", "bg": "darkestgreen", "attrs": [] },
-		"background":                 { "fg": "white", "bg": "gray0", "attrs": [] },
-		"background:divider":         { "fg": "gray5", "bg": "gray0", "attrs": [] },
-		"session":                    { "fg": "black", "bg": "gray10", "attrs": ["bold"] },
-		"date":                       { "fg": "gray8", "bg": "gray2", "attrs": [] },
-		"time":                       { "fg": "gray10", "bg": "gray2", "attrs": ["bold"] },
-		"time:divider":               { "fg": "gray5", "bg": "gray2", "attrs": [] },
-		"email_alert":                "warning:regular",
-		"email_alert_gradient":       { "fg": "white", "bg": "yellow_orange_red", "attrs": ["bold"] },
-		"hostname":                   { "fg": "black", "bg": "gray10", "attrs": ["bold"] },
-		"weather":                    { "fg": "gray8", "bg": "gray0", "attrs": [] },
-		"weather_temp_gradient":      { "fg": "blue_red", "bg": "gray0", "attrs": [] },
-		"weather_condition_hot":      { "fg": "khaki1", "bg": "gray0", "attrs": [] },
-		"weather_condition_snowy":    { "fg": "skyblue1", "bg": "gray0", "attrs": [] },
-		"weather_condition_rainy":    { "fg": "skyblue1", "bg": "gray0", "attrs": [] },
-		"uptime":                     { "fg": "gray8", "bg": "gray0", "attrs": [] },
-		"external_ip":                { "fg": "gray8", "bg": "gray0", "attrs": [] },
-		"internal_ip":                { "fg": "gray8", "bg": "gray0", "attrs": [] },
-		"network_load":               { "fg": "gray8", "bg": "gray0", "attrs": [] },
-		"network_load_gradient":      { "fg": "green_yellow_orange_red", "bg": "gray0", "attrs": [] },
-		"network_load_sent_gradient": "network_load_gradient",
-		"network_load_recv_gradient": "network_load_gradient",
-		"network_load:divider":       "background:divider",
-		"system_load":                { "fg": "gray8", "bg": "gray0", "attrs": [] },
-		"system_load_gradient":       { "fg": "green_yellow_orange_red", "bg": "gray0", "attrs": [] },
-		"environment":                { "fg": "gray8", "bg": "gray0", "attrs": [] },
-		"cpu_load_percent":           { "fg": "gray8", "bg": "gray0", "attrs": [] },
-		"cpu_load_percent_gradient":  { "fg": "green_yellow_orange_red", "bg": "gray0", "attrs": [] },
-		"battery":                    { "fg": "gray8", "bg": "gray0", "attrs": [] },
-		"battery_gradient":           { "fg": "white_red", "bg": "gray0", "attrs": [] },
-		"battery_full":               { "fg": "red", "bg": "gray0", "attrs": [] },
-		"battery_empty":              { "fg": "white", "bg": "gray0", "attrs": [] },
-		"player":                     { "fg": "gray10", "bg": "black", "attrs": [] },
-		"user":                       { "fg": "white", "bg": "darkblue", "attrs": ["bold"] },
-		"branch":                     { "fg": "gray9", "bg": "gray2", "attrs": [] },
-		"branch_dirty":               { "fg": "brightyellow", "bg": "gray2", "attrs": [] },
-		"branch_clean":               { "fg": "gray9", "bg": "gray2", "attrs": [] },
-		"branch:divider":             { "fg": "gray7", "bg": "gray2", "attrs": [] },
-		"stash":                      "branch_dirty",
-		"stash:divider":              "branch:divider",
-		"cwd":                        "information:additional",
-		"cwd:current_folder":         "information:regular",
-		"cwd:divider":                { "fg": "gray7", "bg": "gray4", "attrs": [] },
-		"virtualenv":                 { "fg": "white", "bg": "darkcyan", "attrs": [] },
-		"attached_clients":           { "fg": "gray8", "bg": "gray0", "attrs": [] }
-	}
-}
diff --git a/powerline/colorschemes/ipython/__main__.json b/powerline/colorschemes/ipython/__main__.json
deleted file mode 100644
index 982ea35..0000000
--- a/powerline/colorschemes/ipython/__main__.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"groups": {
-		"prompt":       "information:additional",
-		"prompt_count": "information:highlighted"
-	}
-}
diff --git a/powerline/colorschemes/jonas.json b/powerline/colorschemes/jonas.json
deleted file mode 100644
index e21fa61..0000000
--- a/powerline/colorschemes/jonas.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-	"name": "jonas",
-	"groups": {
-		"information:additional":     { "fg": "gray9", "bg": "gray4", "attrs": [] },
-		"information:regular":        { "fg": "gray10", "bg": "gray4", "attrs": ["bold"] },
-		"information:highlighted":    { "fg": "white", "bg": "gray4", "attrs": [] },
-		"information:priority":       { "fg": "brightyellow", "bg": "mediumorange", "attrs": [] },
-		"warning:regular":            { "fg": "white", "bg": "brightred", "attrs": ["bold"] },
-		"critical:failure":           { "fg": "white", "bg": "darkestred", "attrs": [] },
-		"critical:success":           { "fg": "white", "bg": "darkestgreen", "attrs": [] },
-		"background":                 { "fg": "white", "bg": "gray0", "attrs": [] },
-		"background:divider":         { "fg": "gray5", "bg": "gray0", "attrs": [] },
-		"session":                    { "fg": "black", "bg": "gray10", "attrs": ["bold"] },
-		"date":                       { "fg": "gray8", "bg": "gray2", "attrs": [] },
-		"time":                       { "fg": "gray10", "bg": "gray2", "attrs": ["bold"] },
-		"time:divider":               { "fg": "gray5", "bg": "gray2", "attrs": [] },
-		"email_alert":                "warning:regular",
-		"email_alert_gradient":       { "fg": "white", "bg": "yellow_orange_red", "attrs": ["bold"] },
-		"hostname":                   { "fg": "black", "bg": "gray10", "attrs": ["bold"] },
-		"weather":                    { "fg": "gray8", "bg": "gray0", "attrs": [] },
-		"weather_temp_gradient":      { "fg": "blue_red", "bg": "gray0", "attrs": [] },
-		"weather_condition_hot":      { "fg": "khaki1", "bg": "gray0", "attrs": [] },
-		"weather_condition_snowy":    { "fg": "skyblue1", "bg": "gray0", "attrs": [] },
-		"weather_condition_rainy":    { "fg": "skyblue1", "bg": "gray0", "attrs": [] },
-		"uptime":                     { "fg": "gray8", "bg": "gray0", "attrs": [] },
-		"external_ip":                { "fg": "gray8", "bg": "gray0", "attrs": [] },
-		"internal_ip":                { "fg": "gray8", "bg": "gray0", "attrs": [] },
-		"network_load":               { "fg": "gray8", "bg": "gray0", "attrs": [] },
-		"network_load_gradient":      { "fg": "green_yellow_orange_red", "bg": "gray0", "attrs": [] },
-		"network_load_sent_gradient": "network_load_gradient",
-		"network_load_recv_gradient": "network_load_gradient",
-		"network_load:divider":       "background:divider",
-		"system_load":                { "fg": "gray8", "bg": "gray0", "attrs": [] },
-		"system_load_gradient":       { "fg": "green_yellow_orange_red", "bg": "gray0", "attrs": [] },
-		"environment":                { "fg": "gray8", "bg": "gray0", "attrs": [] },
-		"cpu_load_percent":           { "fg": "gray8", "bg": "gray0", "attrs": [] },
-		"cpu_load_percent_gradient":  { "fg": "green_yellow_orange_red", "bg": "gray0", "attrs": [] },
-		"battery":                    { "fg": "gray8", "bg": "gray0", "attrs": [] },
-		"battery_gradient":           { "fg": "white_red", "bg": "gray0", "attrs": [] },
-		"battery_full":               { "fg": "red", "bg": "gray0", "attrs": [] },
-		"battery_empty":              { "fg": "white", "bg": "gray0", "attrs": [] },
-		"player":                     { "fg": "gray10", "bg": "black", "attrs": [] },
-		"user":                       { "fg": "white", "bg": "darkblue", "attrs": ["bold"] },
-		"branch":                     { "fg": "gray9", "bg": "gray2", "attrs": [] },
-		"branch_dirty":               { "fg": "brightyellow", "bg": "gray2", "attrs": [] },
-		"branch_clean":               { "fg": "gray9", "bg": "gray2", "attrs": [] },
-		"branch:divider":             { "fg": "gray7", "bg": "gray2", "attrs": [] },
-		"stash":                      "branch_dirty",
-		"stash:divider":              "branch:divider",
-		"cwd":                        "information:additional",
-		"cwd:current_folder":         "information:regular",
-		"cwd:divider":                { "fg": "gray7", "bg": "gray4", "attrs": [] },
-		"virtualenv":                 { "fg": "white", "bg": "darkcyan", "attrs": [] },
-		"attached_clients":           { "fg": "gray8", "bg": "gray0", "attrs": [] }
-	}
-}
diff --git a/powerline/colorschemes/pdb/__main__.json b/powerline/colorschemes/pdb/__main__.json
deleted file mode 100644
index 01a51fe..0000000
--- a/powerline/colorschemes/pdb/__main__.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-	"groups": {
-		"current_code_name": "information:additional",
-		"current_context":   "current_code_name",
-		"current_line":      "information:regular",
-		"current_file":      "information:regular"
-	}
-}
diff --git a/powerline/colorschemes/pdb/default.json b/powerline/colorschemes/pdb/default.json
deleted file mode 100644
index b97acf7..0000000
--- a/powerline/colorschemes/pdb/default.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-	"groups": {
-		"stack_depth": { "fg": "gray1", "bg": "gray10", "attrs": ["bold"] }
-	}
-}
diff --git a/powerline/colorschemes/pdb/solarized.json b/powerline/colorschemes/pdb/solarized.json
deleted file mode 100644
index 2e1c787..0000000
--- a/powerline/colorschemes/pdb/solarized.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-	"groups": {
-		"stack_depth": { "fg": "solarized:base03", "bg": "solarized:base2", "attrs": ["bold"] }
-	}
-}
diff --git a/powerline/colorschemes/shell/__main__.json b/powerline/colorschemes/shell/__main__.json
deleted file mode 100644
index 6e3856f..0000000
--- a/powerline/colorschemes/shell/__main__.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"groups": {
-		"continuation":         "cwd",
-		"continuation:current": "cwd:current_folder",
-		"exit_fail":            "critical:failure",
-		"exit_success":         "critical:success",
-		"jobnum":               "information:priority",
-		"superuser":            "warning:regular"
-	}
-}
diff --git a/powerline/colorschemes/shell/default.json b/powerline/colorschemes/shell/default.json
deleted file mode 100644
index 1126feb..0000000
--- a/powerline/colorschemes/shell/default.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"name": "Default color scheme for shell prompts",
-	"groups": {
-		"hostname":         { "fg": "brightyellow", "bg": "mediumorange", "attrs": [] },
-		"environment":      { "fg": "white", "bg": "darkestgreen", "attrs": [] },
-		"mode":             { "fg": "darkestgreen", "bg": "brightgreen", "attrs": ["bold"] },
-		"attached_clients": { "fg": "white", "bg": "darkestgreen", "attrs": [] }
-	},
-	"mode_translations": {
-		"vicmd": {
-			"groups": {
-				"mode": {"fg": "darkestcyan", "bg": "white", "attrs": ["bold"]}
-			}
-		}
-	}
-}
diff --git a/powerline/colorschemes/shell/solarized.json b/powerline/colorschemes/shell/solarized.json
deleted file mode 100644
index 69dcab1..0000000
--- a/powerline/colorschemes/shell/solarized.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"name": "Solarized dark for shell",
-	"groups": {
-		"mode": { "fg": "solarized:base3", "bg": "solarized:green", "attrs": ["bold"] }
-	},
-	"mode_translations": {
-		"vicmd": {
-			"groups": {
-				"mode": { "fg": "solarized:base3", "bg": "solarized:blue", "attrs": ["bold"] }
-			}
-		}
-	}
-}
diff --git a/powerline/colorschemes/solarized.json b/powerline/colorschemes/solarized.json
deleted file mode 100644
index c0eba5a..0000000
--- a/powerline/colorschemes/solarized.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"name": "Solarized dark",
-	"groups": {
-		"information:additional":     { "fg": "solarized:base2", "bg": "solarized:base01", "attrs": [] },
-		"information:regular":        { "fg": "solarized:base3", "bg": "solarized:base01", "attrs": ["bold"] },
-		"information:highlighted":    { "fg": "solarized:base3", "bg": "solarized:base01", "attrs": ["bold"]},
-		"information:priority":       { "fg": "solarized:base3", "bg": "solarized:yellow", "attrs": [] },
-		"warning:regular":            { "fg": "solarized:base3", "bg": "solarized:red", "attrs": [] },
-		"critical:failure":           { "fg": "solarized:base3", "bg": "solarized:red", "attrs": [] },
-		"critical:success":           { "fg": "solarized:base3", "bg": "solarized:green", "attrs": [] },
-		"background":                 { "fg": "solarized:base3", "bg": "solarized:base02", "attrs": [] },
-		"background:divider":         { "fg": "solarized:base1", "bg": "solarized:base02", "attrs": [] },
-		"user":                       { "fg": "solarized:base3", "bg": "solarized:blue", "attrs": ["bold"] },
-		"virtualenv":                 { "fg": "solarized:base3", "bg": "solarized:green", "attrs": [] },
-		"branch":                     { "fg": "solarized:base1", "bg": "solarized:base02", "attrs": [] },
-		"branch_dirty":               { "fg": "solarized:yellow", "bg": "solarized:base02", "attrs": [] },
-		"branch_clean":               { "fg": "solarized:base1", "bg": "solarized:base02", "attrs": [] },
-		"stash":                      "branch_dirty",
-		"email_alert_gradient":       { "fg": "solarized:base3", "bg": "yellow_orange_red", "attrs": [] },
-		"email_alert":                "warning:regular",
-		"cwd":                        "information:additional",
-		"cwd:current_folder":         "information:regular",
-		"cwd:divider":                { "fg": "solarized:base1", "bg": "solarized:base01", "attrs": [] },
-		"network_load":               { "fg": "solarized:base1", "bg": "solarized:base03", "attrs": [] },
-		"network_load:divider":       "network_load",
-		"network_load_gradient":      { "fg": "green_yellow_orange_red", "bg": "solarized:base03", "attrs": [] },
-		"network_load_sent_gradient": "network_load_gradient",
-		"network_load_recv_gradient": "network_load_gradient",
-		"hostname":                   { "fg": "solarized:base3", "bg": "solarized:base01", "attrs": [] },
-		"environment":                { "fg": "solarized:base3", "bg": "solarized:green", "attrs": [] },
-		"attached_clients":           { "fg": "solarized:base3", "bg": "solarized:green", "attrs": [] },
-		"date":                       { "fg": "solarized:base1", "bg": "solarized:base02", "attrs": [] },
-		"time":                       { "fg": "solarized:base1", "bg": "solarized:base02", "attrs": ["bold"] },
-		"time:divider":               { "fg": "solarized:base1", "bg": "solarized:base02", "attrs": [] },
-		"system_load":                { "fg": "solarized:base1", "bg": "solarized:base03", "attrs": [] },
-		"weather_temp_gradient":      { "fg": "blue_red", "bg": "solarized:base03", "attrs": [] },
-		"weather":                    { "fg": "solarized:base1", "bg": "solarized:base03", "attrs": [] },
-		"uptime":                     { "fg": "solarized:base1", "bg": "solarized:base03", "attrs": [] }
-	}
-}
diff --git a/powerline/colorschemes/tmux/default.json b/powerline/colorschemes/tmux/default.json
deleted file mode 100644
index 8525fb0..0000000
--- a/powerline/colorschemes/tmux/default.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"groups": {
-		"active_window_status": {"fg": "darkblue",   "bg": "gray0",    "attrs": []},
-		"window_status":        {"fg": "gray70",     "bg": "gray0",    "attrs": []},
-		"activity_status":      {"fg": "yellow",     "bg": "gray0",    "attrs": []},
-		"bell_status":          {"fg": "red",        "bg": "gray0",    "attrs": []},
-		"window":               {"fg": "gray6",      "bg": "gray0",    "attrs": []},
-		"window:divider":       {"fg": "gray4",      "bg": "gray0",    "attrs": []},
-		"window:current":       {"fg": "mediumcyan", "bg": "darkblue", "attrs": []},
-		"window_name":          {"fg": "white",      "bg": "darkblue", "attrs": ["bold"]},
-		"session":              {"fg": "black",      "bg": "gray90",   "attrs": ["bold"]},
-		"session:prefix":       {"fg": "gray90",     "bg": "darkblue", "attrs": ["bold"]}
-	}
-}
diff --git a/powerline/colorschemes/tmux/solarized.json b/powerline/colorschemes/tmux/solarized.json
deleted file mode 100644
index 20c42d3..0000000
--- a/powerline/colorschemes/tmux/solarized.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"groups": {
-		"active_window_status": { "fg": "solarized:blue",   "bg": "solarized:base02", "attrs": [] },
-		"window_status":        { "fg": "solarized:base1",  "bg": "solarized:base02", "attrs": [] },
-		"activity_status":      { "fg": "solarized:yellow", "bg": "solarized:base02", "attrs": [] },
-		"bell_status":          { "fg": "solarized:red",    "bg": "solarized:base02", "attrs": [] },
-		"window":               { "fg": "solarized:base1",  "bg": "solarized:base02", "attrs": [] },
-		"window:divider":       { "fg": "solarized:base01", "bg": "solarized:base02", "attrs": [] },
-		"window:current":       { "fg": "solarized:base3",  "bg": "solarized:base01", "attrs": [] },
-		"window_name":          { "fg": "solarized:base3",  "bg": "solarized:base01", "attrs": ["bold"] },
-		"session":              { "fg": "solarized:base3",  "bg": "solarized:base01", "attrs": [] },
-		"session:prefix":       { "fg": "solarized:base01", "bg": "solarized:base3",  "attrs": [] }
-	}
-}
diff --git a/powerline/colorschemes/vim/__main__.json b/powerline/colorschemes/vim/__main__.json
deleted file mode 100644
index 1ce2e7b..0000000
--- a/powerline/colorschemes/vim/__main__.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-	"groups": {
-		"branch_clean":       "branch",
-		"environment":        "information:unimportant",
-		"file_size":          "information:unimportant",
-		"file_format":        "information:unimportant",
-		"file_encoding":      "file_format",
-		"file_type":          "file_format",
-		"branch":             "information:additional",
-		"file_scheme":        "file_name",
-		"file_directory":     "information:additional",
-		"file_name_empty":    "file_directory",
-		"line_percent":       "information:additional",
-		"line_count":         "line_current",
-		"position":           "information:additional",
-		"single_tab":         "line_current",
-		"many_tabs":          "line_current",
-		"bufnr":              "file_directory",
-		"winnr":              "information:unimportant",
-		"tabnr":              "file_directory",
-		"capslock_indicator": "paste_indicator",
-
-		"csv:column_number": "line_current",
-		"csv:column_name":   "line_current_symbol",
-
-		"tab:background":     "background",
-		"tab:divider":        "background:divider",
-
-		"tab_nc:modified_indicator": "modified_indicator",
-		"tab_nc:file_directory":     "information:unimportant",
-		"tab_nc:file_name":          "tab_nc:file_directory",
-		"tab_nc:tabnr":              "tab_nc:file_directory",
-
-		"buf_nc:file_directory":     "tab_nc:file_directory",
-		"buf_nc:file_name":          "buf_nc:file_directory",
-		"buf_nc:bufnr":              "buf_nc:file_directory",
-		"buf_nc:modified_indicator": "tab_nc:modified_indicator",
-
-		"buf_nc_mod:file_directory":     "tab_nc:file_directory",
-		"buf_nc_mod:file_name":          "buf_nc_mod:file_directory",
-		"buf_nc_mod:bufnr":              "buf_nc_mod:file_directory",
-		"buf_nc_mod:modified_indicator": "tab_nc:modified_indicator",
-
-
-		"commandt:label":      "file_name",
-		"commandt:background": "background",
-		"commandt:finder":     "file_name",
-		"commandt:path":       "file_directory"
-	}
-}
diff --git a/powerline/colorschemes/vim/default.json b/powerline/colorschemes/vim/default.json
deleted file mode 100644
index e02a160..0000000
--- a/powerline/colorschemes/vim/default.json
+++ /dev/null
@@ -1,154 +0,0 @@
-{
-	"name": "Default color scheme",
-	"groups": {
-		"information:unimportant":  { "fg": "gray8", "bg": "gray2", "attrs": [] },
-		"information:additional":   { "fg": "gray9", "bg": "gray4", "attrs": [] },
-		"background":               { "fg": "white", "bg": "gray2", "attrs": [] },
-		"background:divider":       { "fg": "gray6", "bg": "gray2", "attrs": [] },
-		"mode":                     { "fg": "darkestgreen", "bg": "brightgreen", "attrs": ["bold"] },
-		"visual_range":             { "fg": "brightestorange", "bg": "darkorange", "attrs": ["bold"] },
-		"modified_indicator":       { "fg": "brightyellow", "bg": "gray4", "attrs": ["bold"] },
-		"paste_indicator":          { "fg": "white", "bg": "mediumorange", "attrs": ["bold"] },
-		"readonly_indicator":       { "fg": "brightestred", "bg": "gray4", "attrs": [] },
-		"branch_dirty":             { "fg": "brightyellow", "bg": "gray4", "attrs": [] },
-		"branch:divider":           { "fg": "gray7", "bg": "gray4", "attrs": [] },
-		"file_name":                { "fg": "white", "bg": "gray4", "attrs": ["bold"] },
-		"window_title":             { "fg": "white", "bg": "gray4", "attrs": [] },
-		"file_name_no_file":        { "fg": "gray9", "bg": "gray4", "attrs": ["bold"] },
-		"file_vcs_status":          { "fg": "brightestred", "bg": "gray4", "attrs": [] },
-		"file_vcs_status_M":        { "fg": "brightyellow", "bg": "gray4", "attrs": [] },
-		"file_vcs_status_A":        { "fg": "brightgreen", "bg": "gray4", "attrs": [] },
-		"line_percent":             { "fg": "gray9", "bg": "gray4", "attrs": [] },
-		"line_percent_gradient":    { "fg": "dark_green_gray", "bg": "gray4", "attrs": [] },
-		"position":                 { "fg": "gray9", "bg": "gray4", "attrs": [] },
-		"position_gradient":        { "fg": "green_yellow_red", "bg": "gray4", "attrs": [] },
-		"line_current":             { "fg": "gray1", "bg": "gray10", "attrs": ["bold"] },
-		"line_current_symbol":      { "fg": "gray1", "bg": "gray10", "attrs": [] },
-		"virtcol_current_gradient": { "fg": "dark_GREEN_Orange_red", "bg": "gray10", "attrs": [] },
-		"col_current":              { "fg": "gray6", "bg": "gray10", "attrs": [] },
-		"modified_buffers":         { "fg": "brightyellow", "bg": "gray2", "attrs": [] },
-		"attached_clients":         { "fg": "gray8", "bg": "gray2", "attrs": [] },
-		"error":                    { "fg": "brightestred", "bg": "darkred", "attrs": ["bold"] },
-		"warning":                  { "fg": "brightyellow", "bg": "darkorange", "attrs": ["bold"] },
-		"current_tag":              { "fg": "gray9", "bg": "gray2", "attrs": [] },
-
-		"tab_nc:modified_indicator": { "fg": "brightyellow", "bg": "gray2", "attrs": ["bold"] }
-	},
-	"mode_translations": {
-		"nc": {
-			"colors": {
-				"brightyellow": "darkorange",
-				"brightestred": "darkred",
-				"gray0": "gray0",
-				"gray1": "gray0",
-				"gray2": "gray0",
-				"gray3": "gray1",
-				"gray4": "gray1",
-				"gray5": "gray1",
-				"gray6": "gray1",
-				"gray7": "gray4",
-				"gray8": "gray4",
-				"gray9": "gray4",
-				"gray10": "gray5",
-				"white": "gray6",
-				"dark_green_gray": "gray5"
-			}
-		},
-		"i": {
-			"colors": {
-				"gray0": "darkestblue",
-				"gray1": "darkestblue",
-				"gray2": "darkestblue",
-				"gray3": "darkblue",
-				"gray4": "darkblue",
-				"gray5": "darkestcyan",
-				"gray6": "darkestcyan",
-				"gray7": "darkestcyan",
-				"gray8": "mediumcyan",
-				"gray9": "mediumcyan",
-				"gray10": "mediumcyan",
-				"green_yellow_red": "gray5",
-				"dark_green_gray": "light_green_gray"
-			},
-			"groups": {
-				"mode":               { "fg": "darkestcyan", "bg": "white", "attrs": ["bold"] },
-				"background:divider": { "fg": "darkcyan", "bg": "darkestblue", "attrs": [] },
-				"branch:divider":     { "fg": "darkcyan", "bg": "darkblue", "attrs": [] }
-			}
-		},
-		"ic": {
-			"colors": {
-				"gray0": "darkestblue",
-				"gray1": "darkestblue",
-				"gray2": "darkestblue",
-				"gray3": "darkblue",
-				"gray4": "darkblue",
-				"gray5": "darkestcyan",
-				"gray6": "darkestcyan",
-				"gray7": "darkestcyan",
-				"gray8": "mediumcyan",
-				"gray9": "mediumcyan",
-				"gray10": "mediumcyan",
-				"green_yellow_red": "gray5",
-				"dark_green_gray": "light_green_gray"
-			},
-			"groups": {
-				"mode":               { "fg": "darkestcyan", "bg": "white", "attrs": ["bold"] },
-				"background:divider": { "fg": "darkcyan", "bg": "darkestblue", "attrs": [] },
-				"branch:divider":     { "fg": "darkcyan", "bg": "darkblue", "attrs": [] }
-			}
-		},
-		"ix": {
-			"colors": {
-				"gray0": "darkestblue",
-				"gray1": "darkestblue",
-				"gray2": "darkestblue",
-				"gray3": "darkblue",
-				"gray4": "darkblue",
-				"gray5": "darkestcyan",
-				"gray6": "darkestcyan",
-				"gray7": "darkestcyan",
-				"gray8": "mediumcyan",
-				"gray9": "mediumcyan",
-				"gray10": "mediumcyan",
-				"green_yellow_red": "gray5",
-				"dark_green_gray": "light_green_gray"
-			},
-			"groups": {
-				"mode":               { "fg": "darkestcyan", "bg": "white", "attrs": ["bold"] },
-				"background:divider": { "fg": "darkcyan", "bg": "darkestblue", "attrs": [] },
-				"branch:divider":     { "fg": "darkcyan", "bg": "darkblue", "attrs": [] }
-			}
-		},
-		"v": {
-			"groups": {
-				"mode": { "fg": "darkorange", "bg": "brightestorange", "attrs": ["bold"] }
-			}
-		},
-		"V": {
-			"groups": {
-				"mode": { "fg": "darkorange", "bg": "brightestorange", "attrs": ["bold"] }
-			}
-		},
-		"^V": {
-			"groups": {
-				"mode": { "fg": "darkorange", "bg": "brightestorange", "attrs": ["bold"] }
-			}
-		},
-		"R": {
-			"groups": {
-				"mode": { "fg": "white", "bg": "brightred", "attrs": ["bold"] }
-			}
-		},
-		"Rc": {
-			"groups": {
-				"mode": { "fg": "white", "bg": "brightred", "attrs": ["bold"] }
-			}
-		},
-		"Rx": {
-			"groups": {
-				"mode": { "fg": "white", "bg": "brightred", "attrs": ["bold"] }
-			}
-		}
-	}
-}
diff --git a/powerline/colorschemes/vim/solarized.json b/powerline/colorschemes/vim/solarized.json
deleted file mode 100644
index 55cfaa7..0000000
--- a/powerline/colorschemes/vim/solarized.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-	"name": "Solarized dark for vim",
-	"groups": {
-		"information:additional":   { "fg": "solarized:base2", "bg": "solarized:base01", "attrs": [] },
-		"information:unimportant":  { "fg": "solarized:base3", "bg": "solarized:base01", "attrs": [] },
-		"background":               { "fg": "solarized:base3", "bg": "solarized:base02", "attrs": [] },
-		"background:divider":       { "fg": "solarized:base00", "bg": "solarized:base02", "attrs": [] },
-		"mode":                     { "fg": "solarized:base3", "bg": "solarized:green", "attrs": ["bold"] },
-		"visual_range":             { "fg": "solarized:green", "bg": "solarized:base3", "attrs": ["bold"] },
-		"modified_indicator":       { "fg": "solarized:yellow", "bg": "solarized:base01", "attrs": ["bold"] },
-		"paste_indicator":          { "fg": "solarized:base3", "bg": "solarized:orange", "attrs": ["bold"] },
-		"readonly_indicator":       { "fg": "solarized:red", "bg": "solarized:base01", "attrs": [] },
-		"branch_dirty":             { "fg": "solarized:yellow", "bg": "solarized:base01", "attrs": [] },
-		"branch:divider":           { "fg": "solarized:base1", "bg": "solarized:base01", "attrs": [] },
-		"stash:divider":            "branch:divider",
-		"file_name":                { "fg": "solarized:base3", "bg": "solarized:base01", "attrs": ["bold"] },
-		"window_title":             { "fg": "solarized:base3", "bg": "solarized:base01", "attrs": [] },
-		"file_name_no_file":        { "fg": "solarized:base3", "bg": "solarized:base01", "attrs": ["bold"] },
-		"file_format":              { "fg": "solarized:base1", "bg": "solarized:base02", "attrs": [] },
-		"file_vcs_status":          { "fg": "solarized:red", "bg": "solarized:base01", "attrs": [] },
-		"file_vcs_status_M":        { "fg": "solarized:yellow", "bg": "solarized:base01", "attrs": [] },
-		"file_vcs_status_A":        { "fg": "solarized:green", "bg": "solarized:base01", "attrs": [] },
-		"line_percent":             { "fg": "solarized:base3", "bg": "solarized:base00", "attrs": [] },
-		"line_percent_gradient":    { "fg": "green_yellow_orange_red", "bg": "solarized:base00", "attrs": [] },
-		"position":                 { "fg": "solarized:base3", "bg": "solarized:base00", "attrs": [] },
-		"position_gradient":        { "fg": "green_yellow_orange_red", "bg": "solarized:base00", "attrs": [] },
-		"line_current":             { "fg": "solarized:base03", "bg": "solarized:base2", "attrs": ["bold"] },
-		"line_current_symbol":      { "fg": "solarized:base03", "bg": "solarized:base2", "attrs": [] },
-		"virtcol_current_gradient": { "fg": "GREEN_Orange_red", "bg": "solarized:base2", "attrs": [] },
-		"col_current":              { "fg": "solarized:base0", "bg": "solarized:base2", "attrs": [] },
-		"environment":              { "fg": "solarized:base1", "bg": "solarized:base02", "attrs": [] },
-		"attached_clients":         { "fg": "solarized:base1", "bg": "solarized:base02", "attrs": [] },
-		"error":                    { "fg": "solarized:base3", "bg": "solarized:red", "attrs": ["bold"] },
-		"warning":                  { "fg": "solarized:base3", "bg": "solarized:orange", "attrs": ["bold"] },
-		"current_tag":              { "fg": "solarized:base3", "bg": "solarized:base02", "attrs": ["bold"] }
-	},
-	"mode_translations": {
-		"nc": {
-			"colors": {
-				"solarized:base01": "solarized:base02",
-				"solarized:base00": "solarized:base02",
-				"solarized:base0": "solarized:base01",
-				"solarized:base1": "solarized:base00",
-				"solarized:base2": "solarized:base0",
-				"solarized:base3": "solarized:base1"
-			}
-		},
-		"i": {
-			"groups": {
-				"background":             { "fg": "solarized:base3", "bg": "solarized:base01", "attrs": [] },
-				"background:divider":     { "fg": "solarized:base2", "bg": "solarized:base01", "attrs": [] },
-				"mode":                   { "fg": "solarized:base3", "bg": "solarized:blue", "attrs": ["bold"] },
-				"modified_indicator":     { "fg": "solarized:yellow", "bg": "solarized:base2", "attrs": ["bold"] },
-				"paste_indicator":        { "fg": "solarized:base3", "bg": "solarized:orange", "attrs": ["bold"] },
-				"readonly_indicator":     { "fg": "solarized:red", "bg": "solarized:base2", "attrs": [] },
-				"branch":                 { "fg": "solarized:base01", "bg": "solarized:base2", "attrs": [] },
-				"branch:divider":         { "fg": "solarized:base00", "bg": "solarized:base2", "attrs": [] },
-				"file_directory":         { "fg": "solarized:base01", "bg": "solarized:base2", "attrs": [] },
-				"file_name":              { "fg": "solarized:base02", "bg": "solarized:base2", "attrs": ["bold"] },
-				"file_size":              { "fg": "solarized:base02", "bg": "solarized:base2", "attrs": [] },
-				"file_name_no_file":      { "fg": "solarized:base02", "bg": "solarized:base2", "attrs": ["bold"] },
-				"file_name_empty":        { "fg": "solarized:base02", "bg": "solarized:base2", "attrs": [] },
-				"file_format":            { "fg": "solarized:base2", "bg": "solarized:base01", "attrs": [] },
-				"file_vcs_status":        { "fg": "solarized:red", "bg": "solarized:base2", "attrs": [] },
-				"file_vcs_status_M":      { "fg": "solarized:yellow", "bg": "solarized:base2", "attrs": [] },
-				"file_vcs_status_A":      { "fg": "solarized:green", "bg": "solarized:base2", "attrs": [] },
-				"line_percent":           { "fg": "solarized:base3", "bg": "solarized:base1", "attrs": [] },
-				"line_percent_gradient":  { "fg": "solarized:base3", "bg": "solarized:base1", "attrs": [] },
-				"position":               { "fg": "solarized:base3", "bg": "solarized:base1", "attrs": [] },
-				"position_gradient":      { "fg": "solarized:base3", "bg": "solarized:base1", "attrs": [] },
-				"line_current":           { "fg": "solarized:base03", "bg": "solarized:base3", "attrs": ["bold"] },
-				"line_current_symbol":    { "fg": "solarized:base03", "bg": "solarized:base3", "attrs": [] },
-				"col_current":            { "fg": "solarized:base0", "bg": "solarized:base3", "attrs": [] }
-			}
-		},
-		"ic": {
-			"groups": {
-				"background":             { "fg": "solarized:base3", "bg": "solarized:base01", "attrs": [] },
-				"background:divider":     { "fg": "solarized:base2", "bg": "solarized:base01", "attrs": [] },
-				"mode":                   { "fg": "solarized:base3", "bg": "solarized:blue", "attrs": ["bold"] }
-			}
-		},
-		"ix": {
-			"groups": {
-				"background":             { "fg": "solarized:base3", "bg": "solarized:base01", "attrs": [] },
-				"background:divider":     { "fg": "solarized:base2", "bg": "solarized:base01", "attrs": [] },
-				"mode":                   { "fg": "solarized:base3", "bg": "solarized:blue", "attrs": ["bold"] }
-			}
-		},
-		"v": {
-			"groups": {
-				"mode": { "fg": "solarized:base3", "bg": "solarized:orange", "attrs": ["bold"] }
-			}
-		},
-		"V": {
-			"groups": {
-				"mode": { "fg": "solarized:base3", "bg": "solarized:orange", "attrs": ["bold"] }
-			}
-		},
-		"^V": {
-			"groups": {
-				"mode": { "fg": "solarized:base3", "bg": "solarized:orange", "attrs": ["bold"] }
-			}
-		},
-		"R": {
-			"groups": {
-				"mode": { "fg": "solarized:base3", "bg": "solarized:red", "attrs": ["bold"] }
-			}
-		},
-		"Rc": {
-			"groups": {
-				"mode": { "fg": "solarized:base3", "bg": "solarized:red", "attrs": ["bold"] }
-			}
-		},
-		"Rx": {
-			"groups": {
-				"mode": { "fg": "solarized:base3", "bg": "solarized:red", "attrs": ["bold"] }
-			}
-		}
-	}
-}
diff --git a/powerline/colorschemes/vim/solarizedlight.json b/powerline/colorschemes/vim/solarizedlight.json
deleted file mode 100644
index f862d39..0000000
--- a/powerline/colorschemes/vim/solarizedlight.json
+++ /dev/null
@@ -1,122 +0,0 @@
-{
-	"name": "Solarized light for vim",
-	"groups": {
-		"information:additional":   { "fg": "solarized:base02", "bg": "solarized:base2", "attrs": [] },
-		"information:unimportant":  { "fg": "solarized:base1", "bg": "solarized:base01", "attrs": [] },
-		"background":               { "fg": "solarized:base03", "bg": "solarized:base01", "attrs": [] },
-		"background:divider":       { "fg": "solarized:base0", "bg": "solarized:base01", "attrs": [] },
-		"mode":                     { "fg": "solarized:base3", "bg": "solarized:green", "attrs": ["bold"] },
-		"visual_range":             { "fg": "solarized:green", "bg": "solarized:base3", "attrs": ["bold"] },
-		"modified_indicator":       { "fg": "solarized:yellow", "bg": "solarized:base2", "attrs": ["bold"] },
-		"paste_indicator":          { "fg": "solarized:red", "bg": "solarized:base2", "attrs": ["bold"] },
-		"readonly_indicator":       { "fg": "solarized:red", "bg": "solarized:base2", "attrs": [] },
-		"branch_dirty":             { "fg": "solarized:yellow", "bg": "solarized:base2", "attrs": [] },
-		"branch:divider":           { "fg": "solarized:base1", "bg": "solarized:base2", "attrs": [] },
-		"stash":                    "branch_dirty",
-		"stash:divider":            "branch:divider",
-		"file_name":                { "fg": "solarized:base03", "bg": "solarized:base2", "attrs": ["bold"] },
-		"window_title":             { "fg": "solarized:base03", "bg": "solarized:base2", "attrs": [] },
-		"file_size":                { "fg": "solarized:base03", "bg": "solarized:base2", "attrs": [] },
-		"file_name_no_file":        { "fg": "solarized:base03", "bg": "solarized:base2", "attrs": ["bold"] },
-		"file_name_empty":          { "fg": "solarized:base03", "bg": "solarized:base2", "attrs": [] },
-		"file_vcs_status":          { "fg": "solarized:red", "bg": "solarized:base2", "attrs": [] },
-		"file_vcs_status_M":        { "fg": "solarized:yellow", "bg": "solarized:base2", "attrs": [] },
-		"file_vcs_status_A":        { "fg": "solarized:green", "bg": "solarized:base2", "attrs": [] },
-		"line_percent":             { "fg": "solarized:base03", "bg": "solarized:base2", "attrs": [] },
-		"line_percent_gradient":    { "fg": "green_yellow_orange_red", "bg": "solarized:base2", "attrs": [] },
-		"position":                 { "fg": "solarized:base03", "bg": "solarized:base2", "attrs": [] },
-		"position_gradient":        { "fg": "green_yellow_orange_red", "bg": "solarized:base2", "attrs": [] },
-		"line_current":             { "fg": "solarized:base3", "bg": "solarized:base02", "attrs": ["bold"] },
-		"line_current_symbol":      { "fg": "solarized:base3", "bg": "solarized:base02", "attrs": [] },
-		"virtcol_current_gradient": { "fg": "yellow_orange_red", "bg": "solarized:base02", "attrs": [] },
-		"col_current":              { "fg": "solarized:base00", "bg": "solarized:base02", "attrs": [] },
-		"error":                    { "fg": "solarized:base03", "bg": "solarized:red", "attrs": ["bold"] },
-		"warning":                  { "fg": "solarized:base03", "bg": "solarized:base2", "attrs": ["bold"] },
-		"current_tag":              { "fg": "solarized:base03", "bg": "solarized:base01", "attrs": ["bold"] }
-	},
-	"mode_translations": {
-		"nc": {
-			"colors": {
-				"solarized:base2": "solarized:base01",
-				"solarized:base0": "solarized:base01",
-				"solarized:base00": "solarized:base2",
-				"solarized:base1": "solarized:base0",
-				"solarized:base02": "solarized:base00",
-				"solarized:base03": "solarized:base1"
-			}
-		},
-		"i": {
-			"groups": {
-				"background":             { "fg": "solarized:base03", "bg": "solarized:base2", "attrs": [] },
-				"background:divider":     { "fg": "solarized:base02", "bg": "solarized:base2", "attrs": [] },
-				"mode":                   { "fg": "solarized:base3", "bg": "solarized:blue", "attrs": ["bold"] },
-				"modified_indicator":     { "fg": "solarized:yellow", "bg": "solarized:base02", "attrs": ["bold"] },
-				"paste_indicator":        { "fg": "solarized:base3", "bg": "solarized:orange", "attrs": ["bold"] },
-				"readonly_indicator":     { "fg": "solarized:red", "bg": "solarized:base02", "attrs": [] },
-				"branch":                 { "fg": "solarized:base2", "bg": "solarized:base02", "attrs": [] },
-				"branch:divider":         { "fg": "solarized:base0", "bg": "solarized:base02", "attrs": [] },
-				"file_directory":         { "fg": "solarized:base2", "bg": "solarized:base02", "attrs": [] },
-				"file_name":              { "fg": "solarized:base01", "bg": "solarized:base02", "attrs": ["bold"] },
-				"file_size":              { "fg": "solarized:base01", "bg": "solarized:base02", "attrs": [] },
-				"file_name_no_file":      { "fg": "solarized:base01", "bg": "solarized:base02", "attrs": ["bold"] },
-				"file_name_empty":        { "fg": "solarized:base01", "bg": "solarized:base02", "attrs": [] },
-				"file_format":            { "fg": "solarized:base02", "bg": "solarized:base2", "attrs": [] },
-				"file_vcs_status":        { "fg": "solarized:red", "bg": "solarized:base02", "attrs": [] },
-				"file_vcs_status_M":      { "fg": "solarized:yellow", "bg": "solarized:base02", "attrs": [] },
-				"file_vcs_status_A":      { "fg": "solarized:green", "bg": "solarized:base02", "attrs": [] },
-				"line_percent":           { "fg": "solarized:base03", "bg": "solarized:base1", "attrs": [] },
-				"line_percent_gradient":  { "fg": "solarized:base03", "bg": "solarized:base1", "attrs": [] },
-				"position":               { "fg": "solarized:base03", "bg": "solarized:base1", "attrs": [] },
-				"position_gradient":      { "fg": "solarized:base03", "bg": "solarized:base1", "attrs": [] },
-				"line_current":           { "fg": "solarized:base3", "bg": "solarized:base03", "attrs": ["bold"] },
-				"line_current_symbol":    { "fg": "solarized:base3", "bg": "solarized:base03", "attrs": [] },
-				"virtcol_current_gradient": { "fg": "yellow_orange_red", "bg": "solarized:base03", "attrs": [] },
-				"col_current":              { "fg": "solarized:base00", "bg": "solarized:base03", "attrs": [] }
-			}
-		},
-		"ic": {
-			"groups": {
-				"background":             { "fg": "solarized:base03", "bg": "solarized:base2", "attrs": [] },
-				"background:divider":     { "fg": "solarized:base02", "bg": "solarized:base2", "attrs": [] },
-				"mode":                   { "fg": "solarized:base3", "bg": "solarized:blue", "attrs": ["bold"] }
-			}
-		},
-		"ix": {
-			"groups": {
-				"background":             { "fg": "solarized:base03", "bg": "solarized:base2", "attrs": [] },
-				"background:divider":     { "fg": "solarized:base02", "bg": "solarized:base2", "attrs": [] },
-				"mode":                   { "fg": "solarized:base3", "bg": "solarized:blue", "attrs": ["bold"] }
-			}
-		},
-		"v": {
-			"groups": {
-				"mode": { "fg": "solarized:base3", "bg": "solarized:orange", "attrs": ["bold"] }
-			}
-		},
-		"V": {
-			"groups": {
-				"mode": { "fg": "solarized:base3", "bg": "solarized:orange", "attrs": ["bold"] }
-			}
-		},
-		"^V": {
-			"groups": {
-				"mode": { "fg": "solarized:base3", "bg": "solarized:orange", "attrs": ["bold"] }
-			}
-		},
-		"R": {
-			"groups": {
-				"mode": { "fg": "solarized:base3", "bg": "solarized:red", "attrs": ["bold"] }
-			}
-		},
-		"Rc": {
-			"groups": {
-				"mode": { "fg": "solarized:base3", "bg": "solarized:red", "attrs": ["bold"] }
-			}
-		},
-		"Rx": {
-			"groups": {
-				"mode": { "fg": "solarized:base3", "bg": "solarized:red", "attrs": ["bold"] }
-			}
-		}
-	}
-}
diff --git a/powerline/config.json b/powerline/config.json
deleted file mode 100644
index 7e36d4c..0000000
--- a/powerline/config.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-	"common": {
-		"term_truecolor": false
-	},
-	"ext": {
-		"ipython": {
-			"colorscheme": "default",
-			"theme": "in",
-			"local_themes": {
-				"rewrite": "rewrite",
-				"out": "out",
-				"in2": "in2"
-			}
-		},
-		"pdb": {
-			"colorscheme": "default",
-			"theme": "default"
-		},
-		"shell": {
-			"colorscheme": "default",
-			"theme": "default",
-			"local_themes": {
-				"continuation": "continuation",
-				"select": "select"
-			}
-		},
-		"tmux": {
-			"colorscheme": "default",
-			"theme": "default"
-		},
-		"vim": {
-			"colorscheme": "default",
-			"theme": "default",
-			"local_themes": {
-				"__tabline__": "tabline",
-
-				"cmdwin": "cmdwin",
-				"help": "help",
-				"quickfix": "quickfix",
-
-				"powerline.matchers.vim.plugin.nerdtree.nerdtree": "plugin_nerdtree",
-				"powerline.matchers.vim.plugin.commandt.commandt": "plugin_commandt",
-				"powerline.matchers.vim.plugin.gundo.gundo": "plugin_gundo",
-				"powerline.matchers.vim.plugin.gundo.gundo_preview": "plugin_gundo-preview"
-			}
-		},
-		"wm": {
-			"colorscheme": "jonas",
-			"theme": "default",
-			"update_interval": 2
-		}
-	}
-}
diff --git a/powerline/themes/ascii.json b/powerline/themes/ascii.json
deleted file mode 100644
index 0ea05e7..0000000
--- a/powerline/themes/ascii.json
+++ /dev/null
@@ -1,153 +0,0 @@
-{
-	"use_non_breaking_spaces": false,
-	"dividers": {
-		"left": {
-			"hard": " ",
-			"soft": "| "
-		},
-		"right": {
-			"hard": " ",
-			"soft": " |"
-		}
-	},
-	"spaces": 1,
-	"segment_data": {
-		"branch": {
-			"before": "BR "
-		},
-		"stash": {
-			"before": "ST "
-		},
-		"cwd": {
-			"args": {
-				"ellipsis": "..."
-			}
-		},
-		"player": {
-			"args": {
-				"state_symbols": {
-					"fallback": "",
-					"play":     ">",
-					"pause":    "~",
-					"stop":     "X"
-				}
-			}
-		},
-
-		"line_current_symbol": {
-			"contents": "LN "
-		},
-
-		"time": {
-			"before": ""
-		},
-
-		"powerline.segments.common.net.network_load": {
-			"args": {
-				"recv_format": "DL {value:>8}",
-				"sent_format": "UL {value:>8}"
-			}
-		},
-		"powerline.segments.common.net.hostname": {
-			"before": "H "
-		},
-		"powerline.segments.common.bat.battery": {
-			"args": {
-				"full_heart": "O",
-				"empty_heart": "O",
-				"online": "C",
-				"offline": " "
-			}
-		},
-		"powerline.segments.common.sys.uptime": {
-			"before": "UP  "
-		},
-		"powerline.segments.common.mail.email_imap_alert": {
-			"before": "MAIL "
-		},
-		"powerline.segments.common.env.virtualenv": {
-			"before": "(e) "
-		},
-		"powerline.segments.common.wthr.weather": {
-			"args": {
-				"icons": {
-					"day":           "DAY",
-					"blustery":      "WIND",
-					"rainy":         "RAIN",
-					"cloudy":        "CLOUDS",
-					"snowy":         "SNOW",
-					"stormy":        "STORM",
-					"foggy":         "FOG",
-					"sunny":         "SUN",
-					"night":         "NIGHT",
-					"windy":         "WINDY",
-					"not_available": "NA",
-					"unknown":       "UKN"
-				},
-				"temp_format": "{temp:.0f} C"
-			}
-		},
-		"powerline.segments.common.time.fuzzy_time": {
-			"args": {
-				"unicode_text": false
-			}
-		},
-
-		"powerline.segments.vim.mode": {
-			"args": {
-				"override": {
-					"n":  "NORMAL",
-					"no": "N-OPER",
-					"v":  "VISUAL",
-					"V":  "V-LINE",
-					"^V": "V-BLCK",
-					"s":  "SELECT",
-					"S":  "S-LINE",
-					"^S": "S-BLCK",
-					"i":  "INSERT",
-					"ic": "I-COMP",
-					"ix": "I-C_X ",
-					"R":  "RPLACE",
-					"Rv": "V-RPLC",
-					"Rc": "R-COMP",
-					"Rx": "R-C_X ",
-					"c":  "COMMND",
-					"cv": "VIM-EX",
-					"ce": "NRM-EX",
-					"r":  "PROMPT",
-					"rm": "-MORE-",
-					"r?": "CNFIRM",
-					"!":  "!SHELL",
-					"t":  "TERM  "
-				}
-			}
-		},
-		"powerline.segments.vim.visual_range": {
-			"args": {
-				"CTRL_V_text": "{rows} x {vcols}",
-				"v_text_oneline": "C:{vcols}",
-				"v_text_multiline": "L:{rows}",
-				"V_text": "L:{rows}"
-			}
-		},
-		"powerline.segments.vim.readonly_indicator": {
-			"args": {
-				"text": "RO"
-			}
-		},
-		"powerline.segments.vim.modified_indicator": {
-			"args": {
-				"text": "+"
-			}
-		},
-
-		"powerline.segments.i3wm.scratchpad": {
-			"args": {
-				"icons": {
-					"fresh": "O",
-					"changed": "X"
-				}
-			}
-		}
-	}
-}
diff --git a/powerline/themes/ipython/in.json b/powerline/themes/ipython/in.json
deleted file mode 100644
index edd4d29..0000000
--- a/powerline/themes/ipython/in.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"segments": {
-		"left": [
-			{
-				"function": "powerline.segments.common.env.virtualenv",
-				"priority": 10
-			},
-			{
-				"type": "string",
-				"contents": "In [",
-				"draw_soft_divider": false,
-				"highlight_groups": ["prompt"]
-			},
-			{
-				"function": "powerline.segments.ipython.prompt_count",
-				"draw_soft_divider": false
-			},
-			{
-				"type": "string",
-				"contents": "]",
-				"highlight_groups": ["prompt"]
-			}
-		]
-	}
-}
diff --git a/powerline/themes/ipython/in2.json b/powerline/themes/ipython/in2.json
deleted file mode 100644
index 422c44b..0000000
--- a/powerline/themes/ipython/in2.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"segments": {
-		"left": [
-			{
-				"type": "string",
-				"contents": "",
-				"width": "auto",
-				"highlight_groups": ["prompt"]
-			}
-		]
-	}
-}
diff --git a/powerline/themes/ipython/out.json b/powerline/themes/ipython/out.json
deleted file mode 100644
index 2425d0b..0000000
--- a/powerline/themes/ipython/out.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-	"default_module": "powerline.segments.ipython",
-	"segments": {
-		"left": [
-			{
-				"type": "string",
-				"contents": "Out[",
-				"draw_soft_divider": false,
-				"width": "auto",
-				"align": "r",
-				"highlight_groups": ["prompt"]
-			},
-			{
-				"function": "prompt_count",
-				"draw_soft_divider": false
-			},
-			{
-				"type": "string",
-				"contents": "]",
-				"highlight_groups": ["prompt"]
-			}
-		]
-	}
-}
diff --git a/powerline/themes/ipython/rewrite.json b/powerline/themes/ipython/rewrite.json
deleted file mode 100644
index 8192fe4..0000000
--- a/powerline/themes/ipython/rewrite.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"default_module": "powerline.segments.ipython",
-	"segments": {
-		"left": [
-			{
-				"type": "string",
-				"contents": "",
-				"draw_soft_divider": false,
-				"width": "auto",
-				"highlight_groups": ["prompt"]
-			},
-			{
-				"function": "prompt_count",
-				"draw_soft_divider": false
-			},
-			{
-				"type": "string",
-				"contents": ">",
-				"highlight_groups": ["prompt"]
-			}
-		]
-	}
-}
diff --git a/powerline/themes/pdb/default.json b/powerline/themes/pdb/default.json
deleted file mode 100644
index dcae108..0000000
--- a/powerline/themes/pdb/default.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"default_module": "powerline.segments.pdb",
-	"segments": {
-		"left": [
-			{
-				"function": "stack_depth"
-			},
-			{
-				"type": "segment_list",
-				"function": "powerline.listers.pdb.frame_lister",
-				"segments": [
-					{
-						"function": "current_file",
-						"after": ":"
-					},
-					{
-						"function": "current_line",
-						"after": " "
-					},
-					{
-						"function": "current_code_name"
-					}
-				]
-			}
-		]
-	}
-}
diff --git a/powerline/themes/powerline.json b/powerline/themes/powerline.json
deleted file mode 100644
index 366a7ea..0000000
--- a/powerline/themes/powerline.json
+++ /dev/null
@@ -1,151 +0,0 @@
-{
-	"dividers": {
-		"left": {
-			"hard": " ",
-			"soft": " "
-		},
-		"right": {
-			"hard": " ",
-			"soft": " "
-		}
-	},
-	"spaces": 1,
-	"segment_data": {
-		"branch": {
-			"before": " "
-		},
-		"stash": {
-			"before": "⌆ "
-		},
-		"cwd": {
-			"args": {
-				"ellipsis": "⋯"
-			}
-		},
-
-		"line_current_symbol": {
-			"contents": " "
-		},
-		"player": {
-			"args": {
-				"state_symbols": {
-					"fallback": "♫",
-					"play":     "▶",
-					"pause":    "▮▮",
-					"stop":     "■"
-				}
-			}
-		},
-
-		"time": {
-			"before": "⌚ "
-		},
-
-		"powerline.segments.common.net.network_load": {
-			"args": {
-				"recv_format": "⬇ {value:>8}",
-				"sent_format": "⬆ {value:>8}"
-			}
-		},
-		"powerline.segments.common.net.hostname": {
-			"before": " "
-		},
-		"powerline.segments.common.bat.battery": {
-			"args": {
-				"full_heart": "♥",
-				"empty_heart": "♥",
-				"online": "⚡︎",
-				"offline": " "
-			}
-		},
-		"powerline.segments.common.sys.uptime": {
-			"before": "⇑  "
-		},
-		"powerline.segments.common.mail.email_imap_alert": {
-			"before": "✉ "
-		},
-		"powerline.segments.common.env.virtualenv": {
-			"before": "ⓔ  "
-		},
-		"powerline.segments.common.wthr.weather": {
-			"args": {
-				"icons": {
-					"day":           "〇",
-					"blustery":      "⚑",
-					"rainy":         "☔",
-					"cloudy":        "☁",
-					"snowy":         "❅",
-					"stormy":        "☈",
-					"foggy":         "≡",
-					"sunny":         "☼",
-					"night":         "☾",
-					"windy":         "☴",
-					"not_available": "�",
-					"unknown":       "⚠"
-				}
-			}
-		},
-		"powerline.segments.common.time.fuzzy_time": {
-			"args": {
-				"unicode_text": true
-			}
-		},
-
-		"powerline.segments.vim.mode": {
-			"args": {
-				"override": {
-					"n":  "NORMAL",
-					"no": "N·OPER",
-					"v":  "VISUAL",
-					"V":  "V·LINE",
-					"^V": "V·BLCK",
-					"s":  "SELECT",
-					"S":  "S·LINE",
-					"^S": "S·BLCK",
-					"i":  "INSERT",
-					"ic": "I·COMP",
-					"ix": "I·C-X ",
-					"R":  "RPLACE",
-					"Rv": "V·RPLC",
-					"Rc": "R·COMP",
-					"Rx": "R·C-X ",
-					"c":  "COMMND",
-					"cv": "VIM·EX",
-					"ce": "NRM·EX",
-					"r":  "PROMPT",
-					"rm": "-MORE-",
-					"r?": "CNFIRM",
-					"!":  "!SHELL",
-					"t":  "TERM  "
-				}
-			}
-		},
-		"powerline.segments.vim.visual_range": {
-			"args": {
-				"CTRL_V_text": "↕{rows} ↔{vcols}",
-				"v_text_oneline": "↔{vcols}",
-				"v_text_multiline": "↕{rows}",
-				"V_text": "⇕{rows}"
-			}
-		},
-		"powerline.segments.vim.readonly_indicator": {
-			"args": {
-				"text": ""
-			}
-		},
-		"powerline.segments.vim.modified_indicator": {
-			"args": {
-				"text": "+"
-			}
-		},
-
-		"powerline.segments.i3wm.scratchpad": {
-			"args": {
-				"icons": {
-					"fresh": "●",
-					"changed": "○"
-				}
-			}
-		}
-	}
-}
diff --git a/powerline/themes/powerline_terminus.json b/powerline/themes/powerline_terminus.json
deleted file mode 100644
index e5fb1c8..0000000
--- a/powerline/themes/powerline_terminus.json
+++ /dev/null
@@ -1,151 +0,0 @@
-{
-	"dividers": {
-		"left": {
-			"hard": " ",
-			"soft": " "
-		},
-		"right": {
-			"hard": " ",
-			"soft": " "
-		}
-	},
-	"spaces": 1,
-	"segment_data": {
-		"branch": {
-			"before": " "
-		},
-		"stash": {
-			"before": "ST "
-		},
-		"cwd": {
-			"args": {
-				"ellipsis": "…"
-			}
-		},
-
-		"line_current_symbol": {
-			"contents": " "
-		},
-		"player": {
-			"args": {
-				"state_symbols": {
-					"fallback": "♫",
-					"play":     "▶",
-					"pause":    "▮▮",
-					"stop":     "■"
-				}
-			}
-		},
-
-		"time": {
-			"before": ""
-		},
-
-		"powerline.segments.common.net.network_load": {
-			"args": {
-				"recv_format": "⇓ {value:>8}",
-				"sent_format": "⇑ {value:>8}"
-			}
-		},
-		"powerline.segments.common.net.hostname": {
-			"before": " "
-		},
-		"powerline.segments.common.bat.battery": {
-			"args": {
-				"full_heart": "♥",
-				"empty_heart": "♥",
-				"online": "⚡︎",
-				"offline": " "
-			}
-		},
-		"powerline.segments.common.sys.uptime": {
-			"before": "↑  "
-		},
-		"powerline.segments.common.mail.email_imap_alert": {
-			"before": "MAIL "
-		},
-		"powerline.segments.common.env.virtualenv": {
-			"before": "(e) "
-		},
-		"powerline.segments.common.wthr.weather": {
-			"args": {
-				"icons": {
-					"day":           "DAY",
-					"blustery":      "WIND",
-					"rainy":         "RAIN",
-					"cloudy":        "CLOUDS",
-					"snowy":         "SNOW",
-					"stormy":        "STORM",
-					"foggy":         "FOG",
-					"sunny":         "SUN",
-					"night":         "NIGHT",
-					"windy":         "WINDY",
-					"not_available": "NA",
-					"unknown":       "UKN"
-				}
-			}
-		},
-		"powerline.segments.common.time.fuzzy_time": {
-			"args": {
-				"unicode_text": true
-			}
-		},
-
-		"powerline.segments.vim.mode": {
-			"args": {
-				"override": {
-					"n":  "NORMAL",
-					"no": "N·OPER",
-					"v":  "VISUAL",
-					"V":  "V·LINE",
-					"^V": "V·BLCK",
-					"s":  "SELECT",
-					"S":  "S·LINE",
-					"^S": "S·BLCK",
-					"i":  "INSERT",
-					"ic": "I·COMP",
-					"ix": "I·C-X ",
-					"R":  "RPLACE",
-					"Rv": "V·RPLC",
-					"Rc": "R·COMP",
-					"Rx": "R·C-X ",
-					"c":  "COMMND",
-					"cv": "VIM·EX",
-					"ce": "NRM·EX",
-					"r":  "PROMPT",
-					"rm": "-MORE-",
-					"r?": "CNFIRM",
-					"!":  "!SHELL",
-					"t":  "TERM  "
-				}
-			}
-		},
-		"powerline.segments.vim.visual_range": {
-			"args": {
-				"CTRL_V_text": "↕{rows} ↔{vcols}",
-				"v_text_oneline": "↔{vcols}",
-				"v_text_multiline": "↕{rows}",
-				"V_text": "⇕{rows}"
-			}
-		},
-		"powerline.segments.vim.readonly_indicator": {
-			"args": {
-				"text": ""
-			}
-		},
-		"powerline.segments.vim.modified_indicator": {
-			"args": {
-				"text": "+"
-			}
-		},
-
-		"powerline.segments.i3wm.scratchpad": {
-			"args": {
-				"icons": {
-					"fresh": "●",
-					"changed": "○"
-				}
-			}
-		}
-	}
-}
diff --git a/powerline/themes/powerline_unicode7.json b/powerline/themes/powerline_unicode7.json
deleted file mode 100644
index bd62826..0000000
--- a/powerline/themes/powerline_unicode7.json
+++ /dev/null
@@ -1,165 +0,0 @@
-{
-	"dividers": {
-		"left": {
-			"hard": " ",
-			"soft": " "
-		},
-		"right": {
-			"hard": " ",
-			"soft": " "
-		}
-	},
-	"spaces": 1,
-	"segment_data": {
-		"branch": {
-			"before": "🔀 "
-		},
-		"stash": {
-			"before": "📝"
-		},
-		"cwd": {
-			"args": {
-				"ellipsis": "⋯"
-			}
-		},
-
-		"line_current_symbol": {
-			"contents": " "
-		},
-		"player": {
-			"args": {
-				"state_symbols": {
-					"fallback": "♫",
-					"play":     "⏵",
-					"pause":    "⏸",
-					"stop":     "⏹"
-				}
-			}
-		},
-
-		"time": {
-			"before": "🕐 "
-		},
-
-		"powerline.segments.common.net.network_load": {
-			"args": {
-				"recv_format": "⬇ {value:>8}",
-				"sent_format": "⬆ {value:>8}"
-			}
-		},
-		"powerline.segments.common.net.hostname": {
-			"before": "🏠 "
-		},
-		"powerline.segments.common.bat.battery": {
-			"args": {
-				"full_heart": "💙",
-				"empty_heart": "💛",
-				"online": "⚡️",
-				"offline": " "
-			}
-		},
-		"powerline.segments.common.sys.uptime": {
-			"before": "⇑ "
-		},
-		"powerline.segments.common.mail.email_imap_alert": {
-			"before": "✉ "
-		},
-		"powerline.segments.common.env.virtualenv": {
-			"before": "🐍 "
-		},
-		"powerline.segments.common.wthr.weather": {
-			"args": {
-				"icons": {
-					"tornado":                 "🌪",
-					"hurricane":               "🌀",
-					"showers":                 "☔",
-					"scattered_showers":       "☔",
-					"thunderstorms":           "🌩",
-					"isolated_thunderstorms":  "🌩",
-					"scattered_thunderstorms": "🌩",
-					"dust":                    "🌫",
-					"fog":                     "🌫",
-					"cold":                    "❄",
-					"partly_cloudy_day":       "🌤",
-					"mostly_cloudy_day":       "🌥",
-					"sun":                     "🌣",
-					"hot":                     "♨",
-					"day":                     "☀",
-					"blustery":                "⚑",
-					"rainy":                   "☂",
-					"cloudy":                  "☁",
-					"snowy":                   "☃",
-					"stormy":                  "☈",
-					"foggy":                   "🌁",
-					"sunny":                   "🌣",
-					"night":                   "☾",
-					"windy":                   "☴",
-					"not_available":           "�",
-					"unknown":                 "⚠"
-				}
-			}
-		},
-		"powerline.segments.common.time.fuzzy_time": {
-			"args": {
-				"unicode_text": true
-			}
-		},
-
-		"powerline.segments.vim.mode": {
-			"args": {
-				"override": {
-					"n":  "NORMAL",
-					"no": "N·OPER",
-					"v":  "VISUAL",
-					"V":  "V·LINE",
-					"^V": "V·BLCK",
-					"s":  "SELECT",
-					"S":  "S·LINE",
-					"^S": "S·BLCK",
-					"i":  "INSERT",
-					"ic": "I·COMP",
-					"ix": "I·C-X ",
-					"R":  "RPLACE",
-					"Rv": "V·RPLC",
-					"Rc": "R·COMP",
-					"Rx": "R·C-X ",
-					"c":  "COMMND",
-					"cv": "VIM·EX",
-					"ce": "NRM·EX",
-					"r":  "PROMPT",
-					"rm": "-MORE-",
-					"r?": "CNFIRM",
-					"!":  "!SHELL",
-					"t":  "TERM  "
-				}
-			}
-		},
-		"powerline.segments.vim.visual_range": {
-			"args": {
-				"CTRL_V_text": "↕{rows} ↔{vcols}",
-				"v_text_oneline": "↔{vcols}",
-				"v_text_multiline": "↕{rows}",
-				"V_text": "⇕{rows}"
-			}
-		},
-		"powerline.segments.vim.readonly_indicator": {
-			"args": {
-				"text": "🔏"
-			}
-		},
-		"powerline.segments.vim.modified_indicator": {
-			"args": {
-				"text": "🖫⃥"
-			}
-		},
-
-		"powerline.segments.i3wm.scratchpad": {
-			"args": {
-				"icons": {
-					"fresh": "●",
-					"changed": "○"
-				}
-			}
-		}
-	}
-}
diff --git a/powerline/themes/shell/__main__.json b/powerline/themes/shell/__main__.json
deleted file mode 100644
index 13ae942..0000000
--- a/powerline/themes/shell/__main__.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"segment_data": {
-		"hostname": {
-			"args": {
-				"only_if_ssh": true
-			}
-		},
-		"cwd": {
-			"args": {
-				"dir_limit_depth": 3
-			}
-		}
-	}
-}
diff --git a/powerline/themes/shell/continuation.json b/powerline/themes/shell/continuation.json
deleted file mode 100644
index 9307fc0..0000000
--- a/powerline/themes/shell/continuation.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"default_module": "powerline.segments.shell",
-	"segments": {
-		"left": [
-			{
-				"function": "continuation"
-			}
-		],
-		"right": [
-		]
-	}
-}
diff --git a/powerline/themes/shell/default.json b/powerline/themes/shell/default.json
deleted file mode 100644
index 42e6c3b..0000000
--- a/powerline/themes/shell/default.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-	"segments": {
-		"left": [
-			{
-				"function": "powerline.segments.common.env.user"
-			},
-			{
-				"function": "powerline.segments.common.env.virtualenv"
-			},
-			{
-				"function": "powerline.segments.shell.cwd",
-				"args" : {
-					"dir_shorten_len" : 1
-				}
-			},
-			{
-				"function": "powerline.segments.shell.jobnum"
-			},
-			{
-				"function" : "powerline.segments.shell.last_status"
-			},
-			{
-				"function" : "powerline.segments.common.vcs.branch"
-			}
-		],
-		"right": [
-			{
-				"function": "powerline.segments.shell.last_pipe_status",
-				"priority": 10
-			},
-			{
-				"function": "powerline.segments.common.vcs.stash",
-				"priority": 50
-			},
-			{
-				"function": "powerline.segments.common.vcs.branch",
-				"priority": 40
-			}
-		]
-	}
-}
diff --git a/powerline/themes/shell/default_leftonly.json b/powerline/themes/shell/default_leftonly.json
deleted file mode 100644
index b576273..0000000
--- a/powerline/themes/shell/default_leftonly.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-	"segments": {
-		"left": [
-			{
-				"function": "powerline.segments.common.net.hostname",
-				"priority": 10
-			},
-			{
-				"function": "powerline.segments.common.env.user",
-				"priority": 30
-			},
-			{
-				"function": "powerline.segments.common.env.virtualenv",
-				"priority": 50
-			},
-			{
-				"function": "powerline.segments.common.vcs.branch",
-				"priority": 40
-			},
-			{
-				"function": "powerline.segments.shell.cwd",
-				"priority": 10
-			},
-			{
-				"function": "powerline.segments.shell.jobnum",
-				"priority": 20
-			},
-			{
-				"function": "powerline.segments.shell.last_pipe_status",
-				"priority": 10
-			}
-		]
-	}
-}
diff --git a/powerline/themes/shell/select.json b/powerline/themes/shell/select.json
deleted file mode 100644
index 3d81408..0000000
--- a/powerline/themes/shell/select.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"segments": {
-		"left": [
-			{
-				"type": "string",
-				"contents": "Select variant",
-				"width": "auto",
-				"align": "r",
-				"highlight_groups": ["continuation:current"]
-			}
-		]
-	}
-}
diff --git a/powerline/themes/tmux/default.json b/powerline/themes/tmux/default.json
deleted file mode 100644
index 4532ced..0000000
--- a/powerline/themes/tmux/default.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	"segments": {
-		"right": [
-			{
-				"function": "powerline.segments.common.sys.uptime",
-				"priority": 50
-			},
-			{
-				"function": "powerline.segments.common.sys.system_load",
-				"priority": 50
-			},
-			{
-				"function": "powerline.segments.common.time.date"
-			},
-			{
-				"function": "powerline.segments.common.time.date",
-				"name": "time",
-				"args": {
-					"format": "%H:%M",
-					"istime": true
-				}
-			},
-			{
-				"function": "powerline.segments.common.net.hostname"
-			}
-		]
-	}
-}
diff --git a/powerline/themes/unicode.json b/powerline/themes/unicode.json
deleted file mode 100644
index 0802852..0000000
--- a/powerline/themes/unicode.json
+++ /dev/null
@@ -1,151 +0,0 @@
-{
-	"dividers": {
-		"left": {
-			"hard": "▌ ",
-			"soft": "│ "
-		},
-		"right": {
-			"hard": " ▐",
-			"soft": " │"
-		}
-	},
-	"spaces": 1,
-	"segment_data": {
-		"branch": {
-			"before": "⎇ "
-		},
-		"stash": {
-			"before": "⌆"
-		},
-		"cwd": {
-			"args": {
-				"ellipsis": "⋯"
-			}
-		},
-		"player": {
-			"args": {
-				"state_symbols": {
-					"fallback": "♫",
-					"play":     "▶",
-					"pause":    "▮▮",
-					"stop":     "■"
-				}
-			}
-		},
-
-		"line_current_symbol": {
-			"contents": "␤ "
-		},
-
-		"time": {
-			"before": "⌚ "
-		},
-
-		"powerline.segments.common.net.network_load": {
-			"args": {
-				"recv_format": "⬇ {value:>8}",
-				"sent_format": "⬆ {value:>8}"
-			}
-		},
-		"powerline.segments.common.net.hostname": {
-			"before": "⌂ "
-		},
-		"powerline.segments.common.bat.battery": {
-			"args": {
-				"full_heart": "♥",
-				"empty_heart": "♥",
-				"online": "⚡︎",
-				"offline": " "
-			}
-		},
-		"powerline.segments.common.sys.uptime": {
-			"before": "⇑  "
-		},
-		"powerline.segments.common.mail.email_imap_alert": {
-			"before": "✉ "
-		},
-		"powerline.segments.common.env.virtualenv": {
-			"before": "ⓔ  "
-		},
-		"powerline.segments.common.wthr.weather": {
-			"args": {
-				"icons": {
-					"day":           "〇",
-					"blustery":      "⚑",
-					"rainy":         "☔",
-					"cloudy":        "☁",
-					"snowy":         "❅",
-					"stormy":        "☈",
-					"foggy":         "≡",
-					"sunny":         "☼",
-					"night":         "☾",
-					"windy":         "☴",
-					"not_available": "�",
-					"unknown":       "⚠"
-				}
-			}
-		},
-		"powerline.segments.common.time.fuzzy_time": {
-			"args": {
-				"unicode_text": true
-			}
-		},
-
-		"powerline.segments.vim.mode": {
-			"args": {
-				"override": {
-					"n":  "NORMAL",
-					"no": "N·OPER",
-					"v":  "VISUAL",
-					"V":  "V·LINE",
-					"^V": "V·BLCK",
-					"s":  "SELECT",
-					"S":  "S·LINE",
-					"^S": "S·BLCK",
-					"i":  "INSERT",
-					"ic": "I·COMP",
-					"ix": "I·C-X ",
-					"R":  "RPLACE",
-					"Rv": "V·RPLC",
-					"Rc": "R·COMP",
-					"Rx": "R·C-X ",
-					"c":  "COMMND",
-					"cv": "VIM·EX",
-					"ce": "NRM·EX",
-					"r":  "PROMPT",
-					"rm": "-MORE-",
-					"r?": "CNFIRM",
-					"!":  "!SHELL",
-					"t":  "TERM  "
-				}
-			}
-		},
-		"powerline.segments.vim.visual_range": {
-			"args": {
-				"CTRL_V_text": "↕{rows} ↔{vcols}",
-				"v_text_oneline": "↔{vcols}",
-				"v_text_multiline": "↕{rows}",
-				"V_text": "⇕{rows}"
-			}
-		},
-		"powerline.segments.vim.readonly_indicator": {
-			"args": {
-				"text": "⊗"
-			}
-		},
-		"powerline.segments.vim.modified_indicator": {
-			"args": {
-				"text": "+"
-			}
-		},
-
-		"powerline.segments.i3wm.scratchpad": {
-			"args": {
-				"icons": {
-					"fresh": "●",
-					"changed": "○"
-				}
-			}
-		}
-	}
-}
diff --git a/powerline/themes/unicode_terminus.json b/powerline/themes/unicode_terminus.json
deleted file mode 100644
index 9c76985..0000000
--- a/powerline/themes/unicode_terminus.json
+++ /dev/null
@@ -1,151 +0,0 @@
-{
-	"dividers": {
-		"left": {
-			"hard": "▌ ",
-			"soft": "│ "
-		},
-		"right": {
-			"hard": " ▐",
-			"soft": " │"
-		}
-	},
-	"spaces": 1,
-	"segment_data": {
-		"branch": {
-			"before": "BR "
-		},
-		"stash": {
-			"before": "ST "
-		},
-		"cwd": {
-			"args": {
-				"ellipsis": "…"
-			}
-		},
-
-		"line_current_symbol": {
-			"contents": "␤ "
-		},
-		"player": {
-			"args": {
-				"state_symbols": {
-					"fallback": "♫",
-					"play":     "▶",
-					"pause":    "▮▮",
-					"stop":     "■"
-				}
-			}
-		},
-
-		"time": {
-			"before": ""
-		},
-
-		"powerline.segments.common.net.network_load": {
-			"args": {
-				"recv_format": "⇓ {value:>8}",
-				"sent_format": "⇑ {value:>8}"
-			}
-		},
-		"powerline.segments.common.net.hostname": {
-			"before": "⌂ "
-		},
-		"powerline.segments.common.bat.battery": {
-			"args": {
-				"full_heart": "♥",
-				"empty_heart": "♥",
-				"online": "⚡︎",
-				"offline": " "
-			}
-		},
-		"powerline.segments.common.sys.uptime": {
-			"before": "↑  "
-		},
-		"powerline.segments.common.mail.email_imap_alert": {
-			"before": "MAIL "
-		},
-		"powerline.segments.common.env.virtualenv": {
-			"before": "(e) "
-		},
-		"powerline.segments.common.wthr.weather": {
-			"args": {
-				"icons": {
-					"day":           "DAY",
-					"blustery":      "WIND",
-					"rainy":         "RAIN",
-					"cloudy":        "CLOUDS",
-					"snowy":         "SNOW",
-					"stormy":        "STORM",
-					"foggy":         "FOG",
-					"sunny":         "SUN",
-					"night":         "NIGHT",
-					"windy":         "WINDY",
-					"not_available": "NA",
-					"unknown":       "UKN"
-				}
-			}
-		},
-		"powerline.segments.common.time.fuzzy_time": {
-			"args": {
-				"unicode_text": true
-			}
-		},
-
-		"powerline.segments.vim.mode": {
-			"args": {
-				"override": {
-					"n":  "NORMAL",
-					"no": "N·OPER",
-					"v":  "VISUAL",
-					"V":  "V·LINE",
-					"^V": "V·BLCK",
-					"s":  "SELECT",
-					"S":  "S·LINE",
-					"^S": "S·BLCK",
-					"i":  "INSERT",
-					"ic": "I·COMP",
-					"ix": "I·C-X ",
-					"R":  "RPLACE",
-					"Rv": "V·RPLC",
-					"Rc": "R·COMP",
-					"Rx": "R·C-X ",
-					"c":  "COMMND",
-					"cv": "VIM·EX",
-					"ce": "NRM·EX",
-					"r":  "PROMPT",
-					"rm": "-MORE-",
-					"r?": "CNFIRM",
-					"!":  "!SHELL",
-					"t":  "TERM  "
-				}
-			}
-		},
-		"powerline.segments.vim.visual_range": {
-			"args": {
-				"CTRL_V_text": "{rows} × {vcols}",
-				"v_text_oneline": "C:{vcols}",
-				"v_text_multiline": "L:{rows}",
-				"V_text": "L:{rows}"
-			}
-		},
-		"powerline.segments.vim.readonly_indicator": {
-			"args": {
-				"text": "RO"
-			}
-		},
-		"powerline.segments.vim.modified_indicator": {
-			"args": {
-				"text": "+"
-			}
-		},
-
-		"powerline.segments.i3wm.scratchpad": {
-			"args": {
-				"icons": {
-					"fresh": "●",
-					"changed": "○"
-				}
-			}
-		}
-	}
-}
diff --git a/powerline/themes/unicode_terminus_condensed.json b/powerline/themes/unicode_terminus_condensed.json
deleted file mode 100644
index 421f5c8..0000000
--- a/powerline/themes/unicode_terminus_condensed.json
+++ /dev/null
@@ -1,151 +0,0 @@
-{
-	"dividers": {
-		"left": {
-			"hard": "▌",
-			"soft": "│"
-		},
-		"right": {
-			"hard": "▐",
-			"soft": "│"
-		}
-	},
-	"spaces": 0,
-	"segment_data": {
-		"branch": {
-			"before": "B "
-		},
-		"stash": {
-			"before": "S "
-		},
-		"cwd": {
-			"args": {
-				"use_path_separator": true,
-				"ellipsis": "…"
-			}
-		},
-
-		"line_current_symbol": {
-			"contents": "␤"
-		},
-		"player": {
-			"args": {
-				"state_symbols": {
-					"fallback": "♫",
-					"play":     "▶",
-					"pause":    "▮▮",
-					"stop":     "■"
-				}
-			}
-		},
-
-		"time": {
-			"before": ""
-		},
-
-		"powerline.segments.common.net.network_load": {
-			"args": {
-				"recv_format": "⇓{value:>8}",
-				"sent_format": "⇑{value:>8}"
-			}
-		},
-		"powerline.segments.common.net.hostname": {
-			"before": "⌂"
-		},
-		"powerline.segments.common.bat.battery": {
-			"args": {
-				"full_heart": "♥",
-				"empty_heart": "♥",
-				"online": "⚡︎",
-				"offline": " "
-			}
-		},
-		"powerline.segments.common.sys.uptime": {
-			"before": "↑"
-		},
-		"powerline.segments.common.mail.email_imap_alert": {
-			"before": "M "
-		},
-		"powerline.segments.common.env.virtualenv": {
-			"before": "E "
-		},
-		"powerline.segments.common.wthr.weather": {
-			"args": {
-				"icons": {
-					"day":           "D",
-					"blustery":      "W",
-					"rainy":         "R",
-					"cloudy":        "c",
-					"snowy":         "*",
-					"stormy":        "S",
-					"foggy":         "f",
-					"sunny":         "s",
-					"night":         "N",
-					"windy":         "w",
-					"not_available": "-",
-					"unknown":       "!"
-				}
-			}
-		},
-		"powerline.segments.common.time.fuzzy_time": {
-			"args": {
-				"unicode_text": true
-			}
-		},
-
-		"powerline.segments.vim.mode": {
-			"args": {
-				"override": {
-					"n":  "NML",
-					"no": "NOP",
-					"v":  "VIS",
-					"V":  "VLN",
-					"^V": "VBL",
-					"s":  "SEL",
-					"S":  "SLN",
-					"^S": "SBL",
-					"i":  "INS",
-					"ic": "I-C",
-					"ix": "I^X",
-					"R":  "REP",
-					"Rv": "VRP",
-					"Rc": "R-C",
-					"Rx": "R^X",
-					"c":  "CMD",
-					"cv": "VEX",
-					"ce": " EX",
-					"r":  "PRT",
-					"rm": "MOR",
-					"r?": "CON",
-					"!":  " SH"
-				}
-			}
-		},
-		"powerline.segments.vim.visual_range": {
-			"args": {
-				"CTRL_V_text": "{rows}×{vcols}",
-				"v_text_oneline": "↔{vcols}",
-				"v_text_multiline": "↕{rows}",
-				"V_text": "⇕{rows}"
-			}
-		},
-		"powerline.segments.vim.readonly_indicator": {
-			"args": {
-				"text": "RO"
-			}
-		},
-		"powerline.segments.vim.modified_indicator": {
-			"args": {
-				"text": "+"
-			}
-		},
-
-		"powerline.segments.i3wm.scratchpad": {
-			"args": {
-				"icons": {
-					"fresh": "●",
-					"changed": "○"
-				}
-			}
-		}
-	}
-}
diff --git a/powerline/themes/vim/__main__.json b/powerline/themes/vim/__main__.json
deleted file mode 100644
index 7cd3305..0000000
--- a/powerline/themes/vim/__main__.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"segment_data": {
-		"line_percent": {
-			"args": {
-				"gradient": true
-			},
-			"after": "%"
-		}
-	}
-}
diff --git a/powerline/themes/vim/cmdwin.json b/powerline/themes/vim/cmdwin.json
deleted file mode 100644
index e6a05b0..0000000
--- a/powerline/themes/vim/cmdwin.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"segments": {
-		"left": [
-			{
-				"type": "string",
-				"contents": "Command Line",
-				"highlight_groups": ["file_name"]
-			},
-			{
-				"type": "string",
-				"highlight_groups": ["background"],
-				"draw_soft_divider": false,
-				"draw_hard_divider": false,
-				"width": "auto"
-			}
-		]
-	}
-}
diff --git a/powerline/themes/vim/default.json b/powerline/themes/vim/default.json
deleted file mode 100644
index 9b0c744..0000000
--- a/powerline/themes/vim/default.json
+++ /dev/null
@@ -1,128 +0,0 @@
-{
-	"segments": {
-		"left": [
-			{
-				"function": "mode",
-				"exclude_modes": ["nc"]
-			},
-			{
-				"function": "visual_range",
-				"include_modes": ["v", "V", "^V", "s", "S", "^S"],
-				"priority": 10
-			},
-			{
-				"function": "paste_indicator",
-				"exclude_modes": ["nc"],
-				"priority": 10
-			},
-			{
-				"function": "powerline.segments.vim.plugin.capslock.capslock_indicator",
-				"include_modes": ["i", "R", "Rv"],
-				"priority": 10
-			},
-			{
-				"function": "branch",
-				"exclude_modes": ["nc"],
-				"priority": 30
-			},
-			{
-				"function": "readonly_indicator",
-				"draw_soft_divider": false,
-				"after": " "
-			},
-			{
-				"function": "file_scheme",
-				"priority": 20
-			},
-			{
-				"function": "file_directory",
-				"priority": 40,
-				"draw_soft_divider": false
-			},
-			{
-				"function": "file_name",
-				"draw_soft_divider": false
-			},
-			{
-				"function": "file_vcs_status",
-				"before": " ",
-				"draw_soft_divider": false
-			},
-			{
-				"function": "modified_indicator",
-				"before": " "
-			},
-			{
-				"exclude_modes": ["i", "R", "Rv"],
-				"function": "trailing_whitespace",
-				"display": false,
-				"priority": 60
-			},
-			{
-				"exclude_modes": ["nc"],
-				"function": "powerline.segments.vim.plugin.syntastic.syntastic",
-				"priority": 50
-			},
-			{
-				"exclude_modes": ["nc"],
-				"function": "powerline.segments.vim.plugin.tagbar.current_tag",
-				"draw_soft_divider": false,
-				"priority": 50
-			},
-			{
-				"type": "string",
-				"highlight_groups": ["background"],
-				"draw_soft_divider": false,
-				"draw_hard_divider": false,
-				"width": "auto"
-			}
-		],
-		"right": [
-			{
-				"function": "file_format",
-				"draw_soft_divider": false,
-				"exclude_modes": ["nc"],
-				"priority": 60
-			},
-			{
-				"function": "file_encoding",
-				"exclude_modes": ["nc"],
-				"priority": 60
-			},
-			{
-				"function": "file_type",
-				"exclude_modes": ["nc"],
-				"priority": 60
-			},
-			{
-				"function": "line_percent",
-				"priority": 50,
-				"width": 4,
-				"align": "r"
-			},
-			{
-				"function": "csv_col_current",
-				"priority": 30
-			},
-			{
-				"type": "string",
-				"name": "line_current_symbol",
-				"highlight_groups": ["line_current_symbol", "line_current"]
-			},
-			{
-				"function": "line_current",
-				"draw_soft_divider": false,
-				"width": 3,
-				"align": "r"
-			},
-			{
-				"function": "virtcol_current",
-				"draw_soft_divider": false,
-				"priority": 20,
-				"before": ":",
-				"width": 3,
-				"align": "l"
-			}
-		]
-	}
-}
diff --git a/powerline/themes/vim/help.json b/powerline/themes/vim/help.json
deleted file mode 100644
index 45c9458..0000000
--- a/powerline/themes/vim/help.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-	"segments": {
-		"left": [
-			{
-				"function": "file_name",
-				"draw_soft_divider": false
-			},
-			{
-				"type": "string",
-				"highlight_groups": ["background"],
-				"draw_soft_divider": false,
-				"draw_hard_divider": false,
-				"width": "auto"
-			}
-		],
-		"right": [
-			{
-				"function": "line_percent",
-				"priority": 30,
-				"width": 4,
-				"align": "r"
-			},
-			{
-				"type": "string",
-				"name": "line_current_symbol",
-				"highlight_groups": ["line_current_symbol", "line_current"]
-			},
-			{
-				"function": "line_current",
-				"draw_soft_divider": false,
-				"width": 3,
-				"align": "r"
-			}
-		]
-	}
-}
diff --git a/powerline/themes/vim/plugin_commandt.json b/powerline/themes/vim/plugin_commandt.json
deleted file mode 100644
index dd6748f..0000000
--- a/powerline/themes/vim/plugin_commandt.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-	"segments": {
-		"left": [
-			{
-				"type": "string",
-				"contents": "Command-T",
-				"highlight_groups": ["commandt:label"]
-			},
-			{
-				"function": "powerline.segments.vim.plugin.commandt.finder"
-			},
-			{
-				"function": "powerline.segments.vim.plugin.commandt.path"
-			},
-			{
-				"type": "string",
-				"highlight_groups": ["commandt:background"],
-				"draw_soft_divider": false,
-				"draw_hard_divider": false,
-				"width": "auto"
-			}
-		],
-		"right": [
-		]
-	}
-}
diff --git a/powerline/themes/vim/plugin_gundo-preview.json b/powerline/themes/vim/plugin_gundo-preview.json
deleted file mode 100644
index ad8432c..0000000
--- a/powerline/themes/vim/plugin_gundo-preview.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"segments": {
-		"left": [
-			{
-				"type": "string",
-				"highlight_groups": ["gundo:name", "file_name"],
-				"contents": "Undo diff"
-			},
-			{
-				"type": "string",
-				"highlight_groups": ["gundo:background", "background"],
-				"draw_soft_divider": false,
-				"draw_hard_divider": false,
-				"width": "auto"
-			}
-		]
-	}
-}
diff --git a/powerline/themes/vim/plugin_gundo.json b/powerline/themes/vim/plugin_gundo.json
deleted file mode 100644
index a03b256..0000000
--- a/powerline/themes/vim/plugin_gundo.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"segments": {
-		"left": [
-			{
-				"type": "string",
-				"highlight_groups": ["gundo:name", "file_name"],
-				"contents": "Undo tree"
-			},
-			{
-				"type": "string",
-				"highlight_groups": ["gundo:background", "background"],
-				"draw_soft_divider": false,
-				"draw_hard_divider": false,
-				"width": "auto"
-			}
-		]
-	}
-}
diff --git a/powerline/themes/vim/plugin_nerdtree.json b/powerline/themes/vim/plugin_nerdtree.json
deleted file mode 100644
index 896d393..0000000
--- a/powerline/themes/vim/plugin_nerdtree.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"default_module": "powerline.segments.vim.plugin.nerdtree",
-	"segments": {
-		"left": [
-			{
-				"function": "nerdtree"
-			},
-			{
-				"type": "string",
-				"highlight_groups": ["background"],
-				"draw_soft_divider": false,
-				"draw_hard_divider": false,
-				"width": "auto"
-			}
-		]
-	}
-}
diff --git a/powerline/themes/vim/quickfix.json b/powerline/themes/vim/quickfix.json
deleted file mode 100644
index ae4d5a5..0000000
--- a/powerline/themes/vim/quickfix.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"segment_data": {
-		"buffer_name": {
-			"contents": "Location List"
-		}
-	},
-	"segments": {
-		"left": [
-			{
-				"type": "string",
-				"name": "buffer_name",
-				"highlight_groups": ["file_name"]
-			},
-			{
-				"function": "window_title",
-				"draw_soft_divider": false
-			},
-			{
-				"type": "string",
-				"highlight_groups": ["background"],
-				"draw_soft_divider": false,
-				"draw_hard_divider": false,
-				"width": "auto"
-			}
-		],
-		"right": [
-			{
-				"type": "string",
-				"name": "line_current_symbol",
-				"highlight_groups": ["line_current_symbol", "line_current"]
-			},
-			{
-				"function": "line_current",
-				"draw_soft_divider": false,
-				"width": 3,
-				"align": "r"
-			}
-		]
-	}
-}
diff --git a/powerline/themes/vim/tabline.json b/powerline/themes/vim/tabline.json
deleted file mode 100644
index 1e3130e..0000000
--- a/powerline/themes/vim/tabline.json
+++ /dev/null
@@ -1,93 +0,0 @@
-{
-	"default_module": "powerline.segments.vim",
-	"segments": {
-		"left": [
-			{
-				"type": "segment_list",
-				"function": "powerline.listers.vim.tablister",
-				"exclude_function": "single_tab",
-				"segments": [
-					{
-						"function": "tab"
-					},
-					{
-						"function": "tabnr",
-						"after": " ",
-						"priority": 5
-					},
-					{
-						"function": "file_directory",
-						"priority": 40
-					},
-					{
-						"function": "file_name",
-						"args": {
-							"display_no_file": true
-						},
-						"priority": 10
-					},
-					{
-						"function": "tab_modified_indicator",
-						"priority": 5
-					}
-				]
-			},
-			{
-				"function": "tab",
-				"args": {
-					"end": true
-				}
-			},
-			{
-				"type": "segment_list",
-				"function": "powerline.listers.vim.bufferlister",
-				"include_function": "single_tab",
-				"segments": [
-					{
-						"function": "bufnr",
-						"after": " ",
-						"priority": 5
-					},
-					{
-						"function": "file_directory",
-						"priority": 40
-					},
-					{
-						"function": "file_name",
-						"args": {
-							"display_no_file": true
-						},
-						"priority": 10
-					},
-					{
-						"function": "modified_indicator",
-						"priority": 5
-					}
-				]
-			},
-			{
-				"type": "string",
-				"highlight_groups": ["tab:background"],
-				"draw_soft_divider": false,
-				"draw_hard_divider": false,
-				"width": "auto"
-			}
-		],
-		"right": [
-			{
-				"type": "string",
-				"contents": "Bufs",
-				"name": "single_tab",
-				"highlight_groups": ["single_tab"],
-				"include_function": "single_tab"
-			},
-			{
-				"type": "string",
-				"contents": "Tabs",
-				"name": "many_tabs",
-				"highlight_groups": ["many_tabs"],
-				"exclude_function": "single_tab"
-			}
-		]
-	}
-}
diff --git a/powerline/themes/wm/default.json b/powerline/themes/wm/default.json
deleted file mode 100644
index 385658b..0000000
--- a/powerline/themes/wm/default.json
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-	"segments": {
-		"right": [
-			{
-				"function" : "powerline.segments.common.players.spotify",
-				"name" : "player",
-				"args" : {
-					"format" : "{state_symbol} {artist} - {title} ({total})"
-				}
-			},
-			{
-				"function" : "powerline.segments.common.net.network_load"
-			},
-			{
-				"function" : "powerline.segments.common.sys.system_load",
-				"name" : "load",
-				"args" : {
-					"short" : true
-				}
-			},
-			{
-				"function": "powerline.segments.common.time.date",
-				"name": "time",
-				"args": {
-					"format": "%H:%M:%S",
-					"istime": true
-				}
-			},
-			{
-				"function": "powerline.segments.common.time.date",
-				"args" : {
-					"format" : "%d.%m.%Y"
-				}
-			},
-			{
-				"function" : "powerline.segments.common.bat.battery",
-				"args" : {
-					"gamify" : true
-				}
-			}
-		],
-		"left" : [
-			{
-				"function" : "powerline.segments.i3wm.workspaces",
-				"args" : {
-					"only_show" : "visible"
-				}
-			},
-			{
-				"function" : "powerline.segments.i3wm.mod"
-			},
-			{
-				"function" : "powerline.segments.i3wm.scratchpad"
-			}
-		]	
-	}
-}
diff --git a/sway/config b/sway/config
deleted file mode 100644
index 94f6066..0000000
--- a/sway/config
+++ /dev/null
@@ -1,351 +0,0 @@
-#vim:conf
-
-input * xkb_layout "de"
-
-set $mod Mod1
-
-font pango:monospace 9
-
-# Use Mouse+$mod to drag floating windows to their wanted position
-floating_modifier $mod
-
-# start a terminal
-bindsym $mod+Return exec "alacritty"
-
-#start ranger
-bindsym $mod+o exec "termite -e ranger"
-
-#start browser
-bindsym  $mod+b exec "brave"
-
-# kill focused window
-bindsym $mod+Shift+q kill
-
-bindsym $mod+Shift+w exec "i3lock -p win -i ~/vimconfig/pictures/lock.png"
-
-#Screenshot on mod+p
-bindsym $mod+p exec "scrot ~/Screenshots/Screenshot%Y-%m-%d%H:%M:%S.png"
-
-# start dmenu (a program launcher)
-bindsym $mod+d exec rofi -show run
-# There also is the (new) i3-dmenu-desktop which only displays applications
-# shipping a .desktop file. It is a wrapper around dmenu, so you need that
-# installed.
-# bindsym $mod+d exec --no-startup-id i3-dmenu-desktop
-
-# change focus
-bindsym $mod+j focus left
-bindsym $mod+k focus down
-bindsym $mod+l focus up
-bindsym $mod+odiaeresis focus right
-
-# alternatively, you can use the cursor keys:
-bindsym $mod+Left focus left
-bindsym $mod+Down focus down
-bindsym $mod+Up focus up
-bindsym $mod+Right focus right
-
-# move focused window
-bindsym $mod+Shift+j move left
-bindsym $mod+Shift+k move down
-bindsym $mod+Shift+l move up
-bindsym $mod+Shift+odiaeresis move right
-
-# alternatively, you can use the cursor keys:
-bindsym $mod+Shift+Left move left
-bindsym $mod+Shift+Down move down
-bindsym $mod+Shift+Up move up
-bindsym $mod+Shift+Right move right
-
-# split in horizontal orientation
-bindsym $mod+h split h
-
-# split in vertical orientation
-bindsym $mod+v split v
-
-# enter fullscreen mode for the focused container
-bindsym $mod+f fullscreen toggle
-
-# change container layout (stacked, tabbed, toggle split)
-bindsym $mod+s layout stacking
-bindsym $mod+w layout tabbed
-bindsym $mod+e layout toggle split
-
-# toggle tiling / floating
-bindsym $mod+Shift+space floating toggle
-
-# change focus between tiling / floating windows
-bindsym $mod+space focus mode_toggle
-
-# focus the parent container
-bindsym $mod+a focus parent
-
-# focus the child container
-#bindsym $mod+d focus child
-
-# Define names for default workspaces for which we configure key bindings later on.
-# We use variables to avoid repeating the names in multiple places.
-set $ws1 "1"
-set $ws2 "2"
-set $ws3 "3"
-set $ws4 "4"
-set $ws5 "5"
-set $ws6 "6"
-set $ws7 "7"
-set $ws8 "8"
-set $ws9 "9"
-set $ws10 "10"
-
-# switch to workspace
-bindsym $mod+1 workspace $ws1
-bindsym $mod+2 workspace $ws2
-bindsym $mod+3 workspace $ws3
-bindsym $mod+4 workspace $ws4
-bindsym $mod+5 workspace $ws5
-bindsym $mod+6 workspace $ws6
-bindsym $mod+7 workspace $ws7
-bindsym $mod+8 workspace $ws8
-bindsym $mod+9 workspace $ws9
-bindsym $mod+0 workspace $ws10
-
-# move focused container to workspace
-bindsym $mod+Shift+1 move container to workspace $ws1
-bindsym $mod+Shift+2 move container to workspace $ws2
-bindsym $mod+Shift+3 move container to workspace $ws3
-bindsym $mod+Shift+4 move container to workspace $ws4
-bindsym $mod+Shift+5 move container to workspace $ws5
-bindsym $mod+Shift+6 move container to workspace $ws6
-bindsym $mod+Shift+7 move container to workspace $ws7
-bindsym $mod+Shift+8 move container to workspace $ws8
-bindsym $mod+Shift+9 move container to workspace $ws9
-bindsym $mod+Shift+0 move container to workspace $ws10
-
-# reload the configuration file
-bindsym $mod+Shift+c reload
-# restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
-bindsym $mod+Shift+r restart
-# exit i3 (logs you out of your X session)
-#bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'"
-bindsym $mod+Shift+e exec $(printf "shutdown now\nreboot\nswaymsg exit\nkillall compton" | rofi -dmenu -mesg "Exit?")
-
-# resize window (you can also use the mouse for that)
-mode "resize" {
-        # These bindings trigger as soon as you enter the resize mode
-
-        # Pressing left will shrink the window’s width.
-        # Pressing right will grow the window’s width.
-        # Pressing up will shrink the window’s height.
-        # Pressing down will grow the window’s height.
-        bindsym j resize shrink width 10 px or 10 ppt
-        bindsym k resize grow height 10 px or 10 ppt
-        bindsym l resize shrink height 10 px or 10 ppt
-        bindsym odiaeresis resize grow width 10 px or 10 ppt
-
-        # same bindings, but for the arrow keys
-        bindsym Left resize shrink width 10 px or 10 ppt
-        bindsym Down resize grow height 10 px or 10 ppt
-        bindsym Up resize shrink height 10 px or 10 ppt
-        bindsym Right resize grow width 10 px or 10 ppt
-
-        # back to normal: Enter or Escape or $mod+r
-        bindsym Return mode "default"
-        bindsym Escape mode "default"
-        bindsym $mod+r mode "default"
-}
-
-bindsym $mod+r mode "resize"
-
-##GAPS
-set $mode_gaps Gaps: (o)uter, (i)nner, (h)orizontal, (v)ertical, (t)op, (r)ight, (b)ottom, (l)eft
-set $mode_gaps_outer Outer Gaps: +|-|0 (local), Shift + +|-|0 (global)
-set $mode_gaps_inner Inner Gaps: +|-|0 (local), Shift + +|-|0 (global)
-set $mode_gaps_horiz Horizontal Gaps: +|-|0 (local), Shift + +|-|0 (global)
-set $mode_gaps_verti Vertical Gaps: +|-|0 (local), Shift + +|-|0 (global)
-set $mode_gaps_top Top Gaps: +|-|0 (local), Shift + +|-|0 (global)
-set $mode_gaps_right Right Gaps: +|-|0 (local), Shift + +|-|0 (global)
-set $mode_gaps_bottom Bottom Gaps: +|-|0 (local), Shift + +|-|0 (global)
-set $mode_gaps_left Left Gaps: +|-|0 (local), Shift + +|-|0 (global)
-bindsym $mod+Shift+g mode "$mode_gaps"
-
-mode "$mode_gaps" {
-        bindsym o      mode "$mode_gaps_outer"
-        bindsym i      mode "$mode_gaps_inner"
-        bindsym h      mode "$mode_gaps_horiz"
-        bindsym v      mode "$mode_gaps_verti"
-        bindsym t      mode "$mode_gaps_top"
-        bindsym r      mode "$mode_gaps_right"
-        bindsym b      mode "$mode_gaps_bottom"
-        bindsym l      mode "$mode_gaps_left"
-        bindsym Return mode "$mode_gaps"
-        bindsym Escape mode "default"
-}
-
-mode "$mode_gaps_outer" {
-        bindsym plus  gaps outer current plus 5
-        bindsym minus gaps outer current minus 5
-        bindsym 0     gaps outer current set 0
-
-        bindsym Shift+plus  gaps outer all plus 5
-        bindsym Shift+minus gaps outer all minus 5
-        bindsym Shift+0     gaps outer all set 0
-
-        bindsym Return mode "$mode_gaps"
-        bindsym Escape mode "default"
-}
-mode "$mode_gaps_inner" {
-        bindsym plus  gaps inner current plus 5
-        bindsym minus gaps inner current minus 5
-        bindsym 0     gaps inner current set 0
-
-        bindsym Shift+plus  gaps inner all plus 5
-        bindsym Shift+minus gaps inner all minus 5
-        bindsym Shift+0     gaps inner all set 0
-
-        bindsym Return mode "$mode_gaps"
-        bindsym Escape mode "default"
-}
-mode "$mode_gaps_horiz" {
-        bindsym plus  gaps horizontal current plus 5
-        bindsym minus gaps horizontal current minus 5
-        bindsym 0     gaps horizontal current set 0
-
-        bindsym Shift+plus  gaps horizontal all plus 5
-        bindsym Shift+minus gaps horizontal all minus 5
-        bindsym Shift+0     gaps horizontal all set 0
-
-        bindsym Return mode "$mode_gaps"
-        bindsym Escape mode "default"
-}
-mode "$mode_gaps_verti" {
-        bindsym plus  gaps vertical current plus 5
-        bindsym minus gaps vertical current minus 5
-        bindsym 0     gaps vertical current set 0
-
-        bindsym Shift+plus  gaps vertical all plus 5
-        bindsym Shift+minus gaps vertical all minus 5
-        bindsym Shift+0     gaps vertical all set 0
-
-        bindsym Return mode "$mode_gaps"
-        bindsym Escape mode "default"
-}
-mode "$mode_gaps_top" {
-        bindsym plus  gaps top current plus 5
-        bindsym minus gaps top current minus 5
-        bindsym 0     gaps top current set 0
-
-        bindsym Shift+plus  gaps top all plus 5
-        bindsym Shift+minus gaps top all minus 5
-        bindsym Shift+0     gaps top all set 0
-
-        bindsym Return mode "$mode_gaps"
-        bindsym Escape mode "default"
-}
-mode "$mode_gaps_right" {
-        bindsym plus  gaps right current plus 5
-        bindsym minus gaps right current minus 5
-        bindsym 0     gaps right current set 0
-
-        bindsym Shift+plus  gaps right all plus 5
-        bindsym Shift+minus gaps right all minus 5
-        bindsym Shift+0     gaps right all set 0
-
-        bindsym Return mode "$mode_gaps"
-        bindsym Escape mode "default"
-}
-mode "$mode_gaps_bottom" {
-        bindsym plus  gaps bottom current plus 5
-        bindsym minus gaps bottom current minus 5
-        bindsym 0     gaps bottom current set 0
-
-        bindsym Shift+plus  gaps bottom all plus 5
-        bindsym Shift+minus gaps bottom all minus 5
-        bindsym Shift+0     gaps bottom all set 0
-
-        bindsym Return mode "$mode_gaps"
-        bindsym Escape mode "default"
-}
-mode "$mode_gaps_left" {
-        bindsym plus  gaps left current plus 5
-        bindsym minus gaps left current minus 5
-        bindsym 0     gaps left current set 0
-
-        bindsym Shift+plus  gaps left all plus 5
-        bindsym Shift+minus gaps left all minus 5
-        bindsym Shift+0     gaps left all set 0
-
-        bindsym Return mode "$mode_gaps"
-        bindsym Escape mode "default"
-}
-##/GAPS
-
-#COLOR
-set $bgb #282a36
-set $bg #282a36AA
-set $fg #f8f8f2
-set $tf #f8f8f2AA
-set $hi #f1fa7c
-set $tx #040404
-set $pk #ff79c6
-set $yw #f1fa7c
-set $gn #50fa7b
-set $rd #ff5555
-set $id #ff79c6
-set $opaque #00000000
-
-set $black #000000
-set $grey #151515
-
-#                        border  background  text  indicator
-client.focused           $grey   $black      $tf     $black
-client.unfocused         $bg     $bg         $tf     $id
-client.focused_inactive  $bg     $bg         $pk     $id
-client.urgent            $yw     $yw         $tx     $id
-client.placeholder       $bg     $bg         $bg     $bg
-client.background $black
-
-default_border none
-default_floating_border none
-
-for_window [class="feh"] floating enable
-
-gaps inner 5
-
-bar {
-	#i3bar_command i3bar -t
-	status_command python /usr/share/powerline/bindings/i3/powerline-i3.py
-	#status_command i3status
-	font pango:DejaVu Sans Mono for Powerline 12
-
-	colors {
-		background 		#00000000
-		focused_workspace	#00000000 #00000000 #FFFFFF
-		active_workspace	#00000000 #00000000 #FFFFFF
-		inactive_workspace	#00000000 #00000000 #555555
-		urgent_workspace	#00000000 #FF000033 #555555
-	}
-}
-
-#exec_always --no-startup-id ~/.i3/start_polybar.sh jonny
-
-# Pulse Audio controls
-bindsym XF86AudioRaiseVolume exec --no-startup-id "pactl -- set-sink-volume 0 +5%"
-bindsym XF86AudioLowerVolume exec --no-startup-id "pactl -- set-sink-volume 0 -5%"
-bindsym XF86AudioMute exec --no-startup-id "pactl set-sink-mute 0 toggle"
-bindsym XF86AudioMicMute exec --no-startup-id "pactl set-source-mute 1 toggle)'"
-
-#Mediacontrol
-bindsym XF86AudioPlay exec --no-startup-id playerctl play-pause
-bindsym XF86AudioStop exec --no-startup-id playerctl stop
-bindsym XF86AudioPrev exec --no-startup-id playerctl previous
-bindsym XF86AudioNext exec --no-startup-id playerctl next
-
-# Sreen brightness controls
-# Use acpilight with arch!!
-# https://gitlab.com/wavexx/acpilight
-bindsym XF86MonBrightnessUp exec --no-startup-id xbacklight -inc 5 -fps 30 # increase screen brightness
-bindsym XF86MonBrightnessDown exec --no-startup-id xbacklight -dec 5 -fps 30 # decrease screen brightness
-
-exec --no-startup-id twmnd
-
-#start autostart.sh
-exec --no-startup-id random_background
diff --git a/termite/config b/termite/config
deleted file mode 100644
index b4bd910..0000000
--- a/termite/config
+++ /dev/null
@@ -1,6 +0,0 @@
-[colors]
-foreground = #ffffff
-background  = rgba (0,0,0,0.6)
-
-[options]
-font = DejaVu Sans Mono for Powerline 10
diff --git a/twmn/twmn.conf b/twmn/twmn.conf
deleted file mode 100644
index 74facd4..0000000
--- a/twmn/twmn.conf
+++ /dev/null
@@ -1,84 +0,0 @@
-[gui]
-; Screen number to display notifications on when using a multi-head desktop.
-screen=  ; 0 indexed screen number
-
-; WARNING: Deprecated by "screen"
-; Absolute position from the top-left corner of the slide. You may need it for a multi-screen setup.
-; You still have to set position in order to choose the slide animation. If empty, twmnd will try
-; to figure out where to display the slide according to your desktop size and the slide position.
-absolute_position=  ; Supported format: WxH. Width and Height being integers.
-
-; Background color.
-background_color=black  ; RBG hex and keywords (eg. lightgray) are supported.
-
-; An icon for the layout. Useful only for a layout file.
-icon=  ; Path to image file. Optional.
-
-; Font family.
-font=Sans
-
-; Font size.
-font_size=15  ; In pixel.
-
-; Font variation.
-; accepted values are:
-; oblique, italic, ultra-light, light, medium, semi-bold, bold, ultra-bold, heavy, ultra-condensed,
-; extra-condensed, condensed, semi-condensed, semi-expanded, expanded, extra-expanded, ultra-expanded.
-font_variant=medium
-
-; Text color.
-foreground_color=white  ; RBG hex and keywords (eg. lightgray) are supported.
-
-; Height of the slide bar. Useful to match your tiling window manager's bar.
-height=18  ; In pixel.
-
-; Position of the notification slide.
-position=top_right  ; Accepted values: top_right (tr), top_left (tl), bottom_right (br),
-                    ; bottom_left (bl), top_center (tc), bottom_center (bc), center (c).
-
-; moves the position of the slide in +/- pixels on the x or y axis (e.g. "+50" or "-100")
-offset_x=+0 ; default is 0
-offset_y=+0 ; default is 0
-
-; The animation to use when the slide appear
-in_animation=38 ; see https://doc.qt.io/qt-5/qeasingcurve.html#Type-enum for types
-
-; The in animation's duration
-in_animation_duration=1000 ; in milliseconds
-
-; The animation to use whe the slide is closing
-out_animation=13
-
-; The out animation's duration
-out_animation_duration=1000 ; in milliseconds
-
-; Enable or disable notification bounce when changing notification
-bounce=true  ; true or false
-
-; Change bounce duration
-bounce_duration=500 ; in milliseconds
-
-; If the character length is more then max_length the text is cut off and "..." is appended
-max_length = -1 ; default is -1 (which means: don't cut off)
-
-[icons]
-; An icon. You can add as many as you want.
-NAME=  ; Path to image file. NAME being the icon's custom name.
-
-
-[main]
-; Program/command to be executed on notification activation.
-activate_command=  ; Path to command.
-
-; Time each notification remains visible.
-duration=3000  ; In millisecond.
-
-; Host address to listen on for notifications.
-host=127.0.0.1
-
-; UDP port used for notifications.
-port=9797
-
-; Program/command to play sound with.
-sound_command=  ;  Path to command. Leave empty for no sound.
-
diff --git a/xorg_backup/sx b/xorg_backup/sx
deleted file mode 100755
index 132f26a..0000000
--- a/xorg_backup/sx
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash 
-cd ~
-
-sudo -b pulseaudio --system
-
-startx -- :0 -seat seat0 -layout Layout0 &
-startx -- :1 -seat seat1 -layout Layout1  
diff --git a/xorg_backup/xorg.conf b/xorg_backup/xorg.conf
deleted file mode 100644
index 89ce860..0000000
--- a/xorg_backup/xorg.conf
+++ /dev/null
@@ -1,104 +0,0 @@
-# nvidia-settings: X configuration file generated by nvidia-settings
-# nvidia-settings:  version 430.40
-
-
-Section "ServerLayout"
-    Identifier     "Layout0"
-    Screen      0  "Screen0" 0 0
-    InputDevice    "Keyboard0" "CoreKeyboard"
-    InputDevice    "Mouse0" "CorePointer"
-EndSection
-
-Section "ServerLayout"
-	Identifier 	"Layout1"
-	Screen	1	"Screen1" 0 0
-#	InputDevice	"Keyboard1"
-EndSection
-
-Section "InputDevice"
-    Identifier     "Mouse0"
-    Driver         "mouse"
-    Option         "Protocol" "auto"
-    Option         "Device" "/dev/psaux"
-    Option         "Emulate3Buttons" "no"
-    Option         "ZAxisMapping" "4 5"
-    Option 	   "GrabDevice"
-EndSection
-
-Section "InputDevice"
-    Identifier     "Keyboard0"
-    Driver         "kbd"
-    Option 	   "GrabDevice"
-EndSection
-
-Section "InputDevice"
-	Identifier "Keyboard1"
-	Option "Device" "/dev/input/by-path/platform-i8042-serio-0-event-kbd"
-	Driver "kbd"
-EndSection
-
-Section "Monitor"
-    Identifier     "Monitor0"
-    VendorName     "Unknown"
-    ModelName      "DELL U2312HM"
-    HorizSync       30.0 - 83.0
-    VertRefresh     56.0 - 76.0
-    Option         "DPMS"
-EndSection
-
-Section "Monitor"
-    Identifier     "Monitor1"
-    VendorName     "Unknown"
-    ModelName      "Maxdata/Belinea B101720"
-    HorizSync       31.0 - 83.0
-    VertRefresh     56.0 - 75.0
-    Option         "DPMS"
-EndSection
-
-Section "Device"
-    Identifier     "Device0"
-    Driver         "nvidia"
-    VendorName     "NVIDIA Corporation"
-    BoardName      "GeForce RTX 2070"
-    BusID          "PCI:2:0:0"
-EndSection
-
-Section "Device"
-    Identifier     "Device1"
-    Driver         "nvidia"
-    VendorName     "NVIDIA Corporation"
-    BoardName      "GeForce GTX 660"
-    BusID          "PCI:1:0:0"
-EndSection
-
-Section "Screen"
-    Identifier     "Screen0"
-    Device         "Device0"
-    Monitor        "Monitor0"
-    DefaultDepth    24
-    Option         "Stereo" "0"
-    Option         "nvidiaXineramaInfoOrder" "DFP-3"
-    Option         "metamodes" "DP-2: nvidia-auto-select +2160+420 {AllowGSYNC=Off}, HDMI-0: nvidia-auto-select +0+0 {rotation=right}, DP-0: nvidia-auto-select +4080+420, HDMI-1: nvidia-auto-select +1080+0 {rotation=right}"
-    Option         "SLI" "Off"
-    Option         "MultiGPU" "Off"
-    Option         "BaseMosaic" "off"
-    SubSection     "Display"
-        Depth       24
-    EndSubSection
-EndSection
-
-Section "Screen"
-    Identifier     "Screen1"
-    Device         "Device1"
-    Monitor        "Monitor1"
-    DefaultDepth    24
-    Option         "Stereo" "0"
-    Option         "metamodes" "DVI-I-1: nvidia-auto-select +0+0 {rotation=invert, AllowGSYNC=Off}, DVI-D-0: nvidia-auto-select +1280+0 {rotation=left}"
-    Option         "SLI" "Off"
-    Option         "MultiGPU" "Off"
-    Option         "BaseMosaic" "off"
-    SubSection     "Display"
-        Depth       24
-    EndSubSection
-EndSection
-