diff --git a/source/ubinstall-gtk-startup-apps.c b/source/ubinstall-gtk-startup-apps.c
index dc82b88..62b23bb 100644
--- a/source/ubinstall-gtk-startup-apps.c
+++ b/source/ubinstall-gtk-startup-apps.c
@@ -36,7 +36,7 @@ void on_startup_apps_remove(GtkWidget *self,main_window *widgets){
         data->action_text = SERVICE_REMOVE_CONFIRMATION_LABEL(unit);
         data->title = SERVICE_REMOVE_TITLE_LABEL;
         if (yon_confirmation_dialog_call(self,data) == GTK_RESPONSE_ACCEPT){
-            gtk_list_store_remove(widgets->StartupList,&iter);
+            gtk_list_store_remove(GTK_LIST_STORE(model),&iter);
         }
     }
 }
@@ -172,7 +172,7 @@ void on_startup_app_add(GtkWidget *, main_window *widgets){
 
 void on_startup_app_edit(GtkWidget *, main_window *widgets){
     GtkTreeIter iter;
-    if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->StartupServicesTree)),NULL,&iter)){
+    if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->StartupAppsTree)),NULL,&iter)){
         char *app, *unit, *description;
         int status;
         gtk_tree_model_get(GTK_TREE_MODEL(widgets->StartupAppsList),&iter,1,&unit,2,&app,3,&description,4,&status,-1);
diff --git a/ubinstall-gtk.css b/ubinstall-gtk.css
index ca4778b..78c51dd 100644
--- a/ubinstall-gtk.css
+++ b/ubinstall-gtk.css
@@ -168,11 +168,13 @@ treeview row:nth-child(odd) { background-color: #000000; }
 treeview row:nth-child(even) { background-color: #ffffff; }
 
 .blackbg {
-	background-color: @theme_text_color;
+	background-color: @titlebar_fg_color;
 }
 
 .toggletabs {
-	background-color: @background_color;
+	background-color: inherit;
+	background-image: none;
+	color:@theme_text_color;
 	border:none;
 	border-radius:0px;
 	transition:0;
@@ -181,7 +183,9 @@ treeview row:nth-child(even) { background-color: #ffffff; }
 }
 
 .toggletabs:disabled {
-	background-color: @background_color;
+	background-color: inherit;
+	background-image: none;
+	color:@theme_base_color;
 	border:none;
 	border-radius:0px;
 	transition:0;
@@ -192,6 +196,8 @@ treeview row:nth-child(even) { background-color: #ffffff; }
 
 .toggletabs:checked:disabled {
 	background:@theme_base_color;
+	background-image: none;
+	color:@theme_text_color;
 	border-radius:0px;
 	color:@theme_text_color;
 	padding-top:7px;
@@ -201,6 +207,7 @@ treeview row:nth-child(even) { background-color: #ffffff; }
 
 .toggletabs:checked:disabled>* {
 	background:@theme_base_color;
+	background-image: none;
 	color:@theme_text_color;
 	opacity:1;
 }
@@ -208,6 +215,8 @@ treeview row:nth-child(even) { background-color: #ffffff; }
 
 .toggletabs:checked:active:disabled {
 	background:@theme_base_color;
+	background-image: none;
+	color:@theme_text_color;
 	border-radius:0px;
 	color:inherit;
 	padding-top:7px;
@@ -217,7 +226,9 @@ treeview row:nth-child(even) { background-color: #ffffff; }
 
 
 .toggletabs:disabled:active {
-	background-color: @theme_base_color;
+	background-color: inherit;
+	background-image: none;
+	color:@theme_bg_color;
 	border:none;
 	border-radius:0px;
 	transition:0;
@@ -227,7 +238,9 @@ treeview row:nth-child(even) { background-color: #ffffff; }
 	opacity:1;
 }
 .toggletabs:active {
-	background-color: @theme_base_color;
+	background-color: @theme_fg_color;
+	background-image: none;
+	color:@theme_bg_color;
 	border:none;
 	border-radius:0px;
 	transition:0;
@@ -238,10 +251,11 @@ treeview row:nth-child(even) { background-color: #ffffff; }
 }
 
 .menubox {
-	background-color:@theme_text_color;
+	background-color:inherit;
 }
 .menubox *{
-	color:@theme_base_color;
+	color:@theme_fg_color;
+	opacity:1;
 }
 .bggrey{
 	border-radius:5px;
diff --git a/ubinstall-gtk.glade b/ubinstall-gtk.glade
index 90fd88d..cff08b2 100644
--- a/ubinstall-gtk.glade
+++ b/ubinstall-gtk.glade
@@ -646,6 +646,7 @@
                         </child>
                         <style>
                           <class name="toggletabs"/>
+                          <class name="titlebar"/>
                           <class name="thin"/>
                         </style>
                       </object>
@@ -802,7 +803,8 @@ agreement</property>
                   </packing>
                 </child>
                 <style>
-                  <class name="blackbg"/>
+                  <class name="titlebar"/>
+                  <class name="thin"/>
                 </style>
               </object>
               <packing>