diff --git a/Jolly GTK Themes/Jolly-GTK/gtk-2.0/apps.rc b/Jolly GTK Themes/Jolly-GTK/gtk-2.0/apps.rc
new file mode 100644
index 0000000..3561f45
--- /dev/null
+++ b/Jolly GTK Themes/Jolly-GTK/gtk-2.0/apps.rc	
@@ -0,0 +1,157 @@
+#
+# Thunar
+#
+style "thunar-handle" { GtkPaned::handle-size = 2 }
+
+style "dark-sidebar" {
+  GtkTreeView::odd_row_color = @dark_sidebar_bg
+  GtkTreeView::even_row_color = @dark_sidebar_bg
+
+
+  base[NORMAL] = @dark_sidebar_bg
+  base[INSENSITIVE] = @dark_sidebar_bg
+
+  text[NORMAL] = "#bac8df"
+  text[ACTIVE] = @selected_fg_color
+  text[SELECTED] = @selected_fg_color
+}
+
+style "thunar-frame" {
+  xthickness = 0
+  ythickness = 0
+}
+
+widget_class "*ThunarWindow*.<GtkScrolledWindow>"       style "thunar-frame"
+widget_class "*ThunarShortcutsView*"                    style "dark-sidebar"
+widget_class "*ThunarTreeView*"                         style "dark-sidebar"
+widget_class "*ThunarWindow*.<GtkHPaned>"               style "thunar-handle"
+
+#
+# Workaround for colored entries
+#
+style "entry_border" {
+
+  xthickness = 7
+  ythickness = 5
+
+  engine "pixmap" {
+
+    image {
+      function = SHADOW
+      state = NORMAL
+      detail = "entry"
+      file = "assets/entry-border-bg.png"
+      border = {6, 6, 6, 6}
+      stretch = TRUE
+    }
+
+    image {
+      function = SHADOW
+      state = ACTIVE
+      detail = "entry"
+      file = "assets/entry-border-active-bg.png"
+      border = {6, 6, 6, 6}
+      stretch = TRUE
+    }
+
+    image {
+      function = FLAT_BOX
+      state    = ACTIVE
+      detail   = "entry_bg"
+      file     = "assets/null.png"
+    }
+
+    image {
+      function = FLAT_BOX
+      state    = INSENSITIVE
+      detail   = "entry_bg"
+      file     = "assets/null.png"
+    }
+
+    image {
+      function = FLAT_BOX
+      detail   = "entry_bg"
+      file     = "assets/null.png"
+    }
+  }
+}
+
+style "combobox_entry_border" = "combobox_entry" {
+
+  engine "pixmap" {
+
+    image {
+      function = SHADOW
+      detail = "entry"
+      state = NORMAL
+      shadow = IN
+      file = "assets/combo-entry-border.png"
+      border = { 4, 4, 12, 12 }
+      stretch = TRUE
+      direction = LTR
+    }
+
+    image {
+      function = SHADOW
+      detail = "entry"
+      state = ACTIVE
+      file = "assets/combo-entry-border-focus.png"
+      border = { 4, 4, 12, 12 }
+      stretch = TRUE
+      direction = LTR
+    }
+
+    image {
+      function = SHADOW
+      detail = "entry"
+      state = NORMAL
+      shadow = IN
+      file = "assets/combo-entry-border-rtl.png"
+      border = { 4, 4, 12, 12 }
+      stretch = TRUE
+      direction = RTL
+    }
+
+    image {
+      function = SHADOW
+      detail = "entry"
+      state = ACTIVE
+      file = "assets/combo-entry-border-focus-rtl.png"
+      border = { 4, 4, 12, 12 }
+      stretch = TRUE
+      direction = RTL
+    }
+
+    image {
+      function = FLAT_BOX
+      state    = INSENSITIVE
+      detail   = "entry_bg"
+      file     = "assets/null.png"
+    }
+
+    image {
+      function = FLAT_BOX
+      detail   = "entry_bg"
+      file     = "assets/null.png"
+    }
+  }
+}
+
+
+# Mousepad search entry
+widget_class "*MousepadSearchBar*.<GtkEntry>"         style "entry_border"
+
+# Mousepad find and replace
+widget_class "*MousepadReplaceDialog*.<GtkEntry>"     style "entry_border"
+
+# Thunar bulk rename
+widget_class "*ThunarRenamerDialog*.<GtkEntry>"         style "entry_border"
+
+# Hexchat input box
+class "SexySpellEntry"                                style:highest "entry_border"
+
+# Geany search entries
+widget "*GeanyToolbar.*geany-search-entry-no-match*"style "entry_border"
+widget "*GeanyToolbar.*GtkEntry*"style "entry_border"
+
+widget "GeanyDialogSearch.*GtkComboBoxEntry*.*geany-search-entry-no-match*"style "combobox_entry_border"
diff --git a/Jolly GTK Themes/Jolly-GTK/gtk-2.0/hacks-dark.rc b/Jolly GTK Themes/Jolly-GTK/gtk-2.0/hacks-dark.rc
new file mode 100644
index 0000000..126ba8a
--- /dev/null
+++ b/Jolly GTK Themes/Jolly-GTK/gtk-2.0/hacks-dark.rc	
@@ -0,0 +1,16 @@
+# vim:set ft=gtkrc ts=2 sw=2 sts=2 ai et:
+#
+# GTK+ 2 hardcodes a light shadow under certain inactive things. We can use this
+# horrible workaround to make it at least distinguishable.
+
+style "dark_insensitive" {
+
+  fg[INSENSITIVE]   = "#8f949a"
+  text[INSENSITIVE] = "#8f949a"
+
+}
+
+widget_class "*<GtkButton>*"style "dark_insensitive"
+widget_class "*<GtkComboBoxText>.<GtkCellView>"style "dark_insensitive"
+widget_class "*<GtkMenuItem>*"style "dark_insensitive"
+widget_class "*<GtkMenuBar>.<GtkMenuItem>.<GtkLabel>"style "dark_insensitive"
diff --git a/Jolly GTK Themes/Jolly-GTK/gtk-2.0/hacks.rc b/Jolly GTK Themes/Jolly-GTK/gtk-2.0/hacks.rc
new file mode 100644
index 0000000..6abf427
--- /dev/null
+++ b/Jolly GTK Themes/Jolly-GTK/gtk-2.0/hacks.rc	
@@ -0,0 +1,36 @@
+# vim:set ft=gtkrc ts=2 sw=2 sts=2 ai et:
+#
+# This file contains horrible hacks to make this theme work with some programs
+# This is mostly due to the limitations of gtk2 but sometimes its the fault of
+# the programs themselves. Not going to point fingers.
+#
+# Either way, it's a WONTFIX for both, hence this horrible file.
+
+style "toplevel_hack" {
+  engine "adwaita" {}
+}
+
+style "chrome_entry" {
+  base[NORMAL]      = @base_color
+  base[INSENSITIVE] = @base_color
+}
+
+style "vim_notebook" {
+  bg[NORMAL] = @base_color
+  bg[ACTIVE] = @insensitive_bg_color
+}
+
+# Vim puts an eventbox between the tab and the label and colours it,
+# we need to handle that
+widget "vim-main-window*GtkNotebook.GtkEventBox" style "vim_notebook"
+
+# (he)xchat input box
+class "SexySpellEntry"style:highest "normal_entry"
+
+# Chromium uses base as the fill colour of its own entries
+# This would be fine but Gtk+ uses it to fill the surrounding space, so its set to bg
+# That results in Chromium using it for the fill, so we need to handle that
+widget_class "*Chrom*<GtkEntry>"style "chrome_entry"
+
+# Hack to be able to match widgets in LibreOffice
+class "GtkWindow"style "toplevel_hack"