diff --git a/Theme/Chicago95/gtk-3.0/gtk-headerbars.css b/Theme/Chicago95/gtk-3.0/gtk-headerbars.css
index 34f9a73..4f60f9a 100644
--- a/Theme/Chicago95/gtk-3.0/gtk-headerbars.css
+++ b/Theme/Chicago95/gtk-3.0/gtk-headerbars.css
@@ -29,7 +29,7 @@ headerbar,
   headerbar .subtitle,
   headerbar > checkbutton label,
   .titlebar > checkbutton label {
-    font-size: 8pt;
+    /*font-size: 8pt;*/ /* This can control font size in the headerbar */
     color: @window_title_text_color; }
     headerbar .title:backdrop,
     headerbar .subtitle:backdrop,
diff --git a/Theme/Chicago95/gtk-3.0/gtk-headerbars_no-csd.css b/Theme/Chicago95/gtk-3.0/gtk-headerbars_no-csd.css
new file mode 100644
index 0000000..9b13efd
--- /dev/null
+++ b/Theme/Chicago95/gtk-3.0/gtk-headerbars_no-csd.css
@@ -0,0 +1,34 @@
+/**************
+ * Headerbars *
+ * ************/
+
+/*
+   Contributor notes:
+   Please use two space indentions.
+   Stack all related and child selectors and selector states into a logical hierarchy to a readable degree.
+   Make sure that all changes made here are part of the GtkHeaderbar.
+*/
+
+/* This applies to GTK Client Side Decorations (CSD) */
+
+headerbar,
+.titlebar {
+  padding: 0px;
+  padding-left: 2px;
+  padding-right: 2px;
+  background-color: @bg_color;
+  background-image: none;
+  text-shadow: none; }
+  headerbar entry {
+    margin: 3px;
+    padding-top: 1px;
+    padding-bottom: 1px; }
+  headerbar separator {
+    margin-right: 3px;
+    border-left-width: 1px;
+    border-style: solid; }
+  headerbar scale {
+    margin-top: 4px;
+    margin-bottom: -6px; }
+  headerbar .titlebutton * {
+    -gtk-icon-style: requested; }
diff --git a/Theme/Chicago95/gtk-3.0/gtk-popovers.css b/Theme/Chicago95/gtk-3.0/gtk-popovers.css
index 2926484..08096df 100644
--- a/Theme/Chicago95/gtk-3.0/gtk-popovers.css
+++ b/Theme/Chicago95/gtk-3.0/gtk-popovers.css
@@ -72,7 +72,8 @@ margin-left: 2px;
 margin-top: 2px;
 margin-bottom: 2px; }
   popover list row:hover {
-    background-color: @bg_bright; }
+    background-color: @selected_bg_color;
+    color: @selected_fg_color }
   popover list row checkbutton {
     box-shadow: none;  }
   popover list row checkbutton label,
diff --git a/Theme/Chicago95/gtk-3.0/gtk-titlebars_no-csd.css b/Theme/Chicago95/gtk-3.0/gtk-titlebars_no-csd.css
new file mode 100644
index 0000000..0081dd2
--- /dev/null
+++ b/Theme/Chicago95/gtk-3.0/gtk-titlebars_no-csd.css
@@ -0,0 +1,68 @@
+/*************
+ * Titlebars *
+ *************/
+
+/*
+   Contributor notes:
+   Please use two space indentions.
+   Stack all related and child selectors and selector states into a logical hierarchy to a readable degree.
+   Make sure that all changes made here are part of the titlebar.
+*/
+
+.titlebar button {
+  margin: 0px;
+  padding: 0px;
+  min-height: 16px;
+  min-width: 16px; }
+  .titlebar button label  {
+    padding-left: 4px;
+    padding-right: 4px; }
+  /* The following button definitions allows us to have slim buttons on
+   * headerbars with no big elements while still maintaining a good
+   * looking headerbar with big elements */
+  .titlebar button {
+    padding-top: 0px;
+    padding-bottom: 0px;
+    padding-left: 1px;
+    padding-right: 1px;
+    margin-top: 4px;
+    margin-bottom: 4px;
+    min-height: 16px;
+    min-width: 16px; }
+
+window.ssd.maximized headerbar,
+window.ssd.maximized .titlebar {
+  border: 0px;
+  border-bottom: 1px solid transparent;
+  box-shadow: none;
+  margin: 0px; }
+
+.maximized > decoration,
+window.maximized,
+window.tiled {
+  border: 0px;
+  box-shadow: none;
+  margin: 0px; }
+
+.tiled headerbar,
+.maximized headerbar,
+.tiled .titlebar,
+.maximized .titlebar {
+  border: 0px;
+  box-shadow: none;
+  border-radius: 0; }
+
+/* Remove the frame seen in Lireoffice. */
+window > grid > grid > scrolledwindow {
+  border: none;
+  box-shadow: none;
+  color: @font_color;
+  text-shadow: none; }
+
+headerbar.titlebar {
+  border-top: 1px solid @border_shade;
+  box-shadow: inset 0px 1px @border_bright; }
+  paned.titlebar headerbar,
+  paned.titlebar .titlebar {
+    border-top: none;
+    box-shadow: none; }
diff --git a/Theme/Chicago95/gtk-3.0/gtk.css b/Theme/Chicago95/gtk-3.0/gtk.css
index 6d284e8..5197721 100755
--- a/Theme/Chicago95/gtk-3.0/gtk.css
+++ b/Theme/Chicago95/gtk-3.0/gtk.css
@@ -162,12 +162,14 @@
 @import url("gtk-combobox.css");
 @import url("gtk-scrollbar.css");
 @import url("gtk-assistant.css");
-@import url("gtk-headerbars.css");
+@import url("gtk-headerbars.css"); /* Comment out for gtk3-nocsd theme */
+/*@import url("gtk-headerbars_no-csd.css");*/ /* Uncomment for gtk3-nocsd theme */
 @import url("gtk-menu.css");
 @import url("gtk-notebooks.css");
 @import url("gtk-progressbar.css");
 @import url("gtk-popovers.css");
-@import url("gtk-titlebars.css");
+@import url("gtk-titlebars.css"); /* Comment out for gtk3-nocsd theme */
+/*@import url("gtk-titlebars_no-csd.css");*/ /* Uncomment for gtk3-nocsd theme */
 @import url("gtk-toolbar.css");
 @import url("gtk-window.css");
 @import url("gtk-windowbuttons.css");
diff --git a/Theme/Chicago95/gtk-3.24/gtk-headerbars.css b/Theme/Chicago95/gtk-3.24/gtk-headerbars.css
index 34f9a73..4f60f9a 100644
--- a/Theme/Chicago95/gtk-3.24/gtk-headerbars.css
+++ b/Theme/Chicago95/gtk-3.24/gtk-headerbars.css
@@ -29,7 +29,7 @@ headerbar,
   headerbar .subtitle,
   headerbar > checkbutton label,
   .titlebar > checkbutton label {
-    font-size: 8pt;
+    /*font-size: 8pt;*/ /* This can control font size in the headerbar */
     color: @window_title_text_color; }
     headerbar .title:backdrop,
     headerbar .subtitle:backdrop,
diff --git a/Theme/Chicago95/gtk-3.24/gtk-headerbars_no-csd.css b/Theme/Chicago95/gtk-3.24/gtk-headerbars_no-csd.css
new file mode 100644
index 0000000..9b13efd
--- /dev/null
+++ b/Theme/Chicago95/gtk-3.24/gtk-headerbars_no-csd.css
@@ -0,0 +1,34 @@
+/**************
+ * Headerbars *
+ * ************/
+
+/*
+   Contributor notes:
+   Please use two space indentions.
+   Stack all related and child selectors and selector states into a logical hierarchy to a readable degree.
+   Make sure that all changes made here are part of the GtkHeaderbar.
+*/
+
+/* This applies to GTK Client Side Decorations (CSD) */
+
+headerbar,
+.titlebar {
+  padding: 0px;
+  padding-left: 2px;
+  padding-right: 2px;
+  background-color: @bg_color;
+  background-image: none;
+  text-shadow: none; }
+  headerbar entry {
+    margin: 3px;
+    padding-top: 1px;
+    padding-bottom: 1px; }
+  headerbar separator {
+    margin-right: 3px;
+    border-left-width: 1px;
+    border-style: solid; }
+  headerbar scale {
+    margin-top: 4px;
+    margin-bottom: -6px; }
+  headerbar .titlebutton * {
+    -gtk-icon-style: requested; }
diff --git a/Theme/Chicago95/gtk-3.24/gtk-popovers.css b/Theme/Chicago95/gtk-3.24/gtk-popovers.css
index 2926484..08096df 100644
--- a/Theme/Chicago95/gtk-3.24/gtk-popovers.css
+++ b/Theme/Chicago95/gtk-3.24/gtk-popovers.css
@@ -72,7 +72,8 @@ margin-left: 2px;
 margin-top: 2px;
 margin-bottom: 2px; }
   popover list row:hover {
-    background-color: @bg_bright; }
+    background-color: @selected_bg_color;
+    color: @selected_fg_color }
   popover list row checkbutton {
     box-shadow: none;  }
   popover list row checkbutton label,
diff --git a/Theme/Chicago95/gtk-3.24/gtk-titlebars_no-csd.css b/Theme/Chicago95/gtk-3.24/gtk-titlebars_no-csd.css
new file mode 100644
index 0000000..0081dd2
--- /dev/null
+++ b/Theme/Chicago95/gtk-3.24/gtk-titlebars_no-csd.css
@@ -0,0 +1,68 @@
+/*************
+ * Titlebars *
+ *************/
+
+/*
+   Contributor notes:
+   Please use two space indentions.
+   Stack all related and child selectors and selector states into a logical hierarchy to a readable degree.
+   Make sure that all changes made here are part of the titlebar.
+*/
+
+.titlebar button {
+  margin: 0px;
+  padding: 0px;
+  min-height: 16px;
+  min-width: 16px; }
+  .titlebar button label  {
+    padding-left: 4px;
+    padding-right: 4px; }
+  /* The following button definitions allows us to have slim buttons on
+   * headerbars with no big elements while still maintaining a good
+   * looking headerbar with big elements */
+  .titlebar button {
+    padding-top: 0px;
+    padding-bottom: 0px;
+    padding-left: 1px;
+    padding-right: 1px;
+    margin-top: 4px;
+    margin-bottom: 4px;
+    min-height: 16px;
+    min-width: 16px; }
+
+window.ssd.maximized headerbar,
+window.ssd.maximized .titlebar {
+  border: 0px;
+  border-bottom: 1px solid transparent;
+  box-shadow: none;
+  margin: 0px; }
+
+.maximized > decoration,
+window.maximized,
+window.tiled {
+  border: 0px;
+  box-shadow: none;
+  margin: 0px; }
+
+.tiled headerbar,
+.maximized headerbar,
+.tiled .titlebar,
+.maximized .titlebar {
+  border: 0px;
+  box-shadow: none;
+  border-radius: 0; }
+
+/* Remove the frame seen in Lireoffice. */
+window > grid > grid > scrolledwindow {
+  border: none;
+  box-shadow: none;
+  color: @font_color;
+  text-shadow: none; }
+
+headerbar.titlebar {
+  border-top: 1px solid @border_shade;
+  box-shadow: inset 0px 1px @border_bright; }
+  paned.titlebar headerbar,
+  paned.titlebar .titlebar {
+    border-top: none;
+    box-shadow: none; }
diff --git a/Theme/Chicago95/gtk-3.24/gtk.css b/Theme/Chicago95/gtk-3.24/gtk.css
index 6d284e8..5197721 100755
--- a/Theme/Chicago95/gtk-3.24/gtk.css
+++ b/Theme/Chicago95/gtk-3.24/gtk.css
@@ -162,12 +162,14 @@
 @import url("gtk-combobox.css");
 @import url("gtk-scrollbar.css");
 @import url("gtk-assistant.css");
-@import url("gtk-headerbars.css");
+@import url("gtk-headerbars.css"); /* Comment out for gtk3-nocsd theme */
+/*@import url("gtk-headerbars_no-csd.css");*/ /* Uncomment for gtk3-nocsd theme */
 @import url("gtk-menu.css");
 @import url("gtk-notebooks.css");
 @import url("gtk-progressbar.css");
 @import url("gtk-popovers.css");
-@import url("gtk-titlebars.css");
+@import url("gtk-titlebars.css"); /* Comment out for gtk3-nocsd theme */
+/*@import url("gtk-titlebars_no-csd.css");*/ /* Uncomment for gtk3-nocsd theme */
 @import url("gtk-toolbar.css");
 @import url("gtk-window.css");
 @import url("gtk-windowbuttons.css");