diff --git a/home/.Xresources b/home/.Xresources
index 2fabb6f8..054d0000 100644
--- a/home/.Xresources
+++ b/home/.Xresources
@@ -21,7 +21,7 @@
*.color15: #c0c5ce
! Rofi
-rofi.font: DejaVu Sans Mono 12
+rofi.font: monospace 12
rofi.padding: 20
rofi.line-padding: 2
rofi.color-enabled: true
@@ -35,8 +35,8 @@ rofi.kb-cancel: Escape,Alt+F1
! xterm
xterm*termName: xterm-256color
-xterm*font: DejaVu Sans Mono
-xterm*faceName: DejaVu Sans Mono:size=11
+xterm*font: monospace
+xterm*faceName: monospace:size=11
xterm*loginShell: true
xterm*vt100*geometry: 90x34
xterm*saveLines: 2000
@@ -54,7 +54,7 @@ URxvt*scrollBar_right: false
URxvt*internalBorder: 0
URxvt*externalBorder: 0
URxvt*letterSpace: -1
-URxvt.font: xft:DejaVu Sans Mono:size=11
+URxvt.font: xft:monospace:size=11
URxvt.perl-ext-common: default,clipboard,url-select,keyboard-select
URxvt.copyCommand: xclip -i -selection clipboard
URxvt.pasteCommand: xclip -o -selection clipboard
@@ -74,7 +74,7 @@ URxvt*buffered: false
UXTerm*termName: xterm-256color
UXTerm*cursorColor: white
UXTerm*VT100.geometry: 90x34
-UXTerm*font: DejaVu Sans Mono
+UXTerm*font: monospace
UXTerm*faceSize: 11
UXTerm*dynamicColors: true
UXTerm*utf8: 2
diff --git a/home/.config/Thunar/uca.xml b/home/.config/Thunar/uca.xml
deleted file mode 100644
index f4557edc..00000000
--- a/home/.config/Thunar/uca.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
- utilities-terminal
- Open Terminal Here
- 1499240572835265-1
- exo-open --launch TerminalEmulator
- Open terminal emulator in current directory
- *
-
-
-
-
- document-open
- Open as Root
- 1498523394840843-5
- pkexec thunar %f
- Open a root instance of thunar
- *
-
-
-
- archive-extract
- Extract
- 1500573442438340-2
- file-roller -h %N
- Extract selected archive
- *
-
-
-
-
- archive-insert
- Archive
- 1500573639456321-3
- file-roller -d %F
- Archive selected items
- *
-
-
-
-
-
-
diff --git a/home/.config/conky/ArchLabs.conkyrc b/home/.config/conky/ArchLabs.conkyrc
index f515106a..b1fdd24f 100644
--- a/home/.config/conky/ArchLabs.conkyrc
+++ b/home/.config/conky/ArchLabs.conkyrc
@@ -42,7 +42,7 @@ draw_outline = true,
--Textual
extra_newline = false,
format_human_readable = true,
-font = 'DejaVu Sans Mono:size=11:regular',
+font = 'monospace:size=11',
max_text_width = 0,
max_user_text = 16384,
override_utf8_locale = true,
diff --git a/home/.config/dunst/dunstrc b/home/.config/dunst/dunstrc
index f099a623..6dbc85fa 100644
--- a/home/.config/dunst/dunstrc
+++ b/home/.config/dunst/dunstrc
@@ -85,7 +85,7 @@
### Text ###
- font = Ubuntu Regular 10
+ font = sans 10
# The spacing between lines. If the height is smaller than the
diff --git a/home/.config/fontconfig/fonts.conf b/home/.config/fontconfig/fonts.conf
index 44c18b93..d5ea0238 100644
--- a/home/.config/fontconfig/fonts.conf
+++ b/home/.config/fontconfig/fonts.conf
@@ -1,27 +1,34 @@
-
-
- true
-
-
- true
-
-
- hintslight
-
-
- rgb
-
-
- true
-
-
- lcddefault
-
-
- 96
-
-
+
+ serif
+
+ DejaVu Serif
+
+
+
+ sans-serif
+
+ DejaVu Sans
+
+
+
+ sans
+
+ DejaVu Sans
+
+
+
+ monospace
+
+ DejaVu Sans Mono
+
+
+
+ mono
+
+ DejaVu Sans Mono
+
+
diff --git a/home/.config/geany/colorschemes/bespin.conf b/home/.config/geany/colorschemes/bespin.conf
deleted file mode 100644
index bf4aaba5..00000000
--- a/home/.config/geany/colorschemes/bespin.conf
+++ /dev/null
@@ -1,121 +0,0 @@
-#
-# This file was generated from a textmate theme named Bespin
-# with tm2gtksw2 tool. (Alexandre da Silva)
-
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Library General Public
-# License as published by the Free Software Foundation; either
-# version 2 of the License, or (at your option) any later version.
-
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Library General Public License for more details.
-
-# You should have received a copy of the GNU Library General Public
-# License along with this library; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-#
-# Ported to Geany by Matthew Brush
-#
-
-[theme_info]
-name=Bespin
-description=A port of the Bespin theme.
-# incremented automatically, do not change manually
-version=1225
-author=Alexandre da Silva (tm2gtksw2)
-url=https://github.com/gmate/gmate/blob/master/styles/Bespin.xml
-# list of each compatible Geany release version
-compat=1.22;1.23;1.23.1;1.24
-
-[named_styles]
-
-default=#baae9e;#28211c;false;false
-error=#f8f8f8;#4a2947
-
-# Editor styles
-#-------------------------------------------------------------------------------
-
-selection=#baae9e;#4c4a49;true;true
-current_line=#000;#2e2723;true
-brace_good=#00f;#2e2723;true;false
-brace_bad=#df4545;#2e2723;true;false
-margin_line_number=#baae9e;#2e2723
-margin_folding=#baae9e;#2e2723
-fold_symbol_highlight=#2e2723
-indent_guide=#40342c
-white_space=#40342c;#fff;true;false
-caret=#a7a7a7;#000;false
-marker_line=#000;#ff0;
-marker_search=#000;#0000f0;
-marker_mark=#000;#b8f4b8;
-call_tips=#c0c0c0;#fff;false;false
-
-# Programming languages
-#-------------------------------------------------------------------------------
-
-comment=#666;;;true
-comment_doc=comment
-comment_line=comment
-comment_line_doc=comment_doc
-comment_doc_keyword=comment_doc,bold
-comment_doc_keyword_error=comment_doc,italic
-
-number=#cf6a4c
-number_1=number
-number_2=number_1
-
-type=#9b859d;;true
-class=type
-function=#937121
-parameter=function
-
-keyword=#5ea6ea;;true
-keyword_1=keyword
-keyword_2=type
-keyword_3=keyword_1
-keyword_4=keyword_1
-
-identifier=default
-identifier_1=identifier
-identifier_2=identifier_1
-identifier_3=identifier_1
-identifier_4=identifier_1
-
-string=#54be0d
-string_1=string
-string_2=string_1
-string_3=default
-string_4=default
-string_eol=string_1,italic
-character=string_1
-backticks=string_2
-here_doc=string_2
-
-scalar=string_2
-label=default,bold
-preprocessor=#cf6a4c
-regex=#e9c062
-operator=#5ea6ea
-decorator=string_1,bold
-other=#ddf2a4
-
-# Markup-type languages
-#-------------------------------------------------------------------------------
-
-tag=#ac885b
-tag_unknown=#ac885b
-tag_end=#ac885b
-attribute=#937121
-attribute_unknown=#937121
-value=string_1
-entity=default
-
-# Diff
-#-------------------------------------------------------------------------------
-
-line_added=#f8f8f8;#253b22
-line_removed=#f8f8f8;#420e09
-line_changed=#f8f8f8;#4a410d
diff --git a/home/.config/geany/colorschemes/black.conf b/home/.config/geany/colorschemes/black.conf
deleted file mode 100644
index 11e17621..00000000
--- a/home/.config/geany/colorschemes/black.conf
+++ /dev/null
@@ -1,125 +0,0 @@
-#
-# Copyright 2013 Paul Lenton (EckoZero)
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301, USA.
-#
-# This is a remix of vibrant-ink, originally by Jason Wilson
-#
-# Thanks Jason! My remix is licensed under the exact same terms as
-# Jason's original (GNU GPLv2)
-#
-
-
-[theme_info]
-name=Black Scheme
-description=Black background, other colours
-# incremented automatically, do not change manually
-version=1237
-author=Paul Lenton
-# list of each compatible Geany release version
-compat=1.22;1.23;1.23.1;1.24
-
-
-[named_styles]
-
-default=#fff;#000;false;false
-error=#ff80c0;#000;false;false
-
-# Editor styles
-#-------------------------------------------------------------------------------
-
-selection=#f00;#404040;false;true
-current_line=#8dc63f;#330;true;false
-brace_good=#ff0;#000;true;false
-brace_bad=#c5360f;#000;true;false
-margin_line_number=#b2aeab;#404040;false;false
-margin_folding=#222;#111;false;false
-fold_symbol_highlight=#fff
-indent_guide=#066;;false;false
-caret=#fff;#066;false;false
-marker_line=#ff208c;#80d4b2;false;false
-marker_search=#ff0;#f00;false;false
-marker_mark=#810000;#000;false;false
-call_tips=#ccc;#fff;false;false
-white_space=#ccc;;true
-
-# Programming languages
-#-------------------------------------------------------------------------------
-
-
-comment=#f00
-comment_doc=#f00;#070707;false;false
-comment_line=comment
-comment_line_doc=comment_doc
-comment_doc_keyword=comment_doc,bold
-comment_doc_keyword_error=comment_doc,italic
-
-number=#28a8b4
-number_1=number
-number_2=number_1
-
-type=#fff;;true;false
-class=type
-function=default
-parameter=function
-
-keyword=#f39;;true;false
-keyword_1=keyword
-keyword_2=#6f0;;true;false
-keyword_3=keyword_1
-keyword_4=keyword_1
-
-identifier=default
-identifier_1=identifier
-identifier_2=identifier_1
-identifier_3=identifier_1
-identifier_4=identifier_1
-
-string=#8dc63f
-string_1=string
-string_2=string_1
-string_3=default
-string_4=default
-string_eol=#8dc63f;#000;false;false
-character=string_1
-backticks=string_2
-here_doc=string_2
-
-scalar=string_2
-label=default,bold
-preprocessor=#fff
-regex=number_1
-operator=#fc0
-decorator=string_1,bold
-other=default
-
-# Markup-type languages
-#-------------------------------------------------------------------------------
-
-tag=#6f0;#000;false;false
-tag_unknown=#ccc;#000;false;false
-tag_end=#fff;#000;false;false
-attribute=#bd96bd;#000;false;false
-attribute_unknown=#fff;#000;false;false
-value=#6f0;#000;false;false
-entity=#fff;#000;false;false
-
-# Diff
-#-------------------------------------------------------------------------------
-
-line_added=#00f5ff;#000;false;false
-line_removed=#ff0;#000;false;false
-line_changed=#399;#000;false;false
diff --git a/home/.config/geany/colorschemes/darcula.conf b/home/.config/geany/colorschemes/darcula.conf
deleted file mode 100644
index 8abc90af..00000000
--- a/home/.config/geany/colorschemes/darcula.conf
+++ /dev/null
@@ -1,149 +0,0 @@
-#
-# Copyright 2015 Jiri Techet
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301, USA.
-#
-# Ported from the IntelliJ Darcula theme by Jiri Techet
-#
-
-[theme_info]
-name=Darcula
-description=A soft dark theme based on the IntelliJ Darcula theme.
-# incremented automatically, do not change manually
-version=1
-author=Jiri Techet
-url=https://github.com/codebrainz/geany-themes
-# list of each compatible Geany release version
-compat=1.22;1.23;1.23.1;1.24
-
-[named_colors]
-fg=#b6c3cf
-bg=#3b3b3b
-
-caret_grey=#c6c6c6
-margin_fg_grey=#989898
-comment_grey=#919191
-fold_fg_grey=#888
-whitespace_grey=#505050
-calltip_fg_grey=#555
-calltip_bg_grey=#ddd
-fold_bg_grey=#4c4c4c
-current_line_grey=#434343
-margin_bg_grey=#424446
-
-type_violet=#a88ab6
-keyword_blue=#9196bf
-number_blue=#7aa6c4
-selection_blue=#2f5692
-brace_bg_green=#4d6360
-diff_added_green=#558266
-docstring_green=#73a46a
-string_green=#b2ca78
-alert_yellow=#ffef4c
-tag_yellow=#edc881
-keyword_orange=#d58a4a
-error_red=#c85550
-diff_removed_red=#a0665b
-
-[named_styles]
-
-default=fg;bg;false;false
-error=error_red;;;true
-
-# Editor styles
-#-------------------------------------------------------------------------------
-
-selection=;selection_blue;;true
-current_line=;current_line_grey;true
-brace_good=alert_yellow;brace_bg_green;true
-brace_bad=error_red;current_line_grey;true
-margin_line_number=margin_fg_grey;margin_bg_grey
-margin_folding=fold_fg_grey;fold_bg_grey
-fold_symbol_highlight=fold_bg_grey
-indent_guide=whitespace_grey
-caret=caret_grey
-marker_line=margin_bg_grey;alert_yellow
-marker_search=;alert_yellow
-marker_mark=margin_bg_grey;alert_yellow
-call_tips=calltip_fg_grey;calltip_bg_grey;true;true
-white_space=whitespace_grey;;true
-
-# Programming languages
-#-------------------------------------------------------------------------------
-
-comment=comment_grey
-comment_doc=docstring_green
-comment_line=comment
-comment_line_doc=comment_doc
-comment_doc_keyword=comment_doc,bold
-comment_doc_keyword_error=comment_doc,italic
-
-number=number_blue
-number_1=number
-number_2=number_1
-
-type=type_violet
-class=type
-function=tag_yellow
-parameter=function
-
-keyword=keyword_orange
-keyword_1=keyword
-keyword_2=keyword_blue
-keyword_3=keyword_1
-keyword_4=keyword_1
-
-identifier=default
-identifier_1=identifier
-identifier_2=identifier_1
-identifier_3=identifier_1
-identifier_4=identifier_1
-
-string=string_green
-string_1=string
-string_2=string_1
-string_3=default
-string_4=default
-string_eol=string_1,italic
-character=string_1
-backticks=string_2
-here_doc=string_2
-
-scalar=string_2
-label=default,bold
-preprocessor=tag_yellow
-regex=number_1
-operator=default
-decorator=tag_yellow
-other=default
-
-# Markup-type languages
-#-------------------------------------------------------------------------------
-
-tag=tag_yellow
-tag_unknown=tag
-tag_end=tag
-attribute=keyword_orange
-attribute_unknown=attribute
-value=string_green
-entity=number_blue
-
-# Diff
-#-------------------------------------------------------------------------------
-
-line_added=diff_added_green
-line_removed=diff_removed_red
-line_changed=preprocessor
diff --git a/home/.config/geany/colorschemes/dark-colors.conf b/home/.config/geany/colorschemes/dark-colors.conf
deleted file mode 100644
index 41ed78e3..00000000
--- a/home/.config/geany/colorschemes/dark-colors.conf
+++ /dev/null
@@ -1,136 +0,0 @@
-#
-# Copyright (C) 2016 - Yannis Kontochristopoulos
-#
-# Dark Colors is a theme inspired by Tinge:
-# Copyright (C) 2008 - Harsh J
-# See: http://www.harshj.com/2008/01/27/tinge-theme-for-gedit/
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301, USA.
-#
-
-[theme_info]
-name=Dark Colors
-description=A dark theme utilising warm colors
-# incremented automatically, do not change manually
-version=1225
-
-[named_colors]
-text=#e6e6e6
-soft_text=#a69996
-softer_text=#4c4645
-background=#0c0807
-selection_brown=#422e21
-marker_search_turquoise=#286659
-current_line_red=#281816
-black=#000
-white=#fff
-light_blue=#5191cc
-soft_blue=#596f80
-red=#b31111
-yellow=#b3a123
-orange=#e66917
-orange2=#ff9400
-green=#00df13
-purple=#b6f
-
-[named_styles]
-default=text;background;false;false
-error=green;background;false;false
-
-# Editor styles
-#-------------------------------------------------------------------------------
-
-selection=background;selection_brown;false;true
-current_line=background;current_line_red;true;false
-brace_good=light_blue;background;true;false
-brace_bad=white;background;true;false
-margin_line_number=soft_text;#2b2826;false;false
-margin_folding=#574a22;#141312;false;false
-fold_symbol_highlight=soft_text
-indent_guide=softer_text
-caret=white;white;false
-marker_line=soft_text;yellow
-marker_search=marker_search_turquoise;marker_search_turquoise;false;false
-marker_mark=red;background;false;false
-call_tips=#c0c0c0;white;false;false
-white_space=softer_text;;true
-
-# Programming languages
-#-------------------------------------------------------------------------------
-
-comment=soft_blue
-comment_doc=soft_blue;background;false;false
-comment_line=comment
-comment_line_doc=comment_doc
-comment_doc_keyword=comment_doc,bold
-comment_doc_keyword_error=comment_doc,italic
-
-number=green
-number_1=number
-number_2=number_1
-
-type=purple;;true;false
-class=type
-function=type
-parameter=function
-
-keyword=orange;;true;false
-keyword_1=keyword
-keyword_2=yellow;;true;false
-keyword_3=keyword_1
-keyword_4=keyword_1
-
-identifier=default
-identifier_1=identifier
-identifier_2=identifier_1
-identifier_3=identifier_1
-identifier_4=identifier_1
-
-string=red
-string_1=string
-string_2=string_1
-string_3=string_1
-string_4=string_1
-string_eol=text;background;false;false
-character=string_1
-backticks=string_2
-here_doc=string_2
-
-scalar=string_2
-label=default,bold
-preprocessor=text
-regex=number_1
-operator=orange2
-decorator=string_1,bold
-other=default
-
-# Markup-type languages
-#-------------------------------------------------------------------------------
-
-tag=yellow;background;false;false
-tag_unknown=green;background;false;false
-tag_end=text;background;false;false
-attribute=orange;background;false;false
-attribute_unknown=green;background;false;false
-value=text;background;false;false
-entity=text;background;false;false
-
-# Diff
-#-------------------------------------------------------------------------------
-
-line_added=green;background;false;false
-line_removed=red;background;false;false
-line_changed=light_blue;background;false;false
diff --git a/home/.config/geany/colorschemes/dark-fruit-salad.conf b/home/.config/geany/colorschemes/dark-fruit-salad.conf
deleted file mode 100644
index 01cfd24f..00000000
--- a/home/.config/geany/colorschemes/dark-fruit-salad.conf
+++ /dev/null
@@ -1,121 +0,0 @@
-#
-# Copyright 2011 John Gabriele
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301, USA.
-#
-# Ported from old theme by Matthew Brush
-# Note: was part of `set_geany_colors` utility
-#
-
-[theme_info]
-name=Dark Fruit Salad
-description=Low contrast theme ported from the set_geany_colors utility
-# incremented automatically, do not change manually
-version=1226
-author=John Gabriele
-url=https://github.com/codebrainz/geany-themes
-# list of each compatible Geany release version
-compat=1.22;1.23;1.23.1;1.24
-
-[named_styles]
-
-default=#f0f0f0;#5f5f5f;false;false
-error=#ebbf71;#e1e17a
-
-# Editor styles
-#-------------------------------------------------------------------------------
-
-selection=#000;#202020;false;true
-current_line=#000;#565656;true
-brace_good=#f0f0f0;#587941;false;false
-brace_bad=#f00;#fff;false;false
-margin_line_number=#5f5f5f;#f0f0f0
-margin_folding=#d69cd6;#202020
-fold_symbol_highlight=#202020
-indent_guide=#d69cd6
-caret=#000;#000;false
-marker_line=#000;#ff0
-marker_search=#000;#0000f0
-marker_mark=#000;#b8f4b8
-call_tips=#c0c0c0;#fff;false;false
-white_space=#a7a7a7;;true
-
-# Programming languages
-#-------------------------------------------------------------------------------
-
-comment=#a3d97d
-comment_doc=#99e4de;;true
-comment_line=comment
-comment_line_doc=comment_doc
-comment_doc_keyword=comment_doc,bold
-comment_doc_keyword_error=comment_doc,italic
-
-number=#ff939c
-number_1=number
-number_2=number_1
-
-type=#e1e17a;;true
-class=type
-function=#92bde8;;true
-parameter=function
-
-keyword=#92bde8;;true
-keyword_1=keyword
-keyword_2=#d69cd6;;true
-keyword_3=keyword_1
-keyword_4=keyword_1
-
-identifier=#f0f0f0
-identifier_1=identifier
-identifier_2=#99e4de;;true
-identifier_3=#ff939c;;true
-identifier_4=identifier_1
-
-string=#ebbf71
-string_1=string
-string_2=#e1e17a
-string_3=default
-string_4=default
-string_eol=string_1,italic
-character=#e1e17a;;true
-backticks=string_2
-here_doc=string_2
-
-scalar=string_2
-label=default,bold
-preprocessor=#ff939c
-regex=number_1
-operator=default
-decorator=string_1,bold
-other=default
-
-# Markup-type languages
-#-------------------------------------------------------------------------------
-
-tag=keyword
-tag_unknown=tag,bold
-tag_end=tag,bold
-attribute=#99e4de
-attribute_unknown=attribute,bold
-value=string_1
-entity=default
-
-# Diff
-#-------------------------------------------------------------------------------
-
-line_added=#8ae234
-line_removed=#e1e17a
-line_changed=preprocessor
diff --git a/home/.config/geany/colorschemes/dark.conf b/home/.config/geany/colorschemes/dark.conf
deleted file mode 100644
index 541c5350..00000000
--- a/home/.config/geany/colorschemes/dark.conf
+++ /dev/null
@@ -1,120 +0,0 @@
-#
-# Copyright 2011 Duncan Lock
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301, USA.
-#
-# Ported from old theme by Matthew Brush
-#
-
-[theme_info]
-name=Dark
-description=Dark syntax colouring theme
-# incremented automatically, do not change manually
-version=1225
-author=Duncan Lock
-url=http://code.google.com/p/geany-dark-scheme/
-# list of each compatible Geany release version
-compat=1.22;1.23;1.23.1;1.24
-
-[named_styles]
-
-default=#fff;#1e1e1e;false;false
-error=#f00;#1e1e1e;false;false
-
-# Editor styles
-#-------------------------------------------------------------------------------
-
-selection=#fff;#333964;false;true
-current_line=#000;#2f2f2f;true;false
-brace_good=#fff;#50aa15;true;false
-brace_bad=#fff;#aa1515;true;false
-margin_line_number=#000;#d0d0d0;false;false
-margin_folding=#000;#dfdfdf;false;false
-fold_symbol_highlight=#fff
-indent_guide=#393939;#1e1e1e;false;false
-caret=#fff;#000;true;false
-marker_line=#000;#ff0;false;false
-marker_search=#000;#b8f4b8;false;false
-marker_mark=#000;#b8f4b8;
-call_tips=#c0c0c0;#fff;false;false
-white_space=#424242;;true
-
-# Programming languages
-#-------------------------------------------------------------------------------
-
-comment=#747474;#1e1e1e;false;false
-comment_doc=comment
-comment_line=comment
-comment_line_doc=comment_doc
-comment_doc_keyword=comment_doc,bold
-comment_doc_keyword_error=comment_doc,italic
-
-number=#aaff57;#1e1e1e;false;false
-number_1=number
-number_2=number_1
-
-type=#2e8b57;;true
-class=type
-function=default
-parameter=function
-
-keyword=#ffcb4f;#1e1e1e;true;false
-keyword_1=keyword
-keyword_2=#aaff57;#1e1e1e;false;true
-keyword_3=keyword_1
-keyword_4=keyword_1
-
-identifier=#fff;#1e1e1e;false;false
-identifier_1=identifier
-identifier_2=identifier_1
-identifier_3=identifier_1
-identifier_4=identifier_1
-
-string=#aaff57;#1e1e1e;false;false
-string_1=string
-string_2=#a18651;#1e1e1e;false;false
-string_3=default
-string_4=default
-string_eol=string_1,italic
-character=string_1
-backticks=string_2
-here_doc=string_2
-
-scalar=string_2
-label=default,bold
-preprocessor=#5abefd;#1e1e1e;false;false
-regex=number_1
-operator=#98bac5;#1e1e1e;true;false
-decorator=#808000;#1e1e1e;false;false
-other=#fff;#1e1e1e;false;false
-
-# Markup-type languages
-#-------------------------------------------------------------------------------
-
-tag=#7392cf;#1e1e1e;false;false
-tag_unknown=#fff;#8c0101;true;false
-tag_end=#7392cf;#1e1e1e;true;false
-attribute=#cda0d5;#1e1e1e;false;false
-attribute_unknown=#fff;#8c0101;false;false
-value=#4575b6;#1e1e1e;false;false
-entity=#ffa95c;#2c2821;false;false
-
-# Diff
-#-------------------------------------------------------------------------------
-
-line_added=#008b8b
-line_removed=#6a5acd
-line_changed=preprocessor
diff --git a/home/.config/geany/colorschemes/fluffy.conf b/home/.config/geany/colorschemes/fluffy.conf
deleted file mode 100644
index 56417c0d..00000000
--- a/home/.config/geany/colorschemes/fluffy.conf
+++ /dev/null
@@ -1,128 +0,0 @@
-#
-# No explicit license available but part of the `gedit-themes`
-# project:
-# https://github.com/mig/gedit-themes/blob/master/fluffy.xml
-#
-# Indicated author and assumed copyright holder is:
-# Osmo Salomaa
-#
-# Ported to Geany by Matthew Brush
-#
-
-[theme_info]
-name=Fluffy
-description=A soft and downy color scheme.
-# incremented automatically, do not change manually
-version=1226
-author=Osmo Salomaa
-url=https://github.com/mig/gedit-themes/blob/master/fluffy.xml
-# list of each compatible Geany release version
-compat=1.22;1.23;1.23.1;1.24
-
-[named_colors]
-almost_black=#111
-blue=#06f
-cyan=#02b5d1
-dark_grey=#babdb6
-green=#00bb87
-highlight_blue=#abf5ff
-highlight_green=#c1ff9d
-highlight_yellow=#fce94f
-indigo=#b76fff
-light_grey=#eeeeec
-magenta=#ff6fff
-medium_grey=#d3d7cf
-red=#ff405a
-very_dark_grey=#888a85
-very_light_grey=#fafaf8
-white=#fff
-
-[named_styles]
-
-default=almost_black;white;false;false
-error=red;;true
-
-# Editor styles
-#-------------------------------------------------------------------------------
-
-selection=;highlight_yellow;;true
-current_line=;very_light_grey;true
-brace_good=;highlight_green
-brace_bad=red
-margin_line_number=;dark_grey
-margin_folding=;medium_grey
-fold_symbol_highlight=white
-indent_guide=medium_grey
-caret=almost_black
-marker_line=;highlight_yellow
-marker_search=;blue
-marker_mark=;highlight_green
-call_tips=#c0c0c0
-white_space=medium_grey;;true
-
-# Generic programming languages
-#-------------------------------------------------------------------------------
-
-comment=blue
-comment_doc=comment
-comment_line=comment
-comment_line_doc=comment_doc
-comment_doc_keyword=comment_doc,bold
-comment_doc_keyword_error=comment_doc,italic
-
-number=magenta
-number_1=number
-number_2=number_1
-
-type=green;;true
-class=type
-function=indigo
-parameter=function
-
-keyword=red;;true
-keyword_1=keyword
-keyword_2=indigo;;true
-keyword_3=keyword_1
-keyword_4=keyword_1
-
-identifier=default
-identifier_1=identifier
-identifier_2=identifier_1
-identifier_3=identifier_1
-identifier_4=identifier_1
-
-string=magenta
-string_1=string
-string_2=string_1
-string_3=default
-string_4=default
-string_eol=string_1,italic
-character=string_1
-backticks=string_2
-here_doc=string_2
-
-scalar=string_2
-label=default,bold
-preprocessor=green
-regex=number_1
-operator=default
-decorator=red;;true
-other=default
-
-# Markup-type languages
-#-------------------------------------------------------------------------------
-
-tag=green
-tag_unknown=tag
-tag_end=tag
-attribute=red
-attribute_unknown=red
-value=magenta
-entity=default
-
-# Diff
-#-------------------------------------------------------------------------------
-
-line_added=green
-line_removed=red
-line_changed=cyan
diff --git a/home/.config/geany/colorschemes/gedit.conf b/home/.config/geany/colorschemes/gedit.conf
deleted file mode 100644
index fb0aabe6..00000000
--- a/home/.config/geany/colorschemes/gedit.conf
+++ /dev/null
@@ -1,120 +0,0 @@
-#
-# Copyright 2006-2007 GtkSourceView team
-#
-# GtkSourceView is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# GtkSourceView is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-#
-# Ported to Geany by Matthew Brush
-#
-
-[theme_info]
-name=Gedit
-description=A port of Gedit's default theme.
-# incremented automatically, do not change manually
-version=1225
-author=Yevgen Muntyan
-url=http://git.gnome.org/browse/gtksourceview/tree/data/styles/classic.xml
-# list of each compatible Geany release version
-compat=1.22;1.23;1.23.1;1.24
-
-[named_styles]
-
-default=#000;#fff;false;false
-error=#000;#f00;true;false
-
-# Editor styles
-#-------------------------------------------------------------------------------
-
-selection=#fff;#86abd9;true;true
-current_line=#000;#edeceb;true
-brace_good=#fff;#bebebe;true;false
-brace_bad=#fff;#f00;true;false
-margin_line_number=current_line,bold
-margin_folding=margin_line_number
-fold_symbol_highlight=#fff
-indent_guide=#bbbebb
-caret=#000;#000;false
-marker_line=#000;#ff0
-marker_search=marker_line
-marker_mark=#000;#6c8ea2
-call_tips=#bbbebb;#fff;false;false
-white_space=call_tips,bold
-
-# Programming languages
-#-------------------------------------------------------------------------------
-
-comment=#00f
-comment_doc=comment
-comment_line=comment
-comment_line_doc=comment_doc
-comment_doc_keyword=comment_doc,bold
-comment_doc_keyword_error=comment_doc,italic
-
-number=#f0f
-number_1=number
-number_2=#a52a2a;;true
-
-type=#2e8b57;;true
-class=number
-function=default
-parameter=function
-
-keyword=number_2
-keyword_1=keyword
-keyword_2=keyword_1
-keyword_3=keyword_1
-keyword_4=keyword_1
-
-identifier=default
-identifier_1=identifier
-identifier_2=identifier_1
-identifier_3=identifier_1
-identifier_4=#008a8c
-
-string=number
-string_1=string
-string_2=string_1
-string_3=;;true;false
-string_4=;;false;true
-string_eol=string_1,italic
-character=string_1
-backticks=#a020f0
-here_doc=string_2
-
-scalar=identifier_4
-label=default,bold
-preprocessor=backticks
-regex=identifier_4
-operator=default
-decorator=string_1,bold
-other=default
-extra=keyword
-
-# Markup-type languages
-#-------------------------------------------------------------------------------
-
-tag=identifier_4
-tag_unknown=tag,bold
-tag_end=tag,bold
-attribute=#6a5acd
-attribute_unknown=attribute,bold
-value=string_1
-entity=default
-
-# Diff
-#-------------------------------------------------------------------------------
-
-line_added=#008b8b
-line_removed=attribute
-line_changed=preprocessor
diff --git a/home/.config/geany/colorschemes/github.conf b/home/.config/geany/colorschemes/github.conf
deleted file mode 100644
index dd792c17..00000000
--- a/home/.config/geany/colorschemes/github.conf
+++ /dev/null
@@ -1,122 +0,0 @@
-#
-# Copyright 2009 Felipe Mesquita
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Library General Public
-# License as published by the Free Software Foundation; either
-# version 2 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Library General Public License for more details.
-#
-# You should have received a copy of the GNU Library General Public
-# License along with this library; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-#
-# Ported to Geany by Matthew Brush
-#
-# Note: This one is my favourite! -Matt (geany-themes maintainer)
-#
-
-[theme_info]
-name=GitHub
-description=Similar to GitHub.com's highlighting colors.
-# incremented automatically, do not change manually
-version=1227
-author=Felipe Mesquita
-url=https://github.com/mig/gedit-themes/blob/master/github.xml
-# list of each compatible Geany release version
-compat=1.22;1.23;1.23.1;1.24
-
-[named_styles]
-
-default=#000;#f8f8ff;false;false
-error=#f00;#bfbfbf;false;italic
-
-# Editor styles
-#-------------------------------------------------------------------------------
-
-selection=;#f0ec0f;false;true
-current_line=#000;#b7deee;true
-brace_good=#000;#32b953;bold
-brace_bad=#000;#ee5959
-margin_line_number=#7f7f7f;#ececec
-margin_folding=#7f7f7f;#d9d7d7
-fold_symbol_highlight=#ececec
-indent_guide=#c0c0c0;#fff;true;false
-caret=#000;#c0c0c0;false;false
-marker_line=#7f7f7f;#ececec
-marker_search=;#c0c0c0
-marker_mark=#7f7f7f;#ececec
-call_tips=default
-white_space=#c0c0c0;#fff;true;false
-
-# Generic programming languages
-#-------------------------------------------------------------------------------
-
-comment=#998
-comment_doc=#998
-comment_line=comment
-comment_line_doc=comment_doc
-comment_doc_keyword=comment_doc,bold
-comment_doc_keyword_error=comment_doc,italic
-
-number=#099
-number_1=number
-number_2=number_1
-
-type=#458;;true
-class=type
-function=#900
-parameter=function
-
-keyword=#0086b3;;true
-keyword_1=keyword
-keyword_2=#aa2c8c;;true
-keyword_3=keyword_1
-keyword_4=keyword_1
-
-identifier=default
-identifier_1=identifier
-identifier_2=identifier_1
-identifier_3=identifier_1
-identifier_4=identifier_1
-
-string=#d14
-string_1=string
-string_2=string_1
-string_3=default
-string_4=default
-string_eol=string_1,italic
-character=string_1
-backticks=string_2
-here_doc=string_2
-
-scalar=string_2
-label=default,bold
-preprocessor=#0f8787
-regex=number_1
-operator=default
-decorator=string_1,bold
-other=default
-
-# Markup-type languages
-#-------------------------------------------------------------------------------
-
-tag=type
-tag_unknown=tag,bold
-tag_end=tag,bold
-attribute=keyword_1
-attribute_unknown=attribute,bold
-value=string_1
-entity=default
-
-# Diff
-#-------------------------------------------------------------------------------
-
-line_added=#000;#dfd
-line_removed=#000;#fdd
-line_changed=#000;#ffc
diff --git a/home/.config/geany/colorschemes/himbeere.conf b/home/.config/geany/colorschemes/himbeere.conf
deleted file mode 100644
index f1927f59..00000000
--- a/home/.config/geany/colorschemes/himbeere.conf
+++ /dev/null
@@ -1,135 +0,0 @@
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Library General Public
-# License as published by the Free Software Foundation; either
-# version 2 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Library General Public License for more details.
-#
-# You should have received a copy of the GNU Library General Public
-# License along with this library; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-#
-
-[theme_info]
-name=Himbeere
-description=A dark theme with raspberry colors.
-# incremented automatically, do not change manually
-version=1226
-author=commenthol
-url=https://github.com/codebrainz/geany-themes
-# list of each compatible Geany release version
-compat=1.22;1.23;1.23.1;1.24
-
-[named_colors]
-base0=#ccc
-base1=#1a1c1e
-base2=#3f3f3f
-base3=#808080
-base4=#303030
-berry=#e12d66
-cyan=#25d0f0
-bluegrey=#747e9e
-orange=#ff8000
-lime=#65ff00
-grey=#777
-red=#f00
-redbg=#751212
-green=#859900
-blue=#268bd2
-
-[named_styles]
-default=base0;base1
-error=red
-
-
-# Editor styles
-#-------------------------------------------------------------------------------
-selection=;#083840;;true
-current_line=;#000;true
-brace_good=cyan;berry;true
-brace_bad=red;;true
-margin_line_number=base3;base4
-margin_folding=base3;#212121
-fold_symbol_highlight=base2
-indent_guide=base2;;true
-caret=cyan
-marker_line=#fff;#00f;
-marker_search=#fff;#d791a8;
-marker_mark=;
-call_tips=base0;base1
-white_space=base2;;true
-
-
-# Programming languages
-#-------------------------------------------------------------------------------
-
-comment=grey
-comment_doc=comment
-comment_line=comment
-comment_line_doc=comment_doc
-comment_doc_keyword=comment_doc,bold
-comment_doc_keyword_error=comment_doc,italic
-
-number=orange
-number_1=number
-number_2=number_1
-
-type=berry;;true
-class=cyan
-function=berry
-parameter=function
-
-keyword=berry;;true
-keyword_1=keyword
-keyword_2=cyan;;true
-keyword_3=bluegrey
-keyword_4=keyword_3
-
-identifier=default
-identifier_1=identifier
-identifier_2=identifier_1
-identifier_3=identifier_1
-identifier_4=identifier_1
-
-string=lime
-string_1=string
-string_2=string_1
-string_3=default
-string_4=default
-string_eol=red
-character=string_1
-backticks=string_2
-here_doc=string_2
-
-scalar=string_2
-label=keyword,bold
-preprocessor=cyan
-regex=number_1
-operator=bluegrey
-decorator=string_1,bold
-other=cyan
-
-
-# Markup-type languages
-#-------------------------------------------------------------------------------
-
-tag=berry
-tag_unknown=tag,bold
-tag_end=tag,bold
-attribute=cyan
-attribute_unknown=attribute,bold
-value=string_1
-entity=default
-
-
-# Diff
-#-------------------------------------------------------------------------------
-
-line_added=green
-line_removed=red
-line_changed=blue
diff --git a/home/.config/geany/colorschemes/inkpot.conf b/home/.config/geany/colorschemes/inkpot.conf
deleted file mode 100644
index 7cd21ee6..00000000
--- a/home/.config/geany/colorschemes/inkpot.conf
+++ /dev/null
@@ -1,118 +0,0 @@
-#
-# Copyright 2012 Campbell Barton
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Library General Public
-# License as published by the Free Software Foundation; either
-# version 2 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Library General Public License for more details.
-#
-# You should have received a copy of the GNU Library General Public
-# License along with this library; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-#
-
-[theme_info]
-name=InkPot
-description=Based on the vim theme of the same name.
-# incremented automatically, do not change manually
-version=1226
-author=Campbell Barton
-url=https://github.com/codebrainz/geany-themes
-# list of each compatible Geany release version
-compat=1.22;1.23;1.23.1;1.24
-
-[named_styles]
-
-default=#cfbfad;#1e1e27;false;false
-error=#1e1e1e;#f00;false;false
-
-# Editor styles
-#-------------------------------------------------------------------------------
-
-selection=;#4e4e8f;false;true
-current_line=#000;#2d2d32;true
-brace_good=#cfbfad;#4e4e8f
-brace_bad=#cfbfad;#f00
-margin_line_number=#8b8bcd;#2e2e2e
-margin_folding=#000;#3e3e3e;false;false
-fold_symbol_highlight=#6e6e6e
-indent_guide=#3b3b4d;;true;false
-caret=#8b8bff;#fff;false;false
-marker_line=#000;#ff0;false;false
-marker_search=#000;#b8f4b8;false;false
-marker_mark=#000;#b8f4b8;
-call_tips=default
-white_space=indent_guide
-
-# Generic programming languages
-#-------------------------------------------------------------------------------
-
-comment=#cd8b00
-comment_doc=#737dd5
-comment_line=comment
-comment_line_doc=comment_doc
-comment_doc_keyword=#4e5ab3;;true
-comment_doc_keyword_error=comment_doc
-
-number=#f0ad6d
-number_1=number
-number_2=number_1
-
-type=#ff8bff;;true
-class=#ff8bff
-function=#ff8bff
-parameter=function
-
-keyword=#808bed
-keyword_1=keyword
-keyword_2=#afc2ff;;true
-keyword_3=keyword_1
-keyword_4=keyword_1
-
-identifier=default
-identifier_1=identifier
-identifier_2=identifier_1
-identifier_3=identifier_1
-identifier_4=identifier_1
-
-string=#ffcd8b;#404040
-string_1=string
-string_2=string_1
-string_3=default
-string_4=default
-string_eol=string_1
-character=string
-backticks=string_2
-here_doc=string_2
-
-scalar=string_2
-label=#e76000;;bold
-preprocessor=#409090
-regex=number_1
-operator=#eee8d5
-decorator=#e76000;;true
-other=#808bed
-
-# Markup-type languages
-#-------------------------------------------------------------------------------
-
-tag=type
-tag_unknown=tag,bold
-tag_end=tag,bold
-attribute=#ff8bff
-attribute_unknown=attribute,bold
-value=string_1
-entity=default
-
-# Diff
-#-------------------------------------------------------------------------------
-
-line_added=#0a0
-line_removed=#f00
-line_changed=#e7b937
diff --git a/home/.config/geany/colorschemes/kugel.conf b/home/.config/geany/colorschemes/kugel.conf
deleted file mode 100644
index 60c1191b..00000000
--- a/home/.config/geany/colorschemes/kugel.conf
+++ /dev/null
@@ -1,132 +0,0 @@
-#
-# Copyright 2011 Thomas Martitz
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# * Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-# THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-# DAMAGE.
-#
-
-[theme_info]
-name=Kugel
-description=A dark, but not too dark with focus to be comfortable to the eyes.
-# incremented automatically, do not change manually
-version=1226
-author=Thomas Martitz
-url=https://github.com/codebrainz/geany-themes
-# list of each compatible Geany release version
-compat=1.22;1.23;1.23.1;1.24
-
-[named_styles]
-
-default=#ececec;#2d3335;false;false
-error=#f00;;true;false
-
-# Editor styles
-#-------------------------------------------------------------------------------
-
-selection=#fff;#333964;false;true
-current_line=#000;#282d2e;true;false
-brace_good=#fff;#50aa15;true;false
-brace_bad=#fff;#aa1515;true;false
-margin_line_number=#ececec
-margin_folding=#888a85;#3a4145
-fold_symbol_highlight=#fff
-indent_guide=#606c70
-caret=#ddd;#000;false
-marker_line=#000;#ff0;
-marker_search=#000;#0000f0;
-marker_mark=#000;#b8f4b8;
-call_tips=#555753;#eeeeec
-white_space=#606c70;#fff;true;false
-
-# Programming languages
-#-------------------------------------------------------------------------------
-
-comment=#888a85
-comment_doc=#3f5fbf
-comment_line=comment
-comment_line_doc=comment_doc
-comment_doc_keyword=comment_doc,bold
-comment_doc_keyword_error=comment_doc_keyword,italic
-
-number=#06a7a7
-number_1=number
-number_2=number_1
-
-type=#1e90ff
-class=type
-function=default
-parameter=#bbf647
-
-keyword=#729fcf
-keyword_1=keyword
-keyword_2=type
-keyword_3=keyword_1
-keyword_4=keyword_1
-
-identifier=default
-identifier_1=identifier
-identifier_2=identifier_1
-identifier_3=identifier_1
-identifier_4=identifier_1
-
-string=#dd4040
-string_1=string
-string_2=string_1
-string_3=default
-string_4=default
-string_eol=#000;#e0c0e0
-character=#8ae234
-backticks=#30ff00
-# here_doc ???
-here_doc=#ff84cd
-
-scalar=#bcf360
-# label ???
-label=default,bold
-preprocessor=#acac00
-regex=#aaff57
-operator=#fcaf3e
-decorator=preprocessor
-other=default
-extra=#404080
-
-# Markup-type languages
-#-------------------------------------------------------------------------------
-
-tag=type
-tag_unknown=tag,italic
-tag_end=tag
-attribute=keyword
-attribute_unknown=attribute,italic
-value=string_1
-entity=preprocessor
-
-# Diff
-#-------------------------------------------------------------------------------
-
-line_added=#34b034
-line_removed=#ff2727
-line_changed=#7f007f
diff --git a/home/.config/geany/colorschemes/mc.conf b/home/.config/geany/colorschemes/mc.conf
deleted file mode 100644
index aee0ab35..00000000
--- a/home/.config/geany/colorschemes/mc.conf
+++ /dev/null
@@ -1,117 +0,0 @@
-#
-# Copyright 2012 Henrik Pauli
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301, USA.
-#
-
-[theme_info]
-name=Ralesk's MC
-description=Midnight Commander-like scheme
-# incremented automatically, do not change manually
-version=1225
-author=Henrik Pauli
-url=http://share.drangolin.net/mc.conf
-# list of each compatible Geany release version
-compat=1.22;1.23;1.23.1;1.24
-
-[named_styles]
-
-default=#c0c0c0;#114;false;false
-error=#fff;#f00
-
-# Editor styles
-#-------------------------------------------------------------------------------
-
-selection=#000;#369;true;true
-current_line=#000;#12126d;false
-brace_good=#c0c0c0;#369;true;false
-brace_bad=#fff;#f00;true;false
-margin_line_number=#114;#393
-margin_folding=#f4d432;#7f3f00
-fold_symbol_highlight=#7f3f00
-indent_guide=#242490
-caret=#c3f;#000;true
-marker_line=#000;#ff0
-marker_search=#000;#0000f0
-marker_mark=#000;#b8f4b8
-call_tips=#c0c0c0;#fff;false;false
-white_space=#3636a3;#fff;true;false
-
-# Programming languages
-#-------------------------------------------------------------------------------
-
-comment=#960;;;true
-comment_doc=#c60;;;true
-comment_line=comment
-comment_line_doc=comment_doc
-comment_doc_keyword=comment_doc,bold
-comment_doc_keyword_error=comment_doc,italic
-
-number=#3fcfcf
-number_1=number
-number_2=number_1
-
-type=#fff;;true
-class=type
-function=#d3d7cf
-parameter=#f99
-
-keyword=#f4d432;;true
-keyword_1=keyword
-keyword_2=#9f0200;;true
-keyword_3=keyword_1
-keyword_4=keyword_1
-
-identifier=default
-identifier_1=#0f0
-identifier_2=#fff
-identifier_3=#0ff
-identifier_4=#7f0000
-
-string=#3a3
-string_1=string
-string_2=string_1
-string_3=default
-string_4=default
-string_eol=#000;#e0c0e0
-character=#5c5
-backticks=#fff;#000
-here_doc=string_2
-
-label=default,bold
-preprocessor=#808000
-regex=#2f7f7f
-operator=#ff0
-decorator=string_1,bold
-other=#404080
-
-# Markup-type languages
-#-------------------------------------------------------------------------------
-
-tag=type
-tag_unknown=tag,bold
-tag_end=tag,bold
-attribute=keyword_1
-attribute_unknown=attribute,bold
-value=string_1
-entity=default
-
-# Diff
-#-------------------------------------------------------------------------------
-
-line_added=#008b8b
-line_removed=#6a5acd
-line_changed=preprocessor
diff --git a/home/.config/geany/colorschemes/metallic-bottle.conf b/home/.config/geany/colorschemes/metallic-bottle.conf
deleted file mode 100644
index f77a7358..00000000
--- a/home/.config/geany/colorschemes/metallic-bottle.conf
+++ /dev/null
@@ -1,115 +0,0 @@
-###
-# Copyright 2013 Tomasz Wyderka
-##
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301, USA.
-#
-
-[theme_info]
-name=Metallic Bottle
-description=Bright color scheme matching GTK "Radiance" theme.
-version=1.22.0
-author=Tomasz Wyderka
-url=http://www.cofoh.com/mettalic_bottle
-
-[named_styles]
-
-default=#000;#fbfaf9;false;false
-error=#fff;#843121;false;true
-
-# Editor styles
-#-------------------------------------------------------------------------------
-
-selection=#000;#c48c65;false;true
-current_line=#000;#fff;true
-brace_good=#757c75;;true;false
-brace_bad=#843121;;true;false
-margin_line_number=#000;#dfd7cf
-margin_folding=#000;#f6f4f2
-fold_symbol_highlight=#fff
-indent_guide=#3d291c
-caret=#843121
-marker_line=#000;#1d1613
-marker_search=#000;#843121
-marker_mark=#000;#757c75
-call_tips=#a1654b;#fff;false;false
-white_space=#a1654b;#fff;true;false
-
-# Programming languages
-#-------------------------------------------------------------------------------
-
-comment=#757c75;;false;true
-comment_doc=#4b4a3a;;false;true
-comment_line=comment
-comment_line_doc=comment_doc
-comment_doc_keyword=comment_doc,bold
-comment_doc_keyword_error=comment_doc,italic
-
-number=#644129
-number_1=number
-number_2=number_1
-
-type=#843121;;true
-class=type
-function=#843121
-parameter=function
-
-keyword=#1d1613;;true
-keyword_1=keyword
-keyword_2=#3d291c;;true;true
-keyword_3=keyword_1
-keyword_4=keyword_1
-
-identifier=default
-identifier_1=identifier
-identifier_2=identifier_1
-identifier_3=identifier_1
-identifier_4=identifier_1
-
-string=#4b4a3a
-string_1=string
-string_2=string_1
-string_3=default
-string_4=default
-string_eol=#000;#e0c0e0
-character=string_1
-backticks=string_2
-here_doc=string_2
-
-scalar=string_2
-label=default,bold
-preprocessor=#c48c65
-regex=number_1
-operator=#d0c096
-decorator=string_1,bold
-other=#c48c65
-
-# Markup-type languages
-#-------------------------------------------------------------------------------
-
-tag=type
-tag_unknown=tag,bold
-tag_end=tag,bold
-attribute=keyword_1
-attribute_unknown=attribute,bold
-value=string_1
-entity=default
-
-# Diff
-#-------------------------------------------------------------------------------
-
-line_added=#c48c65
-line_removed=#843121
-line_changed=#fbfaf9
diff --git a/home/.config/geany/colorschemes/monokai.conf b/home/.config/geany/colorschemes/monokai.conf
deleted file mode 100644
index fc4dc3a7..00000000
--- a/home/.config/geany/colorschemes/monokai.conf
+++ /dev/null
@@ -1,131 +0,0 @@
-# No explicit license available
-#
-# Indicated author and assumed copyright holder is:
-# Wimer Hazenberg
-#
-# Ported to Geany and tweaked by Thanh Tran
-#
-
-[theme_info]
-name=Monokai
-description=It's warm, colorful and pleasing to the eyes
-#' incremented automatically, do not change manually
-version=16
-author=Wimer Hazenberg
-url=http://www.monokai.nl/blog/2006/07/15/textmate-color-theme/
-# list of each compatible Geany release version
-compat=1.22;1.23;1.23.1;1.24
-
-[named_colors]
-black=#000
-almost_black=#272822
-lighter_black=#2d2e2b
-yellow=#ff0
-light_yellow=#e6db74
-very_dark_yellow=#49483e
-bright_orange=#fd971f
-dark_orange=#75715e
-bright_green=#a6e22e
-light_green=#b8f4b8
-dark_blue=#086aa7
-light_purple=#ae81ff
-hot_pink=#f92672
-light_cyan=#66d9ef
-red=#f00
-green=#0f0
-white=#fff
-almost_white=#f8f8f2
-grey=#d0d0d0
-mid_grey=#888
-lighter_grey=#dfdfdf
-dark_grey=#3b3a32
-
-[named_styles]
-default=almost_white;almost_black;false;false
-error=red;very_dark_yellow;false;true
-
-# Editor styles
-#-------------------------------------------------------------------------------
-
-selection=;very_dark_yellow;false;true
-current_line=;lighter_black;true
-brace_good=bright_orange;very_dark_yellow;true
-brace_bad=error
-margin_line_number=mid_grey;almost_black
-margin_folding=mid_grey;dark_grey
-fold_symbol_highlight=white
-indent_guide=dark_grey
-caret=white;;false
-marker_line=yellow;very_dark_yellow
-marker_search=black;dark_blue
-marker_mark=light_green;lighter_black
-call_tips=dark_grey;white;false;false
-white_space=dark_grey;;true
-
-# Generic programming languages
-#-------------------------------------------------------------------------------
-
-comment=dark_orange
-comment_doc=comment
-comment_line=comment
-comment_line_doc=comment_doc
-comment_doc_keyword=comment,bold
-comment_doc_keyword_error=comment,italic
-
-number=light_purple
-number_1=number
-number_2=number_1
-
-type=bright_green
-class=type
-function=type
-parameter=bright_orange;
-
-keyword=hot_pink
-keyword_1=keyword
-keyword_2=light_cyan
-keyword_3=keyword_1
-keyword_4=keyword_2
-
-identifier=default
-identifier_1=identifier
-identifier_2=identifier_1
-identifier_3=identifier_1
-identifier_4=identifier_1
-
-string=light_yellow
-string_1=string
-string_2=string_1
-string_3=default
-string_4=default
-string_eol=string_1,italic
-character=string_1
-backticks=string_2
-here_doc=string_2
-
-scalar=string_2
-label=default,bold
-preprocessor=light_green
-regex=number_1
-operator=default
-decorator=string_1,bold
-other=default
-extra=keyword;
-
-# Markup-type languages
-#-------------------------------------------------------------------------------
-
-tag=keyword
-tag_unknown=tag,bold
-tag_end=tag,bold
-attribute=type
-attribute_unknown=attribute,bold
-value=number
-entity=number
-
-# Diff
-#-------------------------------------------------------------------------------
-
-line_added=green
-line_removed=red
-line_changed=preprocessor
diff --git a/home/.config/geany/colorschemes/notepad-plus-plus.conf b/home/.config/geany/colorschemes/notepad-plus-plus.conf
deleted file mode 100644
index 9e9fcc1b..00000000
--- a/home/.config/geany/colorschemes/notepad-plus-plus.conf
+++ /dev/null
@@ -1,122 +0,0 @@
-#
-# Copyright 2013 Paul
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301, USA.
-#
-# Note: Notepad++ port
-
-[theme_info]
-name=Notepad-plus-plus
-description=Default theme port from Notepad++
-version=122
-author=Paul
-url=
-# list of each compatible Geany release version
-compat=1.22;1.23;1.23.1;1.24
-
-
-[named_styles]
-
-default=#000080;#fefcf5
-error=#f00;#bfbfbf
-
-# Editor styles
-#-------------------------------------------------------------------------------
-
-selection=;#c0c0c0;false;true
-current_line=#e8e8ff;#e8e8ff;true;true
-brace_good=#f00;;true
-brace_bad=#f00
-margin_line_number=#808080;#e4e4e4
-margin_folding=#808080;#f3f3f3
-fold_symbol_highlight=#fff
-indent_guide=#c0c0c0;#fff;true;true
-caret=#8000ff;#fefcf5
-
-marker_line=#7f7f7f;#ececec
-marker_search=;#0f0
-marker_mark=#7f7f7f;#ececec
-
-call_tips=default
-white_space=#c0c0c0;#fff;true;false
-
-# Generic programming languages
-#-------------------------------------------------------------------------------
-
-comment=#008000
-comment_doc=comment
-comment_line=comment
-comment_line_doc=comment_doc
-comment_doc_keyword=comment_doc,bold
-comment_doc_keyword_error=comment_doc,italic
-
-number=#ff8000
-number_1=number
-number_2=#f00
-
-type=#00f;#fff
-class=type
-function=#900
-parameter=function
-
-keyword=#00f;#fefcf5;true
-keyword_1=keyword
-keyword_2=#aa2c8c;;true
-keyword_3=keyword_1
-keyword_4=keyword_1
-
-identifier=default
-identifier_1=identifier
-identifier_2=identifier_1
-identifier_3=identifier_1
-identifier_4=identifier_1
-
-string=#808080;#fefcf5
-string_1=string
-string_2=string_1
-string_3=default
-string_4=default
-string_eol=string_1,italic
-character=string_1
-backticks=string_2
-here_doc=string_2
-
-scalar=string_2
-label=default,bold
-preprocessor=#000080;#fefcf5
-regex=number_1
-operator=#8000ff;#fefcf5
-decorator=string_1,bold
-other=default
-
-
-# Markup-type languages
-#-------------------------------------------------------------------------------
-
-tag=type
-tag_unknown=tag,bold
-tag_end=tag,bold
-attribute=#f00
-attribute_unknown=attribute,bold
-value=#8000ff;#fff
-entity=default
-
-# Diff
-#-------------------------------------------------------------------------------
-
-line_added=#3de737
-line_removed=#e74837
-line_changed=#e7b937
diff --git a/home/.config/geany/colorschemes/oblivion2.conf b/home/.config/geany/colorschemes/oblivion2.conf
deleted file mode 100644
index 4fa4f9ca..00000000
--- a/home/.config/geany/colorschemes/oblivion2.conf
+++ /dev/null
@@ -1,120 +0,0 @@
-#
-# Copyright Bernhard Posselt
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301, USA.
-#
-# Ported from old theme by Matthew Brush
-#
-
-[theme_info]
-name=Oblivion 2
-description=Based on the Gedit color scheme Oblivion and the Dark Color Scheme with rearranged colors.
-# incremented automatically, do not change manually
-version=1225
-author=Bernhard Posselt
-url=http://download.geany.org/contrib/oblivion2.tar.gz
-# list of each compatible Geany release version
-compat=1.22;1.23;1.23.1;1.24
-
-[named_styles]
-
-default=#fff;#2e3436;false;false
-error=#fff;#f00
-
-# Editor styles
-#-------------------------------------------------------------------------------
-
-selection=#000;#a52a2a;false;true
-current_line=#000;#292929;true;false
-brace_good=#fff;#4e9a06;true;false
-brace_bad=#fff;#a52a2a;true;false
-margin_line_number=#eee;#000;false;false
-margin_folding=#888a85;#000;false;false
-fold_symbol_highlight=#000
-indent_guide=#474545;#2e3436;false;false
-caret=#fff;#000;false;false
-marker_line=#000;#ff0;false;false
-marker_search=#000;#b8f4b8;false;false
-marker_mark=#000;#b8f4b8;
-call_tips=#c0c0c0;#fff;false;false
-white_space=#506369;;true
-
-# Programming languages
-#-------------------------------------------------------------------------------
-
-comment=#888a85;#2e3436;false;false
-comment_doc=comment
-comment_line=comment
-comment_line_doc=comment_doc
-comment_doc_keyword=comment_doc,bold
-comment_doc_keyword_error=comment_doc,italic
-
-number=#ef2929;#2e3436;false;false
-number_1=number
-number_2=number_1
-
-type=#729fcf;#2e3436;true;false
-class=type
-function=default
-parameter=function
-
-keyword=#8ae234;#2e3436;true;false
-keyword_1=keyword
-keyword_2=#729fcf;#2e3436;true;false
-keyword_3=keyword_1
-keyword_4=keyword_1
-
-identifier=default
-identifier_1=identifier
-identifier_2=identifier_1
-identifier_3=identifier_1
-identifier_4=identifier_1
-
-string=#edd400;#2e3436;false;false
-string_1=string
-string_2=string_1
-string_3=default
-string_4=default
-string_eol=#fff;#ad7fa8;false;false
-character=#a18651;#2e3436;false;false
-backticks=string_2
-here_doc=string_2
-
-scalar=string_2
-label=default,bold
-preprocessor=#ad7fa8;#2e3436;true;false
-regex=#4e9a06;#2e3436;false;false
-operator=#ad7fa8;#2e3436;true;false
-decorator=#729fcf;#2e3436;false;false
-other=default
-
-# Markup-type languages
-#-------------------------------------------------------------------------------
-
-tag=#729fcf;#2e3436;true;false
-tag_unknown=#fff;#8c0101;true;false
-tag_end=#7392cf;#2e3436;true;false
-attribute=#fff;#2e3436;true;false
-attribute_unknown=#fff;#8c0101;false;false
-value=#4575b6;#2e3436;false;false
-entity=#ad7fa8;#2e3436;false;false
-
-# Diff
-#-------------------------------------------------------------------------------
-
-line_added=#729fcf;#2e3436;true;false
-line_removed=#8ae234;#2e3436;true;false
-line_changed=#fff;#fff;true;false
diff --git a/home/.config/geany/colorschemes/pygments.conf b/home/.config/geany/colorschemes/pygments.conf
deleted file mode 100644
index 225e5f3f..00000000
--- a/home/.config/geany/colorschemes/pygments.conf
+++ /dev/null
@@ -1,131 +0,0 @@
-#
-# Copyright (c) 2006-2012 by the respective authors.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# * Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# Ported to Geany by Nicolas Holvoët
-#
-
-[theme_info]
-name=Pygments
-description=Default Pygments theme for Geany
-# incremented automatically, do not change manually
-version=1226
-author=Pocoo
-url=http://pygments.org
-# list of each compatible Geany release version
-compat=1.22;1.23;1.23.1;1.24
-
-[named_styles]
-
-default=#161616;#f8f8f8;false;false
-error=#f00;#bfbfbf
-
-# Editor styles
-#-------------------------------------------------------------------------------
-
-selection=#2e3436;#cacaca;false;true
-current_line=#2e3436;#e7e7e7;true
-brace_good=#9433ad;#dcd4e0;true
-brace_bad=#ddd;#e0754a;true
-margin_line_number=#3a4346;#d6d6d6
-margin_folding=#747474;#e1e1e1
-fold_symbol_highlight=#d6d6d6
-indent_guide=#b5b5b5
-caret=#000;#000;false
-marker_line=#2e3436;#729fcf
-marker_search=#2e3436;#fcaf3e
-marker_mark=#565656;#d4d4d4
-call_tips=default
-white_space=#b5b5b5;;true
-
-# Programming languages
-#-------------------------------------------------------------------------------
-
-comment=#408080;;;true
-comment_doc=#3465a4;;;true
-comment_line=comment
-comment_line_doc=comment_doc
-comment_doc_keyword=comment_doc,bold
-comment_doc_keyword_error=comment_doc_keyword,italic
-
-number=#666
-number_1=number
-number_2=number_1
-
-type=#0032ff;;true
-class=type
-function=#0026bc
-parameter=function
-
-keyword=#008000;;true
-keyword_1=keyword
-keyword_2=#008000
-keyword_3=keyword_1
-keyword_4=keyword_1
-
-identifier=default
-identifier_1=identifier
-identifier_2=identifier_1
-identifier_3=identifier_1
-identifier_4=identifier_1
-
-string=#ba2121;;false;false
-string_1=string
-string_2=string_1
-string_3=default
-string_4=default
-string_eol=string_1,italic
-character=string_1
-backticks=string_2
-here_doc=string_2
-verbatim=string
-
-scalar=string_2
-label=default,bold
-preprocessor=#af7100
-regex=number_1
-operator=default
-decorator=#a2f
-other=default
-extra=#204a87
-
-# Markup-type languages
-#-------------------------------------------------------------------------------
-
-tag=#008000;;true
-tag_unknown=tag
-tag_end=tag
-attribute=#0032ff;;true
-attribute_unknown=attribute,italic
-value=string_1
-entity=preprocessor
-
-# Diff
-#-------------------------------------------------------------------------------
-
-line_added=#256a1b
-line_removed=#a40000
-line_changed=#ce5c00
diff --git a/home/.config/geany/colorschemes/railcasts2.conf b/home/.config/geany/colorschemes/railcasts2.conf
deleted file mode 100644
index b17cbb2b..00000000
--- a/home/.config/geany/colorschemes/railcasts2.conf
+++ /dev/null
@@ -1,110 +0,0 @@
-#
-# No explicit license or copyright info available but part of the
-# `gedit-themes` project:
-# https://github.com/mig/gedit-themes/blob/master/railscasts2.xml
-#
-# Ported to Geany by Matthew Brush
-#
-
-[theme_info]
-name=Railcasts 2
-description=A port of railscasts2 from gedit-themes.
-# incremented automatically, do not change manually
-version=1225
-author=Unknown Author
-url=https://github.com/mig/gedit-themes/blob/master/railscasts2.xml
-# list of each compatible Geany release version
-compat=1.22;1.23;1.23.1;1.24
-
-[named_styles]
-
-default=#e6e1dc;#2b2b2b;false;false
-error=#fff;#900
-
-# Editor styles
-#-------------------------------------------------------------------------------
-
-selection=#000;#676b65;false;true
-current_line=#000;#545752;true
-brace_good=#966dbe;;true
-brace_bad=#2b2b2b;#da4939;true
-margin_line_number=#2b2b2b;#c0c0ff
-margin_folding=#000;#dfdfdf
-fold_symbol_highlight=#fff
-indent_guide=#c0c0c0
-caret=#000;#000;false
-marker_line=#000;#ff0;
-marker_search=#000;#0000f0;
-marker_mark=#000;#b8f4b8;
-call_tips=#c0c0c0;#fff;false;false
-white_space=#565656;;true
-
-# Generic programming languages
-#-------------------------------------------------------------------------------
-
-comment=#bc9458;;;true
-comment_doc=comment
-comment_line=comment
-comment_line_doc=comment_doc
-comment_doc_keyword=comment_doc,bold
-comment_doc_keyword_error=comment_doc,italic
-
-number=#a5c261
-number_1=number
-number_2=number_1
-
-type=#da4939;;true
-class=type
-function=#ffc66d
-parameter=function
-
-keyword=#cc7833;;true
-keyword_1=keyword
-keyword_2=#6d9cbe;;true
-keyword_3=keyword_1
-keyword_4=keyword_1
-
-identifier=default
-identifier_1=identifier
-identifier_2=identifier_1
-identifier_3=identifier_1
-identifier_4=identifier_1
-
-string=#a5c261
-string_1=string
-string_2=string_1
-string_3=default
-string_4=default
-string_eol=string_1,italic
-character=string_1
-backticks=string_2
-here_doc=string_2
-
-scalar=string_2
-label=default,bold
-preprocessor=#e6e1dc
-regex=number_1
-operator=default
-decorator=string_1,bold
-other=default
-
-# Markup-type languages
-#-------------------------------------------------------------------------------
-
-tag=type
-tag_unknown=tag,bold
-tag_end=tag,bold
-attribute=keyword_1
-attribute_unknown=attribute,bold
-value=string_1
-entity=default
-
-# Diff
-#-------------------------------------------------------------------------------
-
-line_added=#e6e1dc;#144212
-line_removed=#e6e1dc;#600
-line_changed=default
-
-# Make style changes in colorscheme .conf file, make style mapping
-# changes below.
diff --git a/home/.config/geany/colorschemes/retro.conf b/home/.config/geany/colorschemes/retro.conf
deleted file mode 100644
index 75a1628f..00000000
--- a/home/.config/geany/colorschemes/retro.conf
+++ /dev/null
@@ -1,116 +0,0 @@
-#
-# Copyright 2011 Matthew Brush
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301, USA.
-#
-
-[theme_info]
-name=Retro
-description=Inspired by old green screen terminals.
-# incremented automatically, do not change manually
-version=6
-author=Matthew Brush
-url=
-# list of each compatible Geany release version
-compat=1.22;1.23;1.23.1;1.24
-
-[named_styles]
-
-default=#008500;#000;false;false
-error=#c00
-
-selection=#000;#0c0;true;true
-current_line=;;false
-brace_good=default
-brace_bad=default,bold
-margin_line_number=default
-margin_folding=default
-fold_symbol_highlight=#000
-indent_guide=default
-caret=#0c0;#000;true;true
-marker_line=default,italic
-marker_search=;#000
-marker_mark=#0c0;#000
-fold_symbol_highlight=#000
-call_tips=#000;#0c0;true;true
-white_space=#104e10;;true
-
-# Programming languages
-#-------------------------------------------------------------------------------
-
-comment=#67e667
-comment_doc=comment
-comment_line=comment
-comment_line_doc=comment_doc
-comment_doc_keyword=comment_doc,bold
-comment_doc_keyword_error=comment_doc,italic
-
-number=#39e639
-number_1=number
-number_2=number_1
-
-type=#0c0;;true
-class=type
-function=default
-parameter=function
-
-keyword=#008500;;true
-keyword_1=keyword
-keyword_2=keyword_1
-keyword_3=keyword_1
-keyword_4=keyword_1
-
-identifier=default
-identifier_1=identifier
-identifier_2=identifier_1
-identifier_3=identifier_1
-identifier_4=identifier_1
-
-string=#269926;;true
-string_1=string
-string_2=string_1
-string_3=default
-string_4=default
-string_eol=string_1,italic
-character=string_1
-backticks=string_2
-here_doc=string_2
-
-scalar=string_2
-label=default,bold
-preprocessor=default
-regex=number_1
-operator=default
-decorator=string_1,bold
-other=default
-
-# Markup-type languages
-#-------------------------------------------------------------------------------
-
-tag=#0c0
-tag_unknown=tag,bold
-tag_end=tag,bold
-attribute=#0c0;;true
-attribute_unknown=attribute,bold
-value=string_1
-entity=default
-
-# Diff
-#-------------------------------------------------------------------------------
-
-line_added=#0c0
-line_removed=#c00
-line_changed=#00c
diff --git a/home/.config/geany/colorschemes/sleepy-pastel.conf b/home/.config/geany/colorschemes/sleepy-pastel.conf
deleted file mode 100644
index 1d2b85a2..00000000
--- a/home/.config/geany/colorschemes/sleepy-pastel.conf
+++ /dev/null
@@ -1,102 +0,0 @@
-#
-# Public Domain
-#
-# Inspired by the tango theme: https://github.com/codebrainz/geany-themes/blob/master/colorschemes/tango-dark.conf
-#
-
-[theme_info]
-name=Sleepy Pastel
-description=Dark theme inspired by Tango
-version=1.0.0
-author=randomekek on github
-url=https://github.com/codebrainz/geany-themes/blob/master/sleepy-pastel.conf
-
-[named_styles]
-
-default=#dfdee0;#2e3436;false;false
-error=#fff;#f00
-
-# Editor styles
-#-------------------------------------------------------------------------------
-
-selection=#000;#626d71;false;true
-current_line=#000;#363f41;true
-brace_good=#cb956d;#4c5153;false;false
-brace_bad=#d7616d;#4c5153;true;false
-margin_line_number=#b2cba3;#4c5153
-margin_folding=#b2cba3;#4c5153
-fold_symbol_highlight=#4c5153
-indent_guide=#666
-caret=#ddd;#000;false
-marker_line=#000;#49473f
-marker_search=#000;#f0f0f0
-marker_mark=#000;#49473f
-call_tips=#b2cba3;#4c5153;true;true
-white_space=#666;;true
-
-# Programming languages
-#-------------------------------------------------------------------------------
-
-comment=#888a85;#2e3436;false;false
-comment_doc=comment
-comment_line=comment
-comment_line_doc=comment_doc
-comment_doc_keyword=comment_doc,bold
-comment_doc_keyword_error=comment_doc,italic
-
-number=#8ae234;#2e3436;false;false
-number_1=number
-number_2=number_1
-
-type=#eeeeec;#2e3436;false;false
-class=type
-function=default
-parameter=function
-
-keyword=#729fcf;#2e3436;false;false
-keyword_1=keyword
-keyword_2=keyword_1
-keyword_3=keyword_1
-keyword_4=keyword_1
-
-identifier=default
-identifier_1=identifier
-identifier_2=identifier_1
-identifier_3=identifier_1
-identifier_4=identifier_1
-
-string=#93cf55;#2e3436;false;false
-string_1=string
-string_2=string_1
-string_3=default
-string_4=default
-string_eol=string_1,italic
-character=string_1
-backtick=string_2
-here_doc=string_2
-
-scalar=string_2
-label=default,bold
-preprocessor=#5db895;#2e3436;false;false
-regex=number_1
-operator=#cb956d;#2e3436;false;false
-decorator=string_1,bold
-other=default
-
-# Markup-type languages
-#-------------------------------------------------------------------------------
-
-tag=#729fcf;#2e3436;false;false
-tag_unknown=tag
-tag_end=tag,bold
-attribute=#729fcf;#2e3436;false;false
-attribute_unknown=attribute
-value=string_1
-entity=default
-
-# Diff
-#-------------------------------------------------------------------------------
-
-line_added=#79c580
-line_removed=#dc8383
-line_changed=#c0afd3
diff --git a/home/.config/geany/colorschemes/slushpoppies.conf b/home/.config/geany/colorschemes/slushpoppies.conf
deleted file mode 100644
index fd73a326..00000000
--- a/home/.config/geany/colorschemes/slushpoppies.conf
+++ /dev/null
@@ -1,120 +0,0 @@
-#
-# Copyright 2006-2007 Will Farrington
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Library General Public
-# License as published by the Free Software Foundation; either
-# version 2 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Library General Public License for more details.
-#
-# You should have received a copy of the GNU Library General Public
-# License along with this library; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-#
-# Ported to Geany by Matthew Brush
-#
-
-[theme_info]
-name=Slush and Poppies
-description=A port of Slush and Poppies from gedit-themes.
-# incremented automatically, do not change manually
-version=1225
-author=Will Farrington
-url=https://github.com/mig/gedit-themes/blob/master/slush_and_poppies.xml
-# list of each compatible Geany release version
-compat=1.22;1.23;1.23.1;1.24
-
-[named_styles]
-
-default=#000;#f8f8ff;false;false
-error=#f8f8ff;#800000
-
-# Editor styles
-#-------------------------------------------------------------------------------
-
-selection=#000;#c0c0c0;false;true
-current_line=#000;#d9d9d9;true
-brace_good=;#4f94cd
-brace_bad=;#002f29;true
-margin_line_number=#000;#d0d0d0
-margin_folding=#000;#dfdfdf
-fold_symbol_highlight=#fff
-indent_guide=#c0c0c0
-caret=#000;#000;false
-marker_line=#000;#ff0
-marker_search=#000;#0000f0
-marker_mark=#000;#b8f4b8
-call_tips=#c0c0c0;#fff;false;false
-white_space=#c0c0c0;#fff;true;false
-
-# Programming languages
-#-------------------------------------------------------------------------------
-
-comment=#406040
-comment_doc=comment
-comment_line=comment
-comment_line_doc=comment_doc
-comment_doc_keyword=comment_doc,bold
-comment_doc_keyword_error=comment_doc,italic
-
-number=#2060a0
-number_1=number
-number_2=number_1
-
-type=#800000;;true
-class=type
-function=default
-parameter=function
-
-keyword=#0080a0;;true
-keyword_1=keyword
-keyword_2=keyword_1
-keyword_3=keyword_1
-keyword_4=keyword_1
-
-identifier=default
-identifier_1=identifier
-identifier_2=identifier_1
-identifier_3=identifier_1
-identifier_4=identifier_1
-
-string=#c03030
-string_1=string
-string_2=string_1
-string_3=default
-string_4=default
-string_eol=string_1,italic
-character=string_1
-backticks=string_2
-here_doc=string_2
-
-scalar=string_2
-label=default,bold
-preprocessor=#800000
-regex=number_1
-operator=default
-decorator=string_1,bold
-other=default
-
-# Markup-type languages
-#-------------------------------------------------------------------------------
-
-tag=#0080a0
-tag_unknown=tag
-tag_end=tag
-attribute=#8000c0
-attribute_unknown=attribute
-value=string_1
-entity=default
-
-# Diff
-#-------------------------------------------------------------------------------
-
-line_added=#008b8b
-line_removed=#6a5acd
-line_changed=preprocessor
diff --git a/home/.config/geany/colorschemes/solarized-dark.conf b/home/.config/geany/colorschemes/solarized-dark.conf
deleted file mode 100644
index 27e21ee5..00000000
--- a/home/.config/geany/colorschemes/solarized-dark.conf
+++ /dev/null
@@ -1,147 +0,0 @@
-#
-# Copyright 2011 Ethan Schoonover
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-# Ported to Geany by Joshua Hoff and
-# Matthew Brush
-#
-
-[theme_info]
-name=Solarized (dark)
-description=Dark Solarized theme for Geany
-# incremented automatically, do not change manually
-version=1225
-author=Ethan Schoonover
-url=http://ethanschoonover.com/solarized
-# list of each compatible Geany release version
-compat=1.22;1.23;1.23.1;1.24
-
-[named_colors]
-# See: http://ethanschoonover.com/solarized#the-values
-base03=#002b36
-base02=#073642
-base01=#586e75
-base00=#657b83
-base0=#839496
-base1=#93a1a1
-base2=#eee8d5
-base3=#fdf6e3
-yellow=#b58900
-orange=#cb4b16
-red=#dc322f
-magenta=#d33682
-violet=#6c71c4
-blue=#268bd2
-cyan=#2aa198
-green=#859900
-
-[named_styles]
-
-default=base0;base03
-error=red
-
-
-# Editor styles
-#-------------------------------------------------------------------------------
-selection=;#0f4d5c;;true
-current_line=;base02;true
-brace_good=base1;;true
-brace_bad=red;;true
-margin_line_number=base00;base03
-margin_folding=base00;base02
-fold_symbol_highlight=base02
-indent_guide=base01
-caret=base3
-marker_line=;
-marker_search=;base2
-marker_mark=;
-call_tips=base0;base03
-white_space=indent_guide
-
-
-# Programming languages
-#-------------------------------------------------------------------------------
-
-comment=base01
-comment_doc=comment
-comment_line=comment
-comment_line_doc=comment_doc
-comment_doc_keyword=comment_doc,bold
-comment_doc_keyword_error=comment_doc,italic
-
-number=cyan
-number_1=number
-number_2=number_1
-
-type=yellow;;true
-class=type
-function=blue
-parameter=function
-
-keyword=green;;true
-keyword_1=keyword
-keyword_2=blue;;true
-keyword_3=keyword_1
-keyword_4=keyword_1
-
-identifier=default
-identifier_1=identifier
-identifier_2=identifier_1
-identifier_3=identifier_1
-identifier_4=identifier_1
-
-string=magenta
-string_1=string
-string_2=string_1
-string_3=default
-string_4=default
-string_eol=red
-character=string_1
-backticks=string_2
-here_doc=string_2
-
-scalar=string_2
-label=default,bold
-preprocessor=orange
-regex=violet
-operator=default
-decorator=string_1,bold
-other=default
-
-
-# Markup-type languages
-#-------------------------------------------------------------------------------
-
-tag=type
-tag_unknown=tag,bold
-tag_end=tag,bold
-attribute=keyword_1
-attribute_unknown=attribute,bold
-value=string_1
-entity=default
-
-
-# Diff
-#-------------------------------------------------------------------------------
-
-line_added=green
-line_removed=red
-line_changed=blue
diff --git a/home/.config/geany/colorschemes/solarized-light.conf b/home/.config/geany/colorschemes/solarized-light.conf
deleted file mode 100644
index c3b2123c..00000000
--- a/home/.config/geany/colorschemes/solarized-light.conf
+++ /dev/null
@@ -1,147 +0,0 @@
-#
-# Copyright 2011 Ethan Schoonover
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-# Ported to Geany by Joshua Hoff and
-# Matthew Brush
-#
-
-[theme_info]
-name=Solarized (light)
-description=Light Solarized theme for Geany
-# incremented automatically, do not change manually
-version=1225
-author=Ethan Schoonover
-url=http://ethanschoonover.com/solarized
-# list of each compatible Geany release version
-compat=1.22;1.23;1.23.1;1.24
-
-[named_colors]
-# See: http://ethanschoonover.com/solarized#the-values
-base03=#002b36
-base02=#073642
-base01=#586e75
-base00=#657b83
-base0=#839496
-base1=#93a1a1
-base2=#eee8d5
-base3=#fdf6e3
-yellow=#b58900
-orange=#cb4b16
-red=#dc322f
-magenta=#d33682
-violet=#6c71c4
-blue=#268bd2
-cyan=#2aa198
-green=#859900
-
-[named_styles]
-
-default=base00;base3
-error=red
-
-
-# Editor styles
-#-------------------------------------------------------------------------------
-selection=;#dbd4be;;true
-current_line=;base2;true
-brace_good=base01;;true
-brace_bad=red;;true
-margin_line_number=base0;base3
-margin_folding=base0;base2
-fold_symbol_highlight=base2
-indent_guide=base1
-caret=base03
-marker_line=;
-marker_search=;
-marker_mark=;
-call_tips=base00;base3
-white_space=indent_guide
-
-
-# Programming languages
-#-------------------------------------------------------------------------------
-
-comment=base1
-comment_doc=comment
-comment_line=comment
-comment_line_doc=comment_doc
-comment_doc_keyword=comment_doc,bold
-comment_doc_keyword_error=comment_doc,italic
-
-number=cyan
-number_1=number
-number_2=number_1
-
-type=yellow;;true
-class=type
-function=blue
-parameter=function
-
-keyword=green;;true
-keyword_1=keyword
-keyword_2=blue;;true
-keyword_3=keyword_1
-keyword_4=keyword_1
-
-identifier=default
-identifier_1=identifier
-identifier_2=identifier_1
-identifier_3=identifier_1
-identifier_4=identifier_1
-
-string=magenta
-string_1=string
-string_2=string_1
-string_3=default
-string_4=default
-string_eol=red
-character=string_1
-backticks=string_2
-here_doc=string_2
-
-scalar=string_2
-label=default,bold
-preprocessor=orange
-regex=violet
-operator=default
-decorator=string_1,bold
-other=default
-
-
-# Markup-type languages
-#-------------------------------------------------------------------------------
-
-tag=type
-tag_unknown=tag,bold
-tag_end=tag,bold
-attribute=keyword_1
-attribute_unknown=attribute,bold
-value=string_1
-entity=default
-
-
-# Diff
-#-------------------------------------------------------------------------------
-
-line_added=green
-line_removed=red
-line_changed=blue
diff --git a/home/.config/geany/colorschemes/spyder-dark.conf b/home/.config/geany/colorschemes/spyder-dark.conf
deleted file mode 100644
index 4552b9c4..00000000
--- a/home/.config/geany/colorschemes/spyder-dark.conf
+++ /dev/null
@@ -1,118 +0,0 @@
-#
-# Copyright 2013 Paul Thompson
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301, USA.
-#
-
-[theme_info]
-name=Spyder Dark
-description= A colorscheme inspired by Xubuntu 12.04, and the Spyder IDE.
-# incremented automatically, do not change manually
-version=0
-author=Paul Thompson
-url=https://github.com/Redoubts/SpyderDark
-# list of each compatible Geany release version
-compat=1.22;1.23;1.23.1;1.24
-
-[named_styles]
-
-default=#fff;#131926;false;false
-error=#a52a2a;#131926;true;true
-
-# Editor styles
-#-------------------------------------------------------------------------------
-
-selection=#000;#a52a2a;false;true
-current_line=#000;#2b2b43;true;false
-brace_good=#fff;#4e9a06;true;false
-brace_bad=#fff;#a52a2a;true;false
-margin_line_number=#eee;#282828;false;false
-margin_folding=#888a85;#282828;false;false
-fold_symbol_highlight=#000
-indent_guide=#474545;#131926;false;false
-caret=#fff;#000;false;false
-marker_line=#000;#ff0;false;false
-marker_search=#000;#b8f4b8;false;false
-marker_mark=#000;#b8f4b8;
-call_tips=#c0c0c0;#fff;false;false
-white_space=#506369;;true
-
-# Programming languages
-#-------------------------------------------------------------------------------
-
-comment=#7f7f7f;#131926;false;false
-comment_doc=#11a642;#131926;false;true
-comment_line=comment
-comment_line_doc=comment_doc
-comment_doc_keyword=comment_doc,bold
-comment_doc_keyword_error=comment_doc,italic
-
-number=#c80000;#131926;false;false
-number_1=number
-number_2=number_1
-
-type=#fff;#131926;true;false
-class=#be5f00;#131926;true;true
-function=type
-parameter=#ffa500;#131926;true;false
-
-keyword=#8ae234;#0f0;true;false
-keyword_1=#558eff;#131926;true;false
-keyword_2=#a0a;#131926;true;false
-keyword_3=keyword_1
-keyword_4=keyword_1
-
-identifier=default
-identifier_1=identifier
-identifier_2=identifier_1
-identifier_3=identifier_1
-identifier_4=identifier_1
-
-string=#11a642;#131926;false;false
-string_1=string
-string_2=string_1
-string_3=default
-string_4=default
-string_eol=#fff;#ad7fa8;false;false
-character=string
-backticks=string_2
-here_doc=string_2
-
-scalar=string_2
-label=default,bold
-preprocessor=#ad7fa8;#131926;true;false
-regex=#4e9a06;#131926;false;false
-operator=#fff;#131926;false;false
-decorator=#be5f00;#131926;false;false
-other=default
-
-# Markup-type languages
-#-------------------------------------------------------------------------------
-
-tag=#729fcf;#131926;true;false
-tag_unknown=#fff;#8c0101;true;false
-tag_end=#7392cf;#131926;true;false
-attribute=#be5f00;#131926;false;false
-attribute_unknown=#fff;#8c0101;false;false
-value=#fff;#131926;false;false
-entity=#ad7fa8;#131926;false;false
-
-# Diff
-#-------------------------------------------------------------------------------
-
-line_removed=#729fcf;#131926;true;false
-line_added=#8ae234;#131926;true;false
-line_changed=#000;#fff;true;false
diff --git a/home/.config/geany/colorschemes/steampunk.conf b/home/.config/geany/colorschemes/steampunk.conf
deleted file mode 100644
index e3370cd5..00000000
--- a/home/.config/geany/colorschemes/steampunk.conf
+++ /dev/null
@@ -1,123 +0,0 @@
-#
-# Copyright 2013 Baptiste Darthenay
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301, USA.
-#
-#
-# Best folding style with this theme, in filedefs/filetypes.common:
-# folding_style=2,2
-#
-
-[theme_info]
-name=Steampunk
-description=A dark brown and shiny brass theme for the 19th century developer.
-version=3
-author=Baptiste Darthenay
-url=https://github.com/batisteo/geany-themes/blob/master/steampunk.conf
-# list of each compatible Geany release version
-compat=1.22;1.23;1.23.1;1.24
-
-[named_styles]
-
-default=#fea;#252016;false;false
-error=#faecbd;#a22
-
-# Editor styles
-#-------------------------------------------------------------------------------
-
-selection=#000;#605339;false;true
-current_line=#000;#342d1f;true
-brace_good=#8ab634;#514630;true
-brace_bad=#ce5c00;#484333;true
-margin_line_number=#caa223
-margin_folding=#651;#362a1d
-fold_symbol_highlight=#b79024;#252016
-indent_guide=#b79024
-caret=#d3d7cf;#000
-marker_line=#c4a000;#edd400
-marker_search=#000;#0000f0
-marker_mark=#8c5200;#cf7900
-call_tips=#ccc;#fff;false
-white_space=#650;;true
-
-# Programming languages
-#-------------------------------------------------------------------------------
-
-comment=#786442
-comment_doc=comment
-comment_line=comment
-comment_line_doc=comment_doc
-comment_doc_keyword=comment_doc,bold
-comment_doc_keyword_error=comment_doc,italic
-
-number=#fce94f
-number_1=number
-number_2=number_1
-
-type=#cf7900;;true
-class=type
-function=#cf7900
-parameter=function
-
-keyword=#cc9d22;;true
-keyword_1=keyword
-keyword_2=#729f9c
-keyword_3=keyword_1
-keyword_4=keyword_1
-
-identifier=default
-identifier_1=identifier
-identifier_2=identifier_1
-identifier_3=identifier_1
-identifier_4=identifier_1
-
-string=#ebc95d
-string_1=string
-string_2=comment,italic
-string_3=default
-string_4=default
-string_eol=string_1,italic
-character=string_1
-backticks=string_2
-here_doc=string_2
-verbatim=string
-
-scalar=string_2
-label=default,bold
-preprocessor=#729f9c
-regex=number_1
-operator=#fa5;;true
-decorator=#978;;;true
-other=default
-extra=#359
-
-# Markup-type languages
-#-------------------------------------------------------------------------------
-
-tag=#729f9c
-tag_unknown=tag
-tag_end=tag,bold
-attribute=#729f9c
-attribute_unknown=attribute
-value=string_1
-entity=default
-
-# Diff
-#-------------------------------------------------------------------------------
-
-line_added=#595
-line_removed=#a66
-line_changed=preprocessor
diff --git a/home/.config/geany/colorschemes/tango-dark.conf b/home/.config/geany/colorschemes/tango-dark.conf
deleted file mode 100644
index dacc3299..00000000
--- a/home/.config/geany/colorschemes/tango-dark.conf
+++ /dev/null
@@ -1,113 +0,0 @@
-#
-# Copyright Barry van Oudtshoorn
-#
-# No explicit license or copyright info available but available on
-# the Geany `Extras` page:
-# http://www.geany.org/Download/Extras
-# Which links to:
-# http://www.barryvan.com.au/2009/01/geany-ide-tango-dark-colour-scheme/
-# Which in turn links to a repository at:
-# https://github.com/barryvan/Geany-Tango-Dark
-#
-# Ported to Geany by Matthew Brush
-#
-
-[theme_info]
-name=Tango
-description=Loosely based on the Dark theme, but Tangofied.
-# incremented automatically, do not change manually
-version=1226
-author=Barry van Oudtshoorn
-url=https://github.com/codebrainz/geany-themes/blob/master/tango-dark.conf
-# list of each compatible Geany release version
-compat=1.22;1.23;1.23.1;1.24
-
-[named_styles]
-
-default=#eeeeec;#2e3436;false;false
-error=#fff;#f00
-
-# Editor styles
-#-------------------------------------------------------------------------------
-
-selection=#000;#626d71;false;true
-current_line=#000;#475458;true
-brace_good=#fff;#647175;true;false
-brace_bad=#eea1a8;#647175;true;false
-margin_line_number=#000;#d0d0d0
-margin_folding=#000;#dfdfdf
-fold_symbol_highlight=#fff
-indent_guide=#c0c0c0
-caret=#fbff00;#fbff00;false
-marker_line=#000;#ff0
-marker_search=#000;#0000f0
-marker_mark=#000;#b8f4b8
-call_tips=#c0c0c0;#fff;false;false
-white_space=#505050;;true
-
-# Programming languages
-#-------------------------------------------------------------------------------
-
-comment=#888a85;#2e3436;false;false
-comment_doc=comment
-comment_line=comment
-comment_line_doc=comment_doc
-comment_doc_keyword=comment_doc,bold
-comment_doc_keyword_error=comment_doc,italic
-
-number=#8ae234;#2e3436;false;false
-number_1=number
-number_2=number_1
-
-type=#eeeeec;#2e3436;false;false
-class=type
-function=default
-parameter=function
-
-keyword=#729fcf;#2e3436;true;false
-keyword_1=keyword
-keyword_2=keyword_1
-keyword_3=keyword_1
-keyword_4=keyword_1
-
-identifier=default
-identifier_1=identifier
-identifier_2=identifier_1
-identifier_3=identifier_1
-identifier_4=identifier_1
-
-string=#8ae234;#2e3436;true;false
-string_1=string
-string_2=string_1
-string_3=default
-string_4=default
-string_eol=string_1,italic
-character=string_1
-backticks=string_2
-here_doc=string_2
-
-scalar=string_2
-label=default,bold
-preprocessor=#007f7f;#2e3436;true;false
-regex=number_1
-operator=default
-decorator=string_1,bold
-other=default
-
-# Markup-type languages
-#-------------------------------------------------------------------------------
-
-tag=#729fcf;#2e3436;false;false
-tag_unknown=tag
-tag_end=tag,bold
-attribute=#729fcf;#2e3436;false;false
-attribute_unknown=attribute
-value=string_1
-entity=default
-
-# Diff
-#-------------------------------------------------------------------------------
-
-line_added=#008b8b
-line_removed=#6a5acd
-line_changed=preprocessor
diff --git a/home/.config/geany/colorschemes/tango-light.conf b/home/.config/geany/colorschemes/tango-light.conf
deleted file mode 100644
index c581fece..00000000
--- a/home/.config/geany/colorschemes/tango-light.conf
+++ /dev/null
@@ -1,120 +0,0 @@
-#
-# Copyright 2011 Colomban Wendling
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301, USA.
-#
-
-[theme_info]
-name=Tango Light
-description=A light theme using Tango colors.
-# incremented automatically, do not change manually
-version=1225
-author=Colomban Wendling
-url=https://github.com/codebrainz/geany-themes/blob/master/tango-light.conf
-# list of each compatible Geany release version
-compat=1.22;1.23;1.23.1;1.24
-
-[named_styles]
-
-default=#2e3436;#eeeeec;false;false
-error=#2e3436;#ef2929
-
-# Editor styles
-#-------------------------------------------------------------------------------
-
-selection=#2e3436;#babdb6;false;true
-current_line=#2e3436;#d3d7cf;true
-brace_good=#5c3566;;true
-brace_bad=#2e3436;#ef2929;true
-margin_line_number=#2e3436;#babdb6
-margin_folding=#2e3436;#d3d7cf
-fold_symbol_highlight=#d3d7cf
-indent_guide=#babdb6
-caret=#000;#000;false
-marker_line=#2e3436;#729fcf
-marker_search=#2e3436;#fcaf3e
-marker_mark=#2e3436;#8ae234
-call_tips=#555753;#eeeeec
-white_space=#babdb6;;true
-
-# Programming languages
-#-------------------------------------------------------------------------------
-
-comment=#c00;;;true
-comment_doc=#3465a4;;;true
-comment_line=comment
-comment_line_doc=comment_doc
-comment_doc_keyword=comment_doc,bold
-comment_doc_keyword_error=comment_doc_keyword,italic
-
-number=#4e9a06
-number_1=number
-number_2=number_1
-
-type=#4e9a06;;true
-class=type
-function=default
-parameter=function
-
-keyword=#204a87;;true
-keyword_1=keyword
-keyword_2=#a40000;;true
-keyword_3=keyword_1
-keyword_4=keyword_1
-
-identifier=default
-identifier_1=identifier
-identifier_2=identifier_1
-identifier_3=identifier_1
-identifier_4=identifier_1
-
-string=#ce5c00;;false;false
-string_1=string
-string_2=string_1
-string_3=default
-string_4=default
-string_eol=string_1,italic
-character=string_1
-backticks=string_2
-here_doc=string_2
-verbatim=string
-
-scalar=string_2
-label=default,bold
-preprocessor=#75507b
-regex=number_1
-operator=default
-decorator=string_1,bold
-other=default
-extra=#204a87
-
-# Markup-type languages
-#-------------------------------------------------------------------------------
-
-tag=#204a87;;true
-tag_unknown=tag
-tag_end=tag
-attribute=#4e9a06;;true
-attribute_unknown=attribute,italic
-value=string_1
-entity=preprocessor
-
-# Diff
-#-------------------------------------------------------------------------------
-
-line_added=#4e9a06
-line_removed=#a40000
-line_changed=#ce5c00
diff --git a/home/.config/geany/colorschemes/tinge.conf b/home/.config/geany/colorschemes/tinge.conf
deleted file mode 100644
index 540e1c61..00000000
--- a/home/.config/geany/colorschemes/tinge.conf
+++ /dev/null
@@ -1,128 +0,0 @@
-#
-# Copyright (C) 2008 - Harsh J
-# See: http://www.harshj.com/2008/01/27/tinge-theme-for-gedit/
-#
-# Tinge is a theme inspired by Monokai and improved upon Darkmate:
-# Copyright (C) 2006-2008 GtkSourceView team
-# Original author: Luigi Maselli
-# See: http://www.monokai.nl/blog/2006/07/15/textmate-color-theme/
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Library General Public
-# License as published by the Free Software Foundation; either
-# version 2 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Library General Public License for more details.
-#
-# You should have received a copy of the GNU Library General Public
-# License along with this library; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-#
-# Ported to Geany by Matthew Brush
-#
-
-[theme_info]
-name=Tinge
-description=A tinge more tanginess
-# incremented automatically, do not change manually
-version=1225
-author=Harsh J
-# alt url:
-# http://www.harshj.com/2008/01/27/tinge-theme-for-gedit/
-url=https://github.com/mig/gedit-themes/blob/master/Tinge.xml
-# list of each compatible Geany release version
-compat=1.22;1.23;1.23.1;1.24
-
-[named_styles]
-
-default=#eee;#232323;false;false
-error=;#ff2f6a;true
-
-# Editor styles
-#-------------------------------------------------------------------------------
-
-selection=#000;#555753;false;true
-current_line=#000;#6f6f6f;true
-brace_good=#b6f;#232323;true;false
-brace_bad=#eee;#232323;true;false
-margin_line_number=#bbb;#555753
-margin_folding=#000;#dfdfdf
-fold_symbol_highlight=#fff
-indent_guide=#3d3d3d
-white_space=#3d3d3d;#fff;true;false
-caret=#009cff;#000;false
-marker_line=#bbb;#555753
-marker_search=#bbb;#555753
-marker_mark=#bbb;#555753
-call_tips=#c0c0c0;#fff;false;false
-
-# Programming languages
-#-------------------------------------------------------------------------------
-
-comment=#b6f
-comment_doc=comment
-comment_line=comment
-comment_line_doc=comment_doc
-comment_doc_keyword=comment_doc,bold
-comment_doc_keyword_error=comment_doc,italic
-
-number=#ff2f6a
-number_1=number
-number_2=number_1
-
-type=#009cff;;true
-class=type
-function=#9e91ff
-parameter=function
-
-keyword=#f90;;true
-keyword_1=keyword
-keyword_2=#00c900;;true
-keyword_3=keyword_1
-keyword_4=keyword_1
-
-identifier=default
-identifier_1=identifier
-identifier_2=identifier_1
-identifier_3=identifier_1
-identifier_4=identifier_1
-
-string=#ff3a35
-string_1=string
-string_2=string_1
-string_3=default
-string_4=default
-string_eol=string_1,italic
-character=#f90
-backticks=string_2
-here_doc=string_2
-
-scalar=string_2
-label=default,bold
-preprocessor=#009cff;;true
-regex=#adb2ff
-operator=default
-decorator=#009cff
-other=default
-
-# Markup-type languages
-#-------------------------------------------------------------------------------
-
-tag=#f90
-tag_unknown=#f90
-tag_end=#f90
-attribute=#9e91ff
-attribute_unknown=#9e91ff
-value=string_1
-entity=default
-
-# Diff
-#-------------------------------------------------------------------------------
-
-line_added=#ff3a35
-line_removed=#ff79d9
-line_changed=#f90
diff --git a/home/.config/geany/colorschemes/ubuntu.conf b/home/.config/geany/colorschemes/ubuntu.conf
deleted file mode 100644
index 832f5fb6..00000000
--- a/home/.config/geany/colorschemes/ubuntu.conf
+++ /dev/null
@@ -1,116 +0,0 @@
-#
-# Copyright 2013 James Brierley
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301, USA.
-#
-
-[theme_info]
-name=Ubuntu
-description=A theme for Ubuntu fanboys and fangirls.
-version=1
-author=James Brierley
-url=
-# list of each compatible Geany release version
-compat=1.22;1.23;1.23.1;1.24
-
-[named_styles]
-
-default=#000;#fff;false;false
-error=#fff;#f00
-
-# Editor styles
-#-------------------------------------------------------------------------------
-
-selection=#000;#c0c0c0;false;true
-current_line=#000;#f0f0f0;true
-brace_good=#333;#fff;true;false
-brace_bad=#fff;#333;true;false
-margin_line_number=#000;#d0d0d0
-margin_folding=#000;#dfdfdf
-fold_symbol_highlight=#fff
-indent_guide=#c0c0c0
-caret=#000;#000;false
-marker_line=#000;#ff0
-marker_search=#000;#0000f0
-marker_mark=#000;#b8f4b8
-call_tips=#c0c0c0;#fff;false;false
-white_space=#c0c0c0;#fff;true;false
-
-# Programming languages
-#-------------------------------------------------------------------------------
-
-comment=#808080
-comment_doc=#595959
-comment_line=comment
-comment_line_doc=comment_doc
-comment_doc_keyword=comment_doc,bold
-comment_doc_keyword_error=comment_doc,italic
-
-number=#dd4814
-number_1=number
-number_2=number_1
-
-type=#5e2750;;true
-class=type
-function=#000080
-parameter=function
-
-keyword=#2c001e;;true
-keyword_1=keyword
-keyword_2=#9f0200;;true
-keyword_3=keyword_1
-keyword_4=keyword_1
-
-identifier=#151515
-identifier_1=identifier
-identifier_2=identifier_1
-identifier_3=identifier_1
-identifier_4=identifier_1
-
-string=#dd4814
-string_1=string
-string_2=string_1
-string_3=default
-string_4=default
-string_eol=#000;#e0c0e0
-character=string_1
-backticks=string_2
-here_doc=string_2
-
-label=default,bold
-preprocessor=comment_doc,bold
-regex=number_1
-operator=#5e2750
-decorator=string_1,bold
-other=#404080
-
-# Markup-type languages
-#-------------------------------------------------------------------------------
-
-tag=type
-tag_unknown=tag,bold
-tag_end=tag,bold
-attribute=keyword_1
-attribute_unknown=attribute,bold
-value=string_1
-entity=default
-
-# Diff
-#-------------------------------------------------------------------------------
-
-line_added=#008b8b
-line_removed=#6a5acd
-line_changed=preprocessor
diff --git a/home/.config/geany/colorschemes/vibrant-ink.conf b/home/.config/geany/colorschemes/vibrant-ink.conf
deleted file mode 100644
index 71c5fd27..00000000
--- a/home/.config/geany/colorschemes/vibrant-ink.conf
+++ /dev/null
@@ -1,123 +0,0 @@
-#
-# Copyright Jason Wilson
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301, USA.
-#
-# License linked from Google Projects page:
-# http://dev.perl.org/licenses/
-#
-# Ported to Geany by Matthew Brush
-#
-
-[theme_info]
-name=Vibrant
-description=Vibrant Ink Theme for Geany
-# incremented automatically, do not change manually
-version=1225
-author=Jason Wilson
-url=http://code.google.com/p/geany-vibrant-ink-theme
-# list of each compatible Geany release version
-compat=1.22;1.23;1.23.1;1.24
-
-[named_styles]
-
-default=#fff;#000;false;false
-error=#ff80c0;#000;false;false
-
-# Editor styles
-#-------------------------------------------------------------------------------
-
-selection=#8000ff;#404040;false;true
-current_line=#0080c0;#330;true;false
-brace_good=#9c9;#000;true;false
-brace_bad=#cf3;#000;true;false
-margin_line_number=#e4e4e4;#404040;false;false
-margin_folding=#222;#111;false;false
-fold_symbol_highlight=#fff
-indent_guide=#c0c0c0;;false;false
-caret=#fff;#112435;false;false
-marker_line=#0ff;#80d4b2;false;false
-marker_search=#ff0;#f00;false;false
-marker_mark=#c00000;#000;false;false
-call_tips=#c0c0c0;#fff;false;false
-white_space=#424242;;true
-
-# Programming languages
-#-------------------------------------------------------------------------------
-
-comment=#93c
-comment_doc=#772cb7;#070707;false;false
-comment_line=comment
-comment_line_doc=comment_doc
-comment_doc_keyword=comment_doc,bold
-comment_doc_keyword_error=comment_doc,italic
-
-number=#cf3
-number_1=number
-number_2=number_1
-
-type=#fff;;true;false
-class=type
-function=default
-parameter=function
-
-keyword=#f60;;true;false
-keyword_1=keyword
-keyword_2=#dde93d;;true;false
-keyword_3=keyword_1
-keyword_4=keyword_1
-
-identifier=default
-identifier_1=identifier
-identifier_2=identifier_1
-identifier_3=identifier_1
-identifier_4=identifier_1
-
-string=#6f0
-string_1=string
-string_2=string_1
-string_3=default
-string_4=default
-string_eol=#ccc;#000;false;false
-character=string_1
-backticks=string_2
-here_doc=string_2
-
-scalar=string_2
-label=default,bold
-preprocessor=#edf8f9
-regex=number_1
-operator=#fc0
-decorator=string_1,bold
-other=default
-
-# Markup-type languages
-#-------------------------------------------------------------------------------
-
-tag=#f60;#000;false;false
-tag_unknown=#fff;#000;false;false
-tag_end=#fff;#000;false;false
-attribute=#9c9;#000;false;false
-attribute_unknown=#fff;#000;false;false
-value=#f60;#000;false;false
-entity=#fff;#000;false;false
-
-# Diff
-#-------------------------------------------------------------------------------
-
-line_added=#399;#000;false;false
-line_removed=#808040;#000;false;false
-line_changed=#9c9;#000;false;false
diff --git a/home/.config/geany/colorschemes/zenburn.conf b/home/.config/geany/colorschemes/zenburn.conf
deleted file mode 100644
index 9f7cb9cf..00000000
--- a/home/.config/geany/colorschemes/zenburn.conf
+++ /dev/null
@@ -1,107 +0,0 @@
-#
-# No explicit license or copyright info available but part of the
-# `gedit-themes` project:
-# https://github.com/mig/gedit-themes/blob/master/zenburn.xml
-#
-# Ported to Geany by Matthew Brush
-#
-
-[theme_info]
-name=Zenburn
-description=A port of Zenburn from gedit-themes.
-# incremented automatically, do not change manually
-version=1226
-author=Unknown Author
-url=https://github.com/mig/gedit-themes/blob/master/zenburn.xml
-# list of each compatible Geany release version
-compat=1.22;1.23;1.23.1;1.24
-
-[named_styles]
-
-default=#dcdccc;#3f3f3f;false;false
-error=#e37170;#332323
-
-# Editor styles
-#-------------------------------------------------------------------------------
-
-selection=#000;#7d7d7d;false;true
-current_line=#000;#636363;true
-brace_good=#dcdccc;#7d7d7d;true;false
-brace_bad=#e37170;#7d7d7d;true;false
-margin_line_number=#7f8f8f;#464646
-margin_folding=#7f8f8f;#4c4c4c
-fold_symbol_highlight=#464646
-indent_guide=#666
-caret=#fff;;false
-marker_line=#000;#ff0
-marker_search=#000;#0000f0
-marker_mark=#000;#b8f4b8
-call_tips=#c0c0c0;#fff;false;false
-white_space=#666;#fff;true;false
-
-# Programming languages
-#-------------------------------------------------------------------------------
-
-comment=#7f9f7f
-comment_doc=comment
-comment_line=comment
-comment_line_doc=comment_doc
-comment_doc_keyword=comment_doc,bold
-comment_doc_keyword_error=comment_doc,italic
-
-number=#8cd0d3
-number_1=number
-number_2=number_1
-
-type=#dfdfbf;;true
-class=type
-function=#efef8f
-parameter=#efdcbc
-
-keyword=#f0dfaf;;true
-keyword_1=keyword
-keyword_2=keyword_1
-keyword_3=keyword_1
-keyword_4=keyword_1
-
-identifier=default
-identifier_1=identifier
-identifier_2=identifier_1
-identifier_3=identifier_1
-identifier_4=identifier_1
-
-string=#cc9393
-string_1=string
-string_2=string_1
-string_3=default
-string_4=default
-string_eol=string_1,italic
-character=string_1
-backticks=string_2
-here_doc=string_2
-
-scalar=string_2
-label=default,bold
-preprocessor=#ffcfaf
-regex=number_1
-operator=default
-decorator=string_1,bold
-other=default
-
-# Markup-type languages
-#-------------------------------------------------------------------------------
-
-tag=#f0dfaf
-tag_unknown=tag
-tag_end=tag
-attribute=#dfdfbf
-attribute_unknown=attribute
-value=string_1
-entity=default
-
-# Diff
-#-------------------------------------------------------------------------------
-
-line_added=#7f9f7f;;true
-line_removed=#cc9393;;true
-line_changed=preprocessor
diff --git a/home/.config/geany/geany.conf b/home/.config/geany/geany.conf
index 461c9837..dd5cd025 100644
--- a/home/.config/geany/geany.conf
+++ b/home/.config/geany/geany.conf
@@ -59,9 +59,9 @@ beep_on_errors=false
auto_focus=false
sidebar_symbol_visible=true
sidebar_openfiles_visible=true
-editor_font=DejaVu Sans Mono 10
-tagbar_font=Ubuntu Mono 10
-msgwin_font=Ubuntu Mono 10
+editor_font=monospace 11
+tagbar_font=monospace 10
+msgwin_font=monospace 10
show_notebook_tabs=true
show_tab_cross=true
tab_order_ltr=true
diff --git a/home/.config/gtk-3.0/settings.ini b/home/.config/gtk-3.0/settings.ini
index 19ec0846..5f082853 100644
--- a/home/.config/gtk-3.0/settings.ini
+++ b/home/.config/gtk-3.0/settings.ini
@@ -1,7 +1,7 @@
[Settings]
gtk-theme-name=ArchLabs-dARK
gtk-icon-theme-name=ArchLabs-Light
-gtk-font-name=Ubuntu Light 10
+gtk-font-name=monospace 10
gtk-cursor-theme-name=ArchLabs-Light
gtk-cursor-theme-size=0
gtk-toolbar-style=GTK_TOOLBAR_ICONS
diff --git a/home/.config/i3/config b/home/.config/i3/config
index d1377988..20ef6751 100644
--- a/home/.config/i3/config
+++ b/home/.config/i3/config
@@ -28,7 +28,7 @@ gaps inner 15
gaps outer 5
# font
-font pango:DejaVu Sans Mono 11
+font pango:monospace 11
# $Mod = Super or Alt?
set $Mod Mod4
diff --git a/home/.config/jgmenu/jgmenurc b/home/.config/jgmenu/jgmenurc
index decd3ffe..14e2abea 100644
--- a/home/.config/jgmenu/jgmenurc
+++ b/home/.config/jgmenu/jgmenurc
@@ -38,7 +38,7 @@ item_border = 0
sep_height = 5
-font = Ubuntu 12px
+font = monospace 12px
#font_fallback = xtg
icon_size = 24
#icon_text_spacing = 10
diff --git a/home/.config/mimeapps.list b/home/.config/mimeapps.list
deleted file mode 100644
index 712b6915..00000000
--- a/home/.config/mimeapps.list
+++ /dev/null
@@ -1,59 +0,0 @@
-[Added Associations]
-text/plain=geany.desktop;
-application/xml=geany.desktop;
-application/x-shellscript=geany.desktop;
-x-scheme-handler/http=exo-web-browser.desktop
-x-scheme-handler/https=exo-web-browser.desktop
-x-scheme-handler/mailto=exo-mail-reader.desktop
-x-scheme-handler/trash=exo-file-manager.desktop
-inode/directory=exo-file-manager.desktop;
-text/x-matlab=geany.desktop;
-application/x-theme=geany.desktop;
-application/x-desktop=geany.desktop;
-text/markdown=geany.desktop;
-text/x-python=geany.desktop;
-application/x-perl=geany.desktop;
-text/x-qml=geany.desktop;
-text/x-csrc=geany.desktop;
-application/x-executable=geany.desktop;
-application/gzip=org.gnome.FileRoller.desktop;
-application/x-compressed-tar=org.gnome.FileRoller.desktop;
-text/x-scheme=geany.desktop;
-application/octet-stream=geany.desktop;
-image/png=gpicview.desktop;
-image/gif=mpv.desktop;
-text/css=geany.desktop;
-text/x-dsrc=geany.desktop;
-text/x-cmake=geany.desktop;
-application/x-yaml=geany.desktop;
-application/x-bittorrent=deluge.desktop;
-text/x-changelog=geany.desktop;
-application/x-xbel=geany.desktop;
-text/x-lua=geany.desktop;
-application/x-tint2-theme=geany.desktop;
-audio/mpeg=audacious.desktop;
-image/jpeg=gpicview.desktop;
-application/x-asp=geany.desktop;
-video/x-msvideo=mpv.desktop;
-video/x-matroska=mpv.desktop;
-video/mpeg=mpv.desktop;
-video/mp4=mpv.desktop;
-image/vnd.adobe.photoshop=gimp.desktop;
-application/x-php=geany.desktop;
-video/quicktime=mpv.desktop;
-audio/x-wav=audacious.desktop;
-video/x-ms-wmv=mpv.desktop;
-application/pkix-cert=gcr-viewer.desktop;
-application/zip=org.gnome.FileRoller.desktop;
-application/x-pem-key=gcr-viewer.desktop;
-application/x-font-ttf=org.gnome.FontViewer.desktop;
-application/x-font-otf=org.gnome.FontViewer.desktop;
-image/x-xbitmap=viewnior.desktop;
-inode/directory=Thunar-folder-handler.desktop;
-
-[Default Applications]
-text/plain=geany.desktop
-application/x-shellscript=geany.desktop
-audio/mpeg=audacious.desktop
-video/x-msvideo=mpv.desktop
-inode/directory=Thunar-folder-handler.desktop
diff --git a/home/.config/networkmanager-dmenu/config.ini b/home/.config/networkmanager-dmenu/config.ini
index f298f27b..52010224 100644
--- a/home/.config/networkmanager-dmenu/config.ini
+++ b/home/.config/networkmanager-dmenu/config.ini
@@ -1,5 +1,5 @@
[dmenu]
-dmenu_command = rofi -location 3 -yoffset 35 -xoffset -10 -width 37 -font "DejaVu Sans Mono 11" -padding 20 -line-padding 4 -password
+dmenu_command = rofi -location 3 -yoffset 35 -xoffset -10 -width 37 -font "monospace 11" -padding 20 -line-padding 4 -password
[editor]
terminal = termite
diff --git a/home/.config/openbox/autostart b/home/.config/openbox/autostart
index 24dfe1bf..80bf7f3e 100644
--- a/home/.config/openbox/autostart
+++ b/home/.config/openbox/autostart
@@ -13,9 +13,6 @@ xfsettingsd &
# fancy window switcher
skippy-xd --config ~/.config/skippy-xd/skippy-xd.rc --start-daemon &
-# side panel shortcuts for file managers
-xdg-user-dirs-gtk-update &
-
# start the panel
al-polybar-session &
diff --git a/home/.config/openbox/menu.xml b/home/.config/openbox/menu.xml
index 4474d1cc..d0280371 100644
--- a/home/.config/openbox/menu.xml
+++ b/home/.config/openbox/menu.xml
@@ -18,13 +18,6 @@
-
-
@@ -125,23 +111,6 @@
-
diff --git a/home/.config/openbox/rc.xml b/home/.config/openbox/rc.xml
index eae4674b..dc1e9443 100644
--- a/home/.config/openbox/rc.xml
+++ b/home/.config/openbox/rc.xml
@@ -23,37 +23,37 @@
yes
no
- Roboto
+ sans
11
Normal
Normal
- Roboto
+ sans
11
Normal
Italic
- Roboto
+ sans
11
Normal
Normal
- Roboto
+ sans
10
Normal
Normal
- Roboto
+ sans
10
Normal
Normal
- Roboto
+ sans
10
Normal
Normal
diff --git a/home/.config/termite/config b/home/.config/termite/config
deleted file mode 100644
index 2c15d1f8..00000000
--- a/home/.config/termite/config
+++ /dev/null
@@ -1,43 +0,0 @@
-[options]
-scroll_on_output = false
-scroll_on_keystroke = true
-audible_bell = false
-mouse_autohide = false
-allow_bold = true
-dynamic_title = true
-urgent_on_bell = true
-clickable_url = true
-font = DejaVu Sans Mono 11
-scrollback_lines = 10000
-search_wrap = true
-icon_name = utilities-terminal
-geometry = 800x550
-clickable_url = true
-cursor_blink = system
-cursor_shape = block
-browser = exo-open
-filter_unmatched_urls = true
-
-[colors]
-background = rgba(28,32,35,0.95)
-foreground = #E1E1E1
-foreground_bold = #E1E1E1
-cursor = #707880
-
-color0 = #1c2023
-color1 = #bf616a
-color2 = #a3be8c
-color3 = #ebcb8b
-color4 = #8fa1b3
-color5 = #b48ead
-color6 = #96b5b4
-color7 = #E1E1E1
-color8 = #919ba0
-color9 = #bf616a
-color10 = #a3be8c
-color11 = #ebcb8b
-color12 = #8fa1b3
-color13 = #b48ead
-color14 = #96b5b4
-color15 = #c0c5ce
-
diff --git a/home/.config/tint2/tint2rc b/home/.config/tint2/tint2rc
index 70f912c6..be7c586a 100644
--- a/home/.config/tint2/tint2rc
+++ b/home/.config/tint2/tint2rc
@@ -108,7 +108,7 @@ taskbar_always_show_all_desktop_tasks = 0
taskbar_name_padding = 4 4
taskbar_name_background_id = 0
taskbar_name_active_background_id = 0
-taskbar_name_font = Ubuntu 10
+taskbar_name_font = monospace 10
taskbar_name_font_color = #828282 100
taskbar_name_active_font_color = #a0a0bd 100
taskbar_distribute_size = 0
@@ -123,7 +123,7 @@ task_centered = 1
urgent_nb_of_blink = 20
task_maximum_size = 36 30
task_padding = 6 2 4
-task_font = Ubuntu 10
+task_font = monospace 10
task_tooltip = 1
task_font_color = #828282 60
task_active_font_color = #828282 100
@@ -172,10 +172,10 @@ launcher_item_app = /usr/share/applications/exo-web-browser.desktop
# Clock
time1_format = %H:%M
time2_format =
-time1_font = Ubuntu 12
+time1_font = sans 12
time1_timezone =
+time2_font = sans 0
time2_timezone =
-time2_font = Ubuntu Light 0
clock_font_color = #ffffff 100
clock_padding = 10 4
clock_background_id = 5
@@ -193,8 +193,8 @@ battery_tooltip = 1
battery_low_status = 20
battery_low_cmd = notify-send "Battery Low"
battery_full_cmd =
-bat1_font = Ubuntu 11
-bat2_font = Ubuntu 0
+bat1_font = sans 11
+bat2_font = sans 0
battery_font_color = #b5b5b5 100
bat1_format =
bat2_format =
@@ -232,5 +232,5 @@ tooltip_hide_timeout = 0
tooltip_padding = 10 6
tooltip_background_id = 6
tooltip_font_color = #d8d8d8 100
-tooltip_font = Ubuntu 10
+tooltip_font = sans 10
diff --git a/home/.config/xfce4/helpers.rc b/home/.config/xfce4/helpers.rc
deleted file mode 100644
index ed607c19..00000000
--- a/home/.config/xfce4/helpers.rc
+++ /dev/null
@@ -1,3 +0,0 @@
-FileManager=Thunar
-TerminalEmulator=custom-TerminalEmulator
-WebBrowser=firefox
diff --git a/home/.config/xfce4/panel/whiskermenu-1.rc b/home/.config/xfce4/panel/whiskermenu-1.rc
index 7da17a51..1f3865ee 100644
--- a/home/.config/xfce4/panel/whiskermenu-1.rc
+++ b/home/.config/xfce4/panel/whiskermenu-1.rc
@@ -24,11 +24,11 @@ menu-height=600
menu-opacity=100
command-settings=xfce4-settings-manager
show-command-settings=true
-command-lockscreen=i3lock-fancy
-show-command-lockscreen=true
+command-lockscreen=
+show-command-lockscreen=false
command-switchuser=
show-command-switchuser=false
-command-logout=oblogout
+command-logout=xfce4-session-logout
show-command-logout=true
command-menueditor=
show-command-menueditor=false
diff --git a/home/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml b/home/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
index 9e722c7c..67a747d4 100644
--- a/home/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
+++ b/home/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
@@ -19,12 +19,10 @@
-
+
-
-
diff --git a/home/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml b/home/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
index b730f0b7..91e44f15 100644
--- a/home/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
+++ b/home/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
@@ -23,7 +23,7 @@
-
+
diff --git a/home/.icons/default/index.theme b/home/.icons/default/index.theme
deleted file mode 100644
index f2c35ee6..00000000
--- a/home/.icons/default/index.theme
+++ /dev/null
@@ -1,5 +0,0 @@
-# This file is written by LXAppearance. Do not edit.
-[Icon Theme]
-Name=Default
-Comment=Default Cursor Theme
-Inherits=ArchLabs-Light
diff --git a/home/.local/share/xfce4/helpers/custom-TerminalEmulator.desktop b/home/.local/share/xfce4/helpers/custom-TerminalEmulator.desktop
deleted file mode 100755
index 139615cc..00000000
--- a/home/.local/share/xfce4/helpers/custom-TerminalEmulator.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-NoDisplay=true
-Version=1.0
-Encoding=UTF-8
-Type=X-XFCE-Helper
-X-XFCE-Category=TerminalEmulator
-X-XFCE-CommandsWithParameter=termite "%s"
-Icon=utilities-terminal
-Name=Termite
-X-XFCE-Commands=termite
-GenericName=Terminal
diff --git a/home/.vim/colors/jinx.vim b/home/.vim/colors/jinx.vim
index e3b1d277..8cdebbd3 100644
--- a/home/.vim/colors/jinx.vim
+++ b/home/.vim/colors/jinx.vim
@@ -1,22 +1,17 @@
" ------------------- jinx ---------------------- "
" Written by Nathaniel Maia, December 2017 "
" ----------------------------------------------- "
+" vim:fdm=marker
" ---------- Setup and Checks ----------- " {{{1
-" Pre {{{2
-
-if !has('gui_running') && &t_Co != 256
- finish
-endif
if exists('syntax_on')
- highlight clear
- syntax reset
+ highlight clear
+ syntax reset
endif
let g:colors_name = 'jinx'
-
" Colors {{{1
" empty color dictionary
@@ -25,71 +20,136 @@ let s:jinx = {}
" NOTE: For those looking to edit the theme
"
" Color definition is done for both true color
-" and 256 color. The format is in ['HEX', 256color]
+" and 256 color. The format is in ['HEX', 256color, 16color]
"
-" eg. let s:jinx.black = ['#000000', 0]
+" let s:jinx.black = ['#000000', 0, 0]
" completion menu, wildmenu, and status/tab lines
-let s:jinx.menu_bgr = ['#2c3135', 238]
-let s:jinx.menu_fgr = ['#808080', 102]
-let s:jinx.menusel_bgr = ['#1F2326', 235]
-let s:jinx.menusel_fgr = ['#E1E1E1', 251]
-let s:jinx.menualt_fgr = ['#E1E1E1', 251]
-let s:jinx.menualt_bgr = ['#37383D', 237]
-let s:jinx.tabsel_bgr = ['#8DBC8D', 108]
+let s:jinx.menu_bgr = ['#4D5057', 238, 8]
+let s:jinx.menu_fgr = ['#808080', 102, 15]
+let s:jinx.menusel_bgr = ['#1F2326', 235, 0]
+let s:jinx.menusel_fgr = ['#E1E1E1', 251, 7]
+let s:jinx.menualt_fgr = ['#E1E1E1', 251, 7]
+let s:jinx.menualt_bgr = ['#37383D', 237, 0]
+let s:jinx.tabsel_bgr = ['#8DBC8D', 108, 2]
-" background, foreground, line, visual selection, folds, and comments
-" as well as standard 1-7 colors:
-" red, green, yellow, blue, purple, cyan, and orange (instead of white)
-if exists('g:jinx_colors') && g:jinx_colors =~? 'day'
+" terminal colours for :terminal {{{
+
+let g:terminal_ansi_colors = [
+ \ '#4D545E', '#FF777A', '#8DBC8D', '#FFEB56', '#6699CC', '#CC99CC', '#5DD5FF', '#E1E1E1',
+ \ '#4D545E', '#FF777A', '#8DBC8D', '#FFEB56', '#6699CC', '#CC99CC', '#5DD5FF', '#E1E1E1'
+ \ ]
+let s:i = 0
+for s:color in g:terminal_ansi_colors
+ let g:terminal_color_{s:i} = s:color
+ let s:i += 1
+endfor
+
+"}}}
+
+" background, foreground, line, visual selection, folds,
+" and comments as well as standard 1-7 colors: red, green,
+" yellow, blue, purple, cyan, and orange (instead of white)
+if exists('g:jinx_colors') && g:jinx_colors =~? 'day' "{{{
set background=light
- let s:jinx.fgr = ['#494949', 238]
- let s:jinx.bgr = ['#E1E1E1', 255]
- let s:jinx.line = ['#D0D0D0', 252]
- let s:jinx.select = ['#D0D0D0', 252]
- let s:jinx.folded = ['#B2B2B2', 249]
- let s:jinx.commnt = ['#808080', 244]
+ let s:jinx.fgr = ['#494949', 238, 0]
+ let s:jinx.bgr = ['#E1E1E1', 254, 7]
+ let s:jinx.line = ['#D0D0D0', 252, 15]
+ let s:jinx.select = ['#D0D0D0', 252, 15]
+ let s:jinx.folded = ['#B2B2B2', 249, 15]
+ let s:jinx.commnt = ['#808080', 244, 15]
+
+ let s:jinx.red = ['#EF7878', 210, 1]
+ let s:jinx.green = ['#78A078', 108, 2]
+ let s:jinx.yellow = ['#CE9D00', 178, 3]
+ let s:jinx.blue = ['#4E88CF', 32, 4]
+ let s:jinx.purple = ['#AF86C8', 140, 5]
+ let s:jinx.cyan = ['#00AFAF', 37, 6]
+ let s:jinx.orange = ['#E0914C', 166, 9]
+
+ let g:terminal_color_1 = '#EF7878'
+ let g:terminal_color_2 = '#78A078'
+ let g:terminal_color_3 = '#CE9D00'
+ let g:terminal_color_4 = '#4E88CF'
+ let g:terminal_color_5 = '#AF86C8'
+ let g:terminal_color_6 = '#00AFAF'
+ let g:terminal_color_9 = '#FF777A'
+ let g:terminal_color_10 = '#8DBC8D'
+ let g:terminal_color_11 = '#FFEB56'
+ let g:terminal_color_12 = '#6699CC'
+ let g:terminal_color_13 = '#CC99CC'
+ let g:terminal_color_14 = '#5DD5FF'
+ let g:terminal_ansi_colors = [
+ \ '#E1E1E1', '#EF7878', '#78A078', '#CE9D00', '#4E88CF', '#AF86C8', '#00AFAF', '#4D545E',
+ \ '#E1E1E1', '#FF777A', '#8DBC8D', '#FFEB56', '#6699CC', '#CC99CC', '#5DD5FF', '#4D545E'
+ \ ]
+ let s:i = 0
+ for s:color in g:terminal_ansi_colors
+ let g:terminal_color_{s:i} = s:color
+ let s:i += 1
+ endfor
+
+elseif exists('g:jinx_colors') && g:jinx_colors =~? 'midnight'
+ let s:jinx.menu_bgr = ['#2c3135', 237, 0]
- let s:jinx.red = ['#EF7878', 210]
- let s:jinx.green = ['#78A078', 108]
- let s:jinx.yellow = ['#CE9D00', 178]
- let s:jinx.blue = ['#4E88CF', 32]
- let s:jinx.purple = ['#AF86C8', 140]
- let s:jinx.cyan = ['#00AFAF', 37]
- let s:jinx.orange = ['#E0914C', 172]
-else
set background=dark
- let s:jinx.fgr = ['#E1E1E1', 255]
- let s:jinx.bgr = ['#1c2023', 234]
- let s:jinx.line = ['#2c3135', 67]
- let s:jinx.select = ['#2c3135', 67]
- let s:jinx.folded = ['#414449', 239]
- let s:jinx.commnt = ['#B9B9B9', 102]
+ let s:jinx.fgr = ['#E1E1E1', 253, 7]
+ let s:jinx.bgr = ['#40464F', 234, 0]
+ let s:jinx.line = ['#2c3135', 237, 15]
+ let s:jinx.select = ['#2c3135', 237, 15]
+ let s:jinx.folded = ['#414449', 240, 15]
+ let s:jinx.commnt = ['#B9B9B9', 102, 15]
- let s:jinx.red = ['#FF777A', 210]
- let s:jinx.green = ['#8DBC8D', 108]
- let s:jinx.yellow = ['#FFEB56', 220]
- let s:jinx.blue = ['#6699CC', 32]
- let s:jinx.purple = ['#CC99CC', 140]
- let s:jinx.cyan = ['#5DD5FF', 81]
- let s:jinx.orange = ['#FF9157', 208]
-endif
+ let s:jinx.red = ['#FF777A', 210, 1]
+ let s:jinx.green = ['#8DBC8D', 108, 2]
+ let s:jinx.yellow = ['#FFEB56', 220, 3]
+ let s:jinx.blue = ['#6699CC', 32, 4]
+ let s:jinx.purple = ['#CC99CC', 140, 5]
+ let s:jinx.cyan = ['#5DD5FF', 81, 6]
+ let s:jinx.orange = ['#FF9157', 208, 9]
+else
+ " night
+ set background=dark
+ let s:jinx.fgr = ['#E1E1E1', 254, 7]
+ let s:jinx.bgr = ['#4D545E', 237, 0]
+ let s:jinx.line = ['#5F6772', 243, 8]
+ let s:jinx.select = ['#5F6772', 243, 1]
+ let s:jinx.folded = ['#414449', 239, 8]
+ let s:jinx.commnt = ['#B9B9B9', 250, 8]
-function! HighLight(GRP, FG, BG, ATT) abort " {{{1
+ let s:jinx.red = ['#FF777A', 210, 1]
+ let s:jinx.green = ['#8DBC8D', 108, 2]
+ let s:jinx.yellow = ['#FFEB56', 220, 3]
+ let s:jinx.blue = ['#6699CC', 32, 4]
+ let s:jinx.purple = ['#CC99CC', 140, 5]
+ let s:jinx.cyan = ['#5DD5FF', 81, 6]
+ let s:jinx.orange = ['#FF9157', 208, 9]
+
+endif "}}}
+
+function! HighLight(GRP, FG, BG, ATT) abort " {{{1
if a:FG !=# ''
let l:fg_col = get(s:jinx, a:FG)
let l:fg_true = l:fg_col[0]
- let l:fg_term = l:fg_col[1]
+ if $TERM =~? 'linux' || &t_Co < 256
+ let l:fg_term = l:fg_col[2]
+ else
+ let l:fg_term = l:fg_col[1]
+ endif
exec 'highlight! '.a:GRP.' guifg='.l:fg_true.' ctermfg='.l:fg_term
endif
if a:BG !=# ''
let l:bg_col = get(s:jinx, a:BG)
let l:bg_true = l:bg_col[0]
- let l:bg_term = l:bg_col[1]
+ if $TERM =~? 'linux' || &t_Co < 256
+ let l:bg_term = l:bg_col[2]
+ else
+ let l:bg_term = l:bg_col[1]
+ endif
exec 'highlight! '.a:GRP.' guibg='.l:bg_true.' ctermbg='.l:bg_term
endif
- if a:ATT !=# ''
+ if a:ATT !=# '' && &t_Co >= 256
exec 'highlight! '.a:GRP.' gui='.a:ATT.' cterm='.a:ATT
endif
endfunction
@@ -99,10 +159,10 @@ endfunction
" Editor {{{2
-call HighLight('Title', 'commnt', 'bgr', 'bold')
+call HighLight('Title', 'commnt', 'bgr', 'bold')
call HighLight('Visual', '', 'select', '')
call HighLight('SignColumn', '', 'line', '')
-call HighLight('CursorLine', '', 'line', 'none')
+call HighLight('CursorLine', '', 'line', 'none')
call HighLight('CursorColumn', '', 'line', '')
call HighLight('CursorLineNr', 'cyan', 'line', '')
call HighLight('LineNr', 'commnt', 'line', '')
@@ -110,7 +170,7 @@ call HighLight('ColorColumn', 'fgr', 'red', '')
call HighLight('Error', 'red', 'bgr', '')
call HighLight('ErrorMsg', 'red', 'bgr', '')
call HighLight('WarningMsg', 'red', 'bgr', '')
-call HighLight('MatchParen', 'blue', 'bgr', 'bold')
+call HighLight('MatchParen', 'yellow', 'bgr', 'bold')
call HighLight('ModeMsg', 'cyan', 'bgr', '')
call HighLight('MoreMsg', 'cyan', 'bgr', '')
call HighLight('Directory', 'blue', 'bgr', '')
@@ -119,43 +179,46 @@ call HighLight('NonText', 'commnt', 'bgr', '')
call HighLight('SpecialKey', 'commnt', 'bgr', '')
call HighLight('Folded', 'commnt', 'folded', '')
call HighLight('Search', 'bgr', 'blue', '')
+call HighLight('HLNext', 'bgr', 'red', 'bold')
call HighLight('Normal', 'fgr', 'bgr', '')
call HighLight('VertSplit', 'menu_bgr', 'menu_fgr', '')
" Tabline {{{2
-call HighLight('TabLine', 'menu_fgr', 'menu_bgr', 'none')
-call HighLight('TabLineFill', 'menu_bgr', 'menu_bgr', '')
-call HighLight('TabLineSel', 'tabsel_bgr', 'menu_bgr', 'bold')
+call HighLight('TabLine', 'menusel_fgr', 'menu_bgr', 'none')
+call HighLight('TabLineFill', 'menu_bgr', 'menu_bgr', '')
+call HighLight('TabLineSel', 'menu_bgr', 'tabsel_bgr', 'bold')
call HighLight('WildMenu', 'menusel_fgr', 'menu_bgr', 'bold')
call HighLight('Pmenu', 'menusel_fgr', 'menu_bgr', 'bold')
call HighLight('PmenuSel', 'menusel_bgr', 'menusel_fgr', 'bold')
-call HighLight('PmenuSbar', 'menu_fgr', 'menu_bgr', '')
-call HighLight('PmenuThumb', 'menu_fgr', 'menu_bgr', '')
-call HighLight('StatusLine', 'menu_bgr', 'menu_fgr', '')
-call HighLight('StatusLineNC', 'menu_fgr', 'menu_bgr', '')
+call HighLight('PmenuSbar', 'menu_fgr', 'menu_bgr', '')
+call HighLight('PmenuThumb', 'menu_fgr', 'menu_bgr', '')
+call HighLight('StatusLine', 'menu_bgr', 'menusel_fgr', '')
+call HighLight('StatusLineNC', 'menu_bgr', 'menu_fgr', '')
-if has('spell') " {{{2
- call HighLight('SpellBad', '', '', 'undercurl')
- call HighLight('SpellLocal', '', '', 'undercurl')
- call HighLight('SpellRare', '', '', 'undercurl')
-endif
+" Spelling {{{2
+call HighLight('SpellBad', '', '', 'underline')
+call HighLight('SpellLocal', '', '', 'underline')
+call HighLight('SpellRare', '', '', 'underline')
-if exists('g:loaded_ctrlp') " {{{2
- call HighLight('CtrlPNoEntries', 'red', '', 'bold')
- call HighLight('CtrlPMatch', 'blue', '', 'bold')
- call HighLight('CtrlPLinePre', 'blue', 'menu_bgr', 'none')
- call HighLight('CtrlPPrtBase', 'blue', '', 'none')
- call HighLight('CtrlPPrtCursor', 'menu_fgr', 'menu_bgr', 'bold')
- call HighLight('CtrlPMode1', 'menu_fgr', 'menu_bgr', 'bold')
- call HighLight('CtrlPMode2', 'menu_fgr', 'menu_bgr', 'bold')
- call HighLight('CtrlPStats', 'menu_fgr', 'menu_bgr', 'bold')
-endif
+" Ctrl-P {{{2
+call HighLight('CtrlPNoEntries', 'red', '', 'bold')
+call HighLight('CtrlPMatch', 'blue', '', 'bold')
+call HighLight('CtrlPLinePre', 'blue', 'menu_bgr', 'none')
+call HighLight('CtrlPPrtBase', 'blue', '', 'none')
+call HighLight('CtrlPPrtCursor', 'menu_fgr', 'menu_bgr', 'bold')
+call HighLight('CtrlPMode1', 'menu_fgr', 'menu_bgr', 'bold')
+call HighLight('CtrlPMode2', 'menu_fgr', 'menu_bgr', 'bold')
+call HighLight('CtrlPStats', 'menu_fgr', 'menu_bgr', 'bold')
-if exists('g:loaded_ale') " {{{2
- call HighLight('ALEErrorSign', 'red', 'line', 'bold')
- call HighLight('ALEWarningSign', 'orange', 'line', 'bold')
-endif
+" ALE linter {{{2
+
+call HighLight('ALEErrorSign', 'red', 'line', '')
+call HighLight('ALEWarningSign', 'orange', 'line', '')
+call HighLight('ALEError', 'red', '', 'underline')
+call HighLight('ALEWarning', 'red', '', 'underline')
+call HighLight('ALEStyleError', 'orange', '', 'underline')
+call HighLight('ALEStyleWarning', 'orange', '', 'underline')
" Generic {{{2
@@ -182,7 +245,7 @@ call HighLight('Macro', 'purple', '', 'bold')
call HighLight('Special', 'purple', '', 'bold')
call HighLight('TypeDef', 'purple', '', 'bold')
call HighLight('Define', 'yellow', '', 'bold')
-call HighLight('Constant', 'yellow', '', 'bold')
+call HighLight('Constant', 'purple', '', 'bold')
call HighLight('PreProc', 'yellow', '', '')
call HighLight('Identifier', 'yellow', '', 'bold')
call HighLight('PreCondit', 'yellow', '', '')
@@ -191,22 +254,29 @@ call HighLight('Conceal', 'orange', '', '')
" Vim {{{2
-call HighLight('vimCommand', 'green', '', 'bold')
-call HighLight('vimGroup', 'yellow', '', 'bold')
-call HighLight('vimGroupName', 'yellow', '', 'bold')
-call HighLight('VimFunction', 'orange', '', 'bold')
-call HighLight('vimMapModKey', 'purple', '', 'bold')
-call HighLight('vimBracket', 'purple', '', 'bold')
-call HighLight('vimOption', 'purple', '', 'bold')
-call HighLight('vimMapMod', 'purple', '', '')
-call HighLight('vimNotation', 'purple', '', '')
+call HighLight('vimCommand', 'green', '', 'bold')
+call HighLight('vimVar', 'yellow', '', 'bold')
+call HighLight('vimGroup', 'yellow', '', 'bold')
+call HighLight('vimGroupName', 'yellow', '', 'bold')
+call HighLight('VimFunction', 'orange', '', 'bold')
+call HighLight('VimFunctionKey', 'orange', '', 'bold')
+call HighLight('vimMapModKey', 'purple', '', 'bold')
+call HighLight('vimBracket', 'purple', '', 'bold')
+call HighLight('vimOption', 'purple', '', 'bold')
+call HighLight('vimMapMod', 'purple', '', '')
+call HighLight('vimNotation', 'purple', '', '')
" Shell {{{2
+call HighLight('shSet', 'green', '', 'bold')
+call HighLight('shLoop', 'green', '', 'bold')
+call HighLight('shTestOpr', 'green', '', 'bold')
+call HighLight('shConstant', 'yellow', '', 'bold')
+call HighLight('shFunctionKey', 'orange', '', 'bold')
call HighLight('shStatement', 'green', '', 'bold')
call HighLight('shKeyword', 'purple', '', 'bold')
-call HighLight('zshStatement', 'purple', '', 'bold')
-call HighLight('zshOption', 'purple', '', 'bold')
+call HighLight('zshStatement', 'green', '', 'bold')
+call HighLight('zshOption', 'green', '', 'bold')
call HighLight('zshFunction', 'orange', '', 'bold')
call HighLight('zshVariableDef', 'yellow', '', '')
call HighLight('zshOperator', 'blue', '', 'bold')
@@ -245,28 +315,36 @@ call HighLight('rubyConstant', 'yellow', '', '')
" Python {{{2
-call HighLight('pythonRun', 'red', '', '')
-call HighLight('pythonDecorator', 'red', '', 'bold')
-call HighLight('pythonExClass', 'blue', '', '')
-call HighLight('pythonException', 'blue', '', 'bold')
-call HighLight('pythonExceptions', 'blue', '', 'bold')
-call HighLight('pythonEscape', 'blue', '', '')
-call HighLight('pythonImport', 'green', '', 'bold')
-call HighLight('pythonRepeat', 'green', '', '')
-call HighLight('pythonCoding', 'green', '', '')
-call HighLight('pythonInclude', 'green', '', 'bold')
-call HighLight('pythonPreCondit', 'green', '', '')
-call HighLight('pythonStatement', 'green', '', 'bold')
-call HighLight('pythonConditional', 'green', '', '')
-call HighLight('pythonDef', 'yellow', '', 'bold')
-call HighLight('pythonBuiltin', 'purple', '', 'bold')
-call HighLight('pythonBuiltinObj', 'purple', '', 'bold')
-call HighLight('pythonBuiltinFunc', 'orange', '', 'bold')
-call HighLight('pythonDot', 'orange', '', 'bold')
-call HighLight('pythonLambda', 'orange', '', '')
-call HighLight('pythonFunction', 'orange', '', 'bold')
-call HighLight('pythonDottedName', 'orange', '', '')
-call HighLight('pythonBuiltinObjs', 'orange', '', '')
+call HighLight('pythonRun', 'red', '', '')
+call HighLight('pythonOperator', 'blue', '', 'bold')
+call HighLight('pythonClass', 'blue', '', '')
+call HighLight('pythonClassParameters', 'purple', '', '')
+call HighLight('pythonParam', 'purple', '', '')
+call HighLight('pythonDecorator', 'blue', '', 'bold')
+call HighLight('pythonExClass', 'blue', '', '')
+call HighLight('pythonException', 'blue', '', 'bold')
+call HighLight('pythonExceptions', 'blue', '', 'bold')
+call HighLight('pythonBrackets', 'blue', '', '')
+call HighLight('pythonEscape', 'blue', '', '')
+call HighLight('pythonImport', 'green', '', 'bold')
+call HighLight('pythonRepeat', 'green', '', '')
+call HighLight('pythonCoding', 'green', '', '')
+call HighLight('pythonInclude', 'green', '', 'bold')
+call HighLight('pythonPreCondit', 'green', '', '')
+call HighLight('pythonStatement', 'green', '', 'bold')
+call HighLight('pythonConditional', 'green', '', '')
+call HighLight('pythonDef', 'yellow', '', 'bold')
+call HighLight('pythonSelf', 'blue', '', 'bold')
+call HighLight('pythonBuiltinType', 'purple', '', 'bold')
+call HighLight('pythonBuiltin', 'purple', '', 'bold')
+call HighLight('pythonBuiltinObj', 'purple', '', 'bold')
+call HighLight('pythonBuiltinFunc', 'orange', '', 'bold')
+call HighLight('pythonDot', 'orange', '', 'bold')
+call HighLight('pythonLambda', 'orange', '', '')
+call HighLight('pythonLambdaExpr', 'orange', '', '')
+call HighLight('pythonFunction', 'orange', '', 'bold')
+call HighLight('pythonDottedName', 'orange', '', '')
+call HighLight('pythonBuiltinObjs', 'orange', '', '')
" LaTeX {{{2
@@ -435,5 +513,3 @@ call HighLight('DiffText', 'line', 'blue', 'bold')
" Remove the highlight function as it's no longer needed.
" Will cause problems reloading the theme if not deleted.
delfunction HighLight
-
-" vim:fdm=marker:et:sts=4:sw=4
diff --git a/home/.vimrc b/home/.vimrc
index 81c6f43a..a78c43a9 100644
--- a/home/.vimrc
+++ b/home/.vimrc
@@ -112,6 +112,9 @@ nnoremap ==j
vnoremap > >gv
vnoremap < nn :set number!
+
" j = gj :: k = gk while preserving numbered jumps eg. 12j
nnoremap j v:count ? 'j' : 'gj'
nnoremap k v:count ? 'k' : 'gk'
@@ -172,72 +175,6 @@ endif
" ------ adv maps ------
-" visual quote surround
-vnoremap ;' :call QuickWrap("'")
-vnoremap ;" :call QuickWrap('"')
-
-" quote 'surround'
-nnoremap ;' ciW''P
-nnoremap ;'' ciw''P
-nnoremap ;" ciW""