diff --git a/colorNew.go b/colorNew.go
index 66661e3..ca333f9 100644
--- a/colorNew.go
+++ b/colorNew.go
@@ -43,14 +43,13 @@ func (tk *guiWidget) setColorWindowFrame() {
 		tk.color.bg = gocui.ColorBlack
 		tk.color.selFg = gocui.AttrNone
 		tk.color.selBg = gocui.AttrNone
-		tk.updateColor()
-		return
+	} else {
+		tk.color.frame = gocui.AttrNone
+		tk.color.fg = gocui.AttrNone
+		tk.color.bg = gocui.AttrNone
+		tk.color.selFg = gocui.AttrNone
+		tk.color.selBg = gocui.AttrNone
 	}
-	tk.color.frame = gocui.AttrNone
-	tk.color.fg = gocui.AttrNone
-	tk.color.bg = gocui.AttrNone
-	tk.color.selFg = gocui.AttrNone
-	tk.color.selBg = gocui.AttrNone
 
 	tk.updateColor()
 }
@@ -66,14 +65,13 @@ func (tk *guiWidget) setColorWindowTitleActive() {
 		tk.color.bg = gocui.AttrNone
 		tk.color.selFg = gocui.ColorWhite
 		tk.color.selBg = gocui.ColorBlue
-		tk.updateColor()
-		return
+	} else {
+		tk.color.frame = gocui.ColorWhite
+		tk.color.fg = gocui.ColorWhite
+		tk.color.bg = gocui.ColorBlue
+		tk.color.selFg = gocui.ColorWhite
+		tk.color.selBg = gocui.ColorBlue
 	}
-	tk.color.frame = gocui.ColorWhite
-	tk.color.fg = gocui.ColorWhite
-	tk.color.bg = gocui.ColorBlue
-	tk.color.selFg = gocui.ColorWhite
-	tk.color.selBg = gocui.ColorBlue
 
 	tk.updateColor()
 }
@@ -88,14 +86,13 @@ func (tk *guiWidget) setColorWindowTitle() {
 		tk.color.bg = gocui.AttrNone
 		tk.color.selFg = gocui.ColorWhite
 		tk.color.selBg = gocui.ColorBlue
-		tk.updateColor()
-		return
+	} else {
+		tk.color.frame = gocui.ColorWhite
+		tk.color.fg = gocui.ColorBlue
+		tk.color.bg = gocui.AttrNone
+		tk.color.selFg = gocui.ColorWhite
+		tk.color.selBg = gocui.ColorBlue
 	}
-	tk.color.frame = gocui.ColorWhite
-	tk.color.fg = gocui.ColorBlue
-	tk.color.bg = gocui.AttrNone
-	tk.color.selFg = gocui.ColorWhite
-	tk.color.selBg = gocui.ColorBlue
 
 	tk.updateColor()
 }
@@ -110,14 +107,13 @@ func (tk *guiWidget) setColorBG() {
 		tk.color.bg = gocui.ColorBlack
 		tk.color.selFg = gocui.AttrNone
 		tk.color.selBg = gocui.AttrNone
-		tk.updateColor()
-		return
+	} else {
+		tk.color.frame = gocui.ColorWhite
+		tk.color.fg = gocui.ColorWhite
+		tk.color.bg = gocui.AttrNone
+		tk.color.selFg = gocui.AttrNone
+		tk.color.selBg = gocui.AttrNone
 	}
-	tk.color.frame = gocui.ColorWhite
-	tk.color.fg = gocui.ColorWhite
-	tk.color.bg = gocui.AttrNone
-	tk.color.selFg = gocui.AttrNone
-	tk.color.selBg = gocui.AttrNone
 
 	tk.updateColor()
 }
@@ -132,14 +128,13 @@ func (tk *guiWidget) setColorLabel() {
 		tk.color.bg = gocui.ColorBlack
 		tk.color.selFg = gocui.ColorWhite
 		tk.color.selBg = gocui.AttrNone
-		tk.updateColor()
-		return
+	} else {
+		tk.color.frame = gocui.AttrNone
+		tk.color.fg = gocui.ColorBlack
+		tk.color.bg = gocui.AttrNone
+		tk.color.selFg = gocui.AttrNone
+		tk.color.selBg = gocui.ColorWhite
 	}
-	tk.color.frame = gocui.AttrNone
-	tk.color.fg = gocui.ColorBlack
-	tk.color.bg = gocui.AttrNone
-	tk.color.selFg = gocui.AttrNone
-	tk.color.selBg = gocui.ColorWhite
 
 	tk.updateColor()
 }
@@ -154,14 +149,13 @@ func (tk *guiWidget) setColorButtonDense() {
 		tk.color.bg = gocui.ColorBlack
 		tk.color.selFg = gocui.ColorWhite
 		tk.color.selBg = gocui.ColorBlue
-		tk.updateColor()
-		return
+	} else {
+		tk.color.frame = gocui.AttrNone
+		tk.color.fg = gocui.ColorWhite
+		tk.color.bg = gocui.ColorBlue
+		tk.color.selFg = gocui.ColorBlue
+		tk.color.selBg = gocui.AttrNone
 	}
-	tk.color.frame = gocui.AttrNone
-	tk.color.fg = gocui.ColorWhite
-	tk.color.bg = gocui.ColorBlue
-	tk.color.selFg = gocui.ColorBlue
-	tk.color.selBg = gocui.AttrNone
 
 	tk.updateColor()
 }
@@ -176,14 +170,13 @@ func (tk *guiWidget) setColorButton() {
 		tk.color.bg = gocui.ColorBlack
 		tk.color.selFg = gocui.ColorWhite
 		tk.color.selBg = gocui.ColorBlue
-		tk.updateColor()
-		return
+	} else {
+		tk.color.frame = gocui.ColorBlue
+		tk.color.fg = gocui.AttrNone
+		tk.color.bg = gocui.AttrNone
+		tk.color.selFg = gocui.ColorWhite
+		tk.color.selBg = gocui.ColorBlue
 	}
-	tk.color.frame = gocui.ColorBlue
-	tk.color.fg = gocui.AttrNone
-	tk.color.bg = gocui.AttrNone
-	tk.color.selFg = gocui.ColorWhite
-	tk.color.selBg = gocui.ColorBlue
 
 	tk.updateColor()
 }
@@ -198,14 +191,13 @@ func (tk *guiWidget) setColorInput() {
 		tk.color.bg = gocui.AttrNone
 		tk.color.selFg = gocui.ColorYellow
 		tk.color.selBg = gocui.ColorBlack
-		tk.updateColor()
-		return
+	} else {
+		tk.color.frame = gocui.ColorYellow
+		tk.color.fg = gocui.AttrNone
+		tk.color.bg = gocui.AttrNone
+		tk.color.selFg = gocui.ColorYellow
+		tk.color.selBg = gocui.ColorBlack
 	}
-	tk.color.frame = gocui.ColorYellow
-	tk.color.fg = gocui.AttrNone
-	tk.color.bg = gocui.AttrNone
-	tk.color.selFg = gocui.ColorYellow
-	tk.color.selBg = gocui.ColorBlack
 	tk.updateColor()
 }
 
@@ -219,14 +211,13 @@ func (tk *guiWidget) setColorModal() {
 		tk.color.bg = gocui.ColorBlack
 		tk.color.selFg = gocui.ColorBlack
 		tk.color.selBg = gocui.AttrNone
-		tk.updateColor()
-		return
+	} else {
+		tk.color.frame = gocui.ColorRed
+		tk.color.fg = gocui.AttrNone
+		tk.color.bg = gocui.AttrNone
+		tk.color.selFg = gocui.AttrNone
+		tk.color.selBg = gocui.ColorWhite
 	}
-	tk.color.frame = gocui.ColorRed
-	tk.color.fg = gocui.AttrNone
-	tk.color.bg = gocui.AttrNone
-	tk.color.selFg = gocui.AttrNone
-	tk.color.selBg = gocui.ColorWhite
 	tk.updateColor()
 }
 
@@ -239,12 +230,13 @@ func (tk *guiWidget) setColorDisable() {
 		tk.colorLast.bg = tk.color.bg
 		tk.colorLast.selFg = tk.color.selFg
 		tk.colorLast.selBg = tk.color.selBg
-	}
+	} else {
 
-	tk.color.frame = superLightGrey
-	tk.color.fg = gocui.ColorBlack
-	tk.color.bg = superLightGrey
-	tk.color.selFg = superLightGrey
-	tk.color.selBg = superLightGrey
+		tk.color.frame = superLightGrey
+		tk.color.fg = gocui.ColorBlack
+		tk.color.bg = superLightGrey
+		tk.color.selFg = superLightGrey
+		tk.color.selBg = superLightGrey
+	}
 	tk.updateColor()
 }
diff --git a/eventMouseClick.go b/eventMouseClick.go
index f596274..eda0a26 100644
--- a/eventMouseClick.go
+++ b/eventMouseClick.go
@@ -28,7 +28,9 @@ func (tk *guiWidget) doWidgetClick(w int, h int) {
 		}
 		me.myTree.SendUserEvent(tk.node)
 	case widget.Button:
+		// if tk.node.Enabled() {
 		me.myTree.SendFromUser(tk.node)
+		// }
 	case widget.Combobox:
 		tk.showDropdown()
 	case widget.Dropdown: