diff --git a/colorschemes/iterm/AdventureTime.itermcolors b/config/colorschemes/iterm/AdventureTime.itermcolors
similarity index 100%
rename from colorschemes/iterm/AdventureTime.itermcolors
rename to config/colorschemes/iterm/AdventureTime.itermcolors
diff --git a/colorschemes/iterm/AlienBlood.itermcolors b/config/colorschemes/iterm/AlienBlood.itermcolors
similarity index 100%
rename from colorschemes/iterm/AlienBlood.itermcolors
rename to config/colorschemes/iterm/AlienBlood.itermcolors
diff --git a/colorschemes/iterm/Argonaut.itermcolors b/config/colorschemes/iterm/Argonaut.itermcolors
similarity index 100%
rename from colorschemes/iterm/Argonaut.itermcolors
rename to config/colorschemes/iterm/Argonaut.itermcolors
diff --git a/colorschemes/iterm/CrayonPonyFish.itermcolors b/config/colorschemes/iterm/CrayonPonyFish.itermcolors
similarity index 100%
rename from colorschemes/iterm/CrayonPonyFish.itermcolors
rename to config/colorschemes/iterm/CrayonPonyFish.itermcolors
diff --git a/colorschemes/iterm/Flatland.itermcolors b/config/colorschemes/iterm/Flatland.itermcolors
similarity index 100%
rename from colorschemes/iterm/Flatland.itermcolors
rename to config/colorschemes/iterm/Flatland.itermcolors
diff --git a/colorschemes/iterm/Floraverse.itermcolors b/config/colorschemes/iterm/Floraverse.itermcolors
similarity index 100%
rename from colorschemes/iterm/Floraverse.itermcolors
rename to config/colorschemes/iterm/Floraverse.itermcolors
diff --git a/colorschemes/iterm/ForestBlue.itermcolors b/config/colorschemes/iterm/ForestBlue.itermcolors
similarity index 100%
rename from colorschemes/iterm/ForestBlue.itermcolors
rename to config/colorschemes/iterm/ForestBlue.itermcolors
diff --git a/colorschemes/iterm/FunForrest.itermcolors b/config/colorschemes/iterm/FunForrest.itermcolors
similarity index 100%
rename from colorschemes/iterm/FunForrest.itermcolors
rename to config/colorschemes/iterm/FunForrest.itermcolors
diff --git a/colorschemes/iterm/Grape.itermcolors b/config/colorschemes/iterm/Grape.itermcolors
similarity index 100%
rename from colorschemes/iterm/Grape.itermcolors
rename to config/colorschemes/iterm/Grape.itermcolors
diff --git a/colorschemes/iterm/Harper.itermcolors b/config/colorschemes/iterm/Harper.itermcolors
similarity index 100%
rename from colorschemes/iterm/Harper.itermcolors
rename to config/colorschemes/iterm/Harper.itermcolors
diff --git a/colorschemes/iterm/IC_Green_PPL.itermcolors b/config/colorschemes/iterm/IC_Green_PPL.itermcolors
similarity index 100%
rename from colorschemes/iterm/IC_Green_PPL.itermcolors
rename to config/colorschemes/iterm/IC_Green_PPL.itermcolors
diff --git a/colorschemes/iterm/IC_Orange_PPL.itermcolors b/config/colorschemes/iterm/IC_Orange_PPL.itermcolors
similarity index 100%
rename from colorschemes/iterm/IC_Orange_PPL.itermcolors
rename to config/colorschemes/iterm/IC_Orange_PPL.itermcolors
diff --git a/colorschemes/iterm/Jellybeans.itermcolors b/config/colorschemes/iterm/Jellybeans.itermcolors
similarity index 100%
rename from colorschemes/iterm/Jellybeans.itermcolors
rename to config/colorschemes/iterm/Jellybeans.itermcolors
diff --git a/colorschemes/iterm/Lab Fox.itermcolors b/config/colorschemes/iterm/Lab Fox.itermcolors
similarity index 100%
rename from colorschemes/iterm/Lab Fox.itermcolors
rename to config/colorschemes/iterm/Lab Fox.itermcolors
diff --git a/colorschemes/iterm/MonaLisa.itermcolors b/config/colorschemes/iterm/MonaLisa.itermcolors
similarity index 100%
rename from colorschemes/iterm/MonaLisa.itermcolors
rename to config/colorschemes/iterm/MonaLisa.itermcolors
diff --git a/colorschemes/iterm/Monokai Remastered.itermcolors b/config/colorschemes/iterm/Monokai Remastered.itermcolors
similarity index 100%
rename from colorschemes/iterm/Monokai Remastered.itermcolors
rename to config/colorschemes/iterm/Monokai Remastered.itermcolors
diff --git a/colorschemes/iterm/Nocturnal Winter.itermcolors b/config/colorschemes/iterm/Nocturnal Winter.itermcolors
similarity index 100%
rename from colorschemes/iterm/Nocturnal Winter.itermcolors
rename to config/colorschemes/iterm/Nocturnal Winter.itermcolors
diff --git a/colorschemes/iterm/Purple Rain.itermcolors b/config/colorschemes/iterm/Purple Rain.itermcolors
similarity index 100%
rename from colorschemes/iterm/Purple Rain.itermcolors
rename to config/colorschemes/iterm/Purple Rain.itermcolors
diff --git a/colorschemes/iterm/Royal.itermcolors b/config/colorschemes/iterm/Royal.itermcolors
similarity index 100%
rename from colorschemes/iterm/Royal.itermcolors
rename to config/colorschemes/iterm/Royal.itermcolors
diff --git a/colorschemes/iterm/SeaShells.itermcolors b/config/colorschemes/iterm/SeaShells.itermcolors
similarity index 100%
rename from colorschemes/iterm/SeaShells.itermcolors
rename to config/colorschemes/iterm/SeaShells.itermcolors
diff --git a/colorschemes/iterm/Shaman.itermcolors b/config/colorschemes/iterm/Shaman.itermcolors
similarity index 100%
rename from colorschemes/iterm/Shaman.itermcolors
rename to config/colorschemes/iterm/Shaman.itermcolors
diff --git a/colorschemes/iterm/Slate.itermcolors b/config/colorschemes/iterm/Slate.itermcolors
similarity index 100%
rename from colorschemes/iterm/Slate.itermcolors
rename to config/colorschemes/iterm/Slate.itermcolors
diff --git a/colorschemes/iterm/Sundried.itermcolors b/config/colorschemes/iterm/Sundried.itermcolors
similarity index 100%
rename from colorschemes/iterm/Sundried.itermcolors
rename to config/colorschemes/iterm/Sundried.itermcolors
diff --git a/colorschemes/iterm/The Hulk.itermcolors b/config/colorschemes/iterm/The Hulk.itermcolors
similarity index 100%
rename from colorschemes/iterm/The Hulk.itermcolors
rename to config/colorschemes/iterm/The Hulk.itermcolors
diff --git a/colorschemes/iterm/Tomorrow Night Blue.itermcolors b/config/colorschemes/iterm/Tomorrow Night Blue.itermcolors
similarity index 100%
rename from colorschemes/iterm/Tomorrow Night Blue.itermcolors
rename to config/colorschemes/iterm/Tomorrow Night Blue.itermcolors
diff --git a/colorschemes/iterm/Tomorrow Night Burns.itermcolors b/config/colorschemes/iterm/Tomorrow Night Burns.itermcolors
similarity index 100%
rename from colorschemes/iterm/Tomorrow Night Burns.itermcolors
rename to config/colorschemes/iterm/Tomorrow Night Burns.itermcolors
diff --git a/colorschemes/iterm/Ubuntu.itermcolors b/config/colorschemes/iterm/Ubuntu.itermcolors
similarity index 100%
rename from colorschemes/iterm/Ubuntu.itermcolors
rename to config/colorschemes/iterm/Ubuntu.itermcolors
diff --git a/colorschemes/iterm/Urple.itermcolors b/config/colorschemes/iterm/Urple.itermcolors
similarity index 100%
rename from colorschemes/iterm/Urple.itermcolors
rename to config/colorschemes/iterm/Urple.itermcolors
diff --git a/colorschemes/iterm/WildCherry.itermcolors b/config/colorschemes/iterm/WildCherry.itermcolors
similarity index 100%
rename from colorschemes/iterm/WildCherry.itermcolors
rename to config/colorschemes/iterm/WildCherry.itermcolors
diff --git a/colorschemes/iterm/WrynAutumn.itermcolors b/config/colorschemes/iterm/WrynAutumn.itermcolors
similarity index 100%
rename from colorschemes/iterm/WrynAutumn.itermcolors
rename to config/colorschemes/iterm/WrynAutumn.itermcolors
diff --git a/colorschemes/iterm/WrynSummer.itermcolors b/config/colorschemes/iterm/WrynSummer.itermcolors
similarity index 100%
rename from colorschemes/iterm/WrynSummer.itermcolors
rename to config/colorschemes/iterm/WrynSummer.itermcolors
diff --git a/colorschemes/iterm/ayu.itermcolors b/config/colorschemes/iterm/ayu.itermcolors
similarity index 100%
rename from colorschemes/iterm/ayu.itermcolors
rename to config/colorschemes/iterm/ayu.itermcolors
diff --git a/colorschemes/kitty/AdventureTime.conf b/config/colorschemes/kitty/AdventureTime.conf
similarity index 100%
rename from colorschemes/kitty/AdventureTime.conf
rename to config/colorschemes/kitty/AdventureTime.conf
diff --git a/colorschemes/kitty/AlienBlood.conf b/config/colorschemes/kitty/AlienBlood.conf
similarity index 100%
rename from colorschemes/kitty/AlienBlood.conf
rename to config/colorschemes/kitty/AlienBlood.conf
diff --git a/colorschemes/kitty/Argonaut.conf b/config/colorschemes/kitty/Argonaut.conf
similarity index 100%
rename from colorschemes/kitty/Argonaut.conf
rename to config/colorschemes/kitty/Argonaut.conf
diff --git a/colorschemes/kitty/CrayonPonyFish.conf b/config/colorschemes/kitty/CrayonPonyFish.conf
similarity index 100%
rename from colorschemes/kitty/CrayonPonyFish.conf
rename to config/colorschemes/kitty/CrayonPonyFish.conf
diff --git a/colorschemes/kitty/Flatland.conf b/config/colorschemes/kitty/Flatland.conf
similarity index 100%
rename from colorschemes/kitty/Flatland.conf
rename to config/colorschemes/kitty/Flatland.conf
diff --git a/colorschemes/kitty/Floraverse.conf b/config/colorschemes/kitty/Floraverse.conf
similarity index 100%
rename from colorschemes/kitty/Floraverse.conf
rename to config/colorschemes/kitty/Floraverse.conf
diff --git a/colorschemes/kitty/FunForrest.conf b/config/colorschemes/kitty/FunForrest.conf
similarity index 100%
rename from colorschemes/kitty/FunForrest.conf
rename to config/colorschemes/kitty/FunForrest.conf
diff --git a/colorschemes/kitty/Grape.conf b/config/colorschemes/kitty/Grape.conf
similarity index 100%
rename from colorschemes/kitty/Grape.conf
rename to config/colorschemes/kitty/Grape.conf
diff --git a/colorschemes/kitty/Harper.conf b/config/colorschemes/kitty/Harper.conf
similarity index 100%
rename from colorschemes/kitty/Harper.conf
rename to config/colorschemes/kitty/Harper.conf
diff --git a/colorschemes/kitty/IC_Green_PPL.conf b/config/colorschemes/kitty/IC_Green_PPL.conf
similarity index 100%
rename from colorschemes/kitty/IC_Green_PPL.conf
rename to config/colorschemes/kitty/IC_Green_PPL.conf
diff --git a/colorschemes/kitty/IC_Orange_PPL.conf b/config/colorschemes/kitty/IC_Orange_PPL.conf
similarity index 100%
rename from colorschemes/kitty/IC_Orange_PPL.conf
rename to config/colorschemes/kitty/IC_Orange_PPL.conf
diff --git a/colorschemes/kitty/Jellybeans.conf b/config/colorschemes/kitty/Jellybeans.conf
similarity index 100%
rename from colorschemes/kitty/Jellybeans.conf
rename to config/colorschemes/kitty/Jellybeans.conf
diff --git a/colorschemes/kitty/MonaLisa.conf b/config/colorschemes/kitty/MonaLisa.conf
similarity index 100%
rename from colorschemes/kitty/MonaLisa.conf
rename to config/colorschemes/kitty/MonaLisa.conf
diff --git a/colorschemes/kitty/Royal.conf b/config/colorschemes/kitty/Royal.conf
similarity index 100%
rename from colorschemes/kitty/Royal.conf
rename to config/colorschemes/kitty/Royal.conf
diff --git a/colorschemes/kitty/SeaShells.conf b/config/colorschemes/kitty/SeaShells.conf
similarity index 100%
rename from colorschemes/kitty/SeaShells.conf
rename to config/colorschemes/kitty/SeaShells.conf
diff --git a/colorschemes/kitty/Shaman.conf b/config/colorschemes/kitty/Shaman.conf
similarity index 100%
rename from colorschemes/kitty/Shaman.conf
rename to config/colorschemes/kitty/Shaman.conf
diff --git a/colorschemes/kitty/Slate.conf b/config/colorschemes/kitty/Slate.conf
similarity index 100%
rename from colorschemes/kitty/Slate.conf
rename to config/colorschemes/kitty/Slate.conf
diff --git a/colorschemes/kitty/Sundried.conf b/config/colorschemes/kitty/Sundried.conf
similarity index 100%
rename from colorschemes/kitty/Sundried.conf
rename to config/colorschemes/kitty/Sundried.conf
diff --git a/colorschemes/kitty/The_Hulk.conf b/config/colorschemes/kitty/The_Hulk.conf
similarity index 100%
rename from colorschemes/kitty/The_Hulk.conf
rename to config/colorschemes/kitty/The_Hulk.conf
diff --git a/colorschemes/kitty/Tomorrow_Night_Blue.conf b/config/colorschemes/kitty/Tomorrow_Night_Blue.conf
similarity index 100%
rename from colorschemes/kitty/Tomorrow_Night_Blue.conf
rename to config/colorschemes/kitty/Tomorrow_Night_Blue.conf
diff --git a/colorschemes/kitty/Ubuntu.conf b/config/colorschemes/kitty/Ubuntu.conf
similarity index 100%
rename from colorschemes/kitty/Ubuntu.conf
rename to config/colorschemes/kitty/Ubuntu.conf
diff --git a/colorschemes/kitty/Urple.conf b/config/colorschemes/kitty/Urple.conf
similarity index 100%
rename from colorschemes/kitty/Urple.conf
rename to config/colorschemes/kitty/Urple.conf
diff --git a/colorschemes/kitty/WildCherry.conf b/config/colorschemes/kitty/WildCherry.conf
similarity index 100%
rename from colorschemes/kitty/WildCherry.conf
rename to config/colorschemes/kitty/WildCherry.conf
diff --git a/colorschemes/kitty/WrynAutumn.conf b/config/colorschemes/kitty/WrynAutumn.conf
similarity index 100%
rename from colorschemes/kitty/WrynAutumn.conf
rename to config/colorschemes/kitty/WrynAutumn.conf
diff --git a/colorschemes/kitty/ayu.conf b/config/colorschemes/kitty/ayu.conf
similarity index 100%
rename from colorschemes/kitty/ayu.conf
rename to config/colorschemes/kitty/ayu.conf
diff --git a/colorschemes/vim/codedark.vim b/config/colorschemes/vim/codedark.vim
similarity index 100%
rename from colorschemes/vim/codedark.vim
rename to config/colorschemes/vim/codedark.vim
diff --git a/colorschemes/vim/lanox.vim b/config/colorschemes/vim/lanox.vim
similarity index 100%
rename from colorschemes/vim/lanox.vim
rename to config/colorschemes/vim/lanox.vim
diff --git a/colorschemes/vim/lilydjwg_dark.vim b/config/colorschemes/vim/lilydjwg_dark.vim
similarity index 100%
rename from colorschemes/vim/lilydjwg_dark.vim
rename to config/colorschemes/vim/lilydjwg_dark.vim
diff --git a/colorschemes/vim/made_of_code.vim b/config/colorschemes/vim/made_of_code.vim
similarity index 100%
rename from colorschemes/vim/made_of_code.vim
rename to config/colorschemes/vim/made_of_code.vim
diff --git a/colorschemes/vim/moss.vim b/config/colorschemes/vim/moss.vim
similarity index 100%
rename from colorschemes/vim/moss.vim
rename to config/colorschemes/vim/moss.vim
diff --git a/colorschemes/vim/nightsky.vim b/config/colorschemes/vim/nightsky.vim
similarity index 100%
rename from colorschemes/vim/nightsky.vim
rename to config/colorschemes/vim/nightsky.vim
diff --git a/colorschemes/vim/pf_earth.vim b/config/colorschemes/vim/pf_earth.vim
similarity index 100%
rename from colorschemes/vim/pf_earth.vim
rename to config/colorschemes/vim/pf_earth.vim
diff --git a/colorschemes/vim/skittles_autumn.vim b/config/colorschemes/vim/skittles_autumn.vim
similarity index 100%
rename from colorschemes/vim/skittles_autumn.vim
rename to config/colorschemes/vim/skittles_autumn.vim
diff --git a/colorschemes/vim/skittles_berry.vim b/config/colorschemes/vim/skittles_berry.vim
similarity index 100%
rename from colorschemes/vim/skittles_berry.vim
rename to config/colorschemes/vim/skittles_berry.vim
diff --git a/colorschemes/vim/tigrana-256-dark.vim b/config/colorschemes/vim/tigrana-256-dark.vim
similarity index 100%
rename from colorschemes/vim/tigrana-256-dark.vim
rename to config/colorschemes/vim/tigrana-256-dark.vim
diff --git a/colorschemes/vim/up.vim b/config/colorschemes/vim/up.vim
similarity index 100%
rename from colorschemes/vim/up.vim
rename to config/colorschemes/vim/up.vim
diff --git a/colorschemes/vim/update_colorschemes b/config/colorschemes/vim/update_colorschemes
similarity index 100%
rename from colorschemes/vim/update_colorschemes
rename to config/colorschemes/vim/update_colorschemes
diff --git a/colorschemes/vim/vice.vim b/config/colorschemes/vim/vice.vim
similarity index 100%
rename from colorschemes/vim/vice.vim
rename to config/colorschemes/vim/vice.vim
diff --git a/config/kitty/theme.conf b/config/kitty/theme.conf
deleted file mode 100644
index 6c039aa..0000000
--- a/config/kitty/theme.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-background #0A0603
-foreground #F4E2C8
-cursor #e5591c
-selection_background #e5591c
-color0 #000000
-color8 #b3f7ad
-color1 #d5252b
-color9 #D33449
-color2 #58DD5A
-color10 #83E613
-color3 #bd8a13
-color11 #ffca1b
-color4 #ffd900
-color12 #ffbc00
-color5 #7B0467
-color13 #B400BC
-color6 #d98112
-color14 #FF9E3C
-color7 #875FCA
-color15 #F9FFDE
-selection_foreground #1B0024
diff --git a/osx_iterm2/favourite_themes b/osx_iterm2/favourite_themes
deleted file mode 100644
index 9ee6cda..0000000
--- a/osx_iterm2/favourite_themes
+++ /dev/null
@@ -1,37 +0,0 @@
-ForestBlue
-
-
-ayu			- Black background cyan folders
-Adventure Time		- Purple and bright colors
-Purple Rain		- Darker background Adventure Time
-AlienBlood		- Dark Green
-Argonaut		- Dark Blue-grey and visible colors
-Lavandula		- Like Argonaut but with lavander instead of blue files
-Floraverse		- Dark Violet and visible colors
-Grape			- Dark Purple and faded white-colors
-Batman			- Batman colors
-Monokai Remastered	- Dark background and purple directories
-CrayonPonyFish		- Burgundy/Redish theme
-Flatland		- Grey on bluish standard text
-FunForrest		- Autumn-esk colors
-LabFox			- Autumn-esk colors
-Harper			- Black with shades of green
-IC-Green		- Light gray with shades of green
-IC-Orange		- Light gray with shades of orange
-Jelly Beans		- Dark gray with faded colors
-Mona Lisa		- Dark burgundy background with light colors
-Nocturnal Winter	- Wintery/Dark
-Royal			- Dark on Dark (legible!)
-Seashells		- Like ForestBlue with lighter blues and oranges
-Shaman			- Dark on Dark (legible!) cool colors
-Slate			- Grey with blue-scale scheme
-Sundried		- Dark grey with tomatoelike feel and blue folders
-Symfonic		- Dark grey with clear colors
-TheHulk			- Dark with bright greens
-TomorrowNightBlue	- Lighter blue background (still dark)
-TomorrowNightBurns	- Dark with red-scale colors
-Ubuntu			- Ubuntu
-UnderTheSea		- Forrest Blue with brighter colors
-Urple			- Dark with purple and orange
-WildCherry		- Darker Ubuntu:q
-