diff --git a/app/src/gambas3/.src/Editor/Code/FCompletion.class b/app/src/gambas3/.src/Editor/Code/FCompletion.class
index 2a653dd47..e2464e795 100644
--- a/app/src/gambas3/.src/Editor/Code/FCompletion.class
+++ b/app/src/gambas3/.src/Editor/Code/FCompletion.class
@@ -33,6 +33,7 @@ Private $bHideLater As Boolean
 Private $cFindStrings As Collection
 Static Private $sWordSeparators As String
 Private $bStatic As Boolean
+Private $fOpenTime As Float
 
 Static Public Sub _init()
 
@@ -179,6 +180,8 @@ Public Sub Open(hForm As Object, sMode As String, Optional sClass As String, Opt
   
   If $bShowHelp Then
     sepHelp.Show
+    webHelp.Enabled = False
+    timEnable.Start
     webHelp.Show
     panResizeTop.Show
     panResizeBottom.Show
@@ -1144,3 +1147,10 @@ Public Sub panComp_Arrange()
   panResizeBottom.Raise
 
 End
+
+Public Sub timEnable_Timer()
+
+  webHelp.Enabled = True
+  timEnable.Stop
+
+End
diff --git a/app/src/gambas3/.src/Editor/Code/FCompletion.form b/app/src/gambas3/.src/Editor/Code/FCompletion.form
index f3814e5ec..2fe21d6bf 100644
--- a/app/src/gambas3/.src/Editor/Code/FCompletion.form
+++ b/app/src/gambas3/.src/Editor/Code/FCompletion.form
@@ -28,16 +28,16 @@
       Expand = True
       NoHeader = True
     }
-    { panResizeBottom Panel
-      MoveScaled(64,12,2,2)
-      Mouse = Mouse.SizeNWSE
-      Ignore = True
-    }
     { panResizeTop Panel
       MoveScaled(64,1,2,2)
       Mouse = Mouse.SizeNESW
       Ignore = True
     }
+    { panResizeBottom Panel
+      MoveScaled(64,12,2,2)
+      Mouse = Mouse.SizeNWSE
+      Ignore = True
+    }
     { timHideLater #Timer
       #MoveScaled(0,8)
     }
@@ -45,5 +45,9 @@
       #MoveScaled(24,4)
       Delay = 100
     }
+    { timEnable #Timer
+      #MoveScaled(48,6)
+      Delay = 100
+    }
   }
 }
diff --git a/app/src/gambas3/.src/Editor/Image/FImageProperty.class b/app/src/gambas3/.src/Editor/Image/FImageProperty.class
index 5389042d8..c551fd0f1 100644
--- a/app/src/gambas3/.src/Editor/Image/FImageProperty.class
+++ b/app/src/gambas3/.src/Editor/Image/FImageProperty.class
@@ -1503,3 +1503,9 @@ Public Sub chkGridDiag_Click()
   Try GetCurrent().UpdateGrid
 
 End
+
+Public Sub cchColor_Change()
+
+  palColor.Current = cchColor.Value
+
+End
diff --git a/app/src/gambas3/.src/Options/FOption.form b/app/src/gambas3/.src/Options/FOption.form
index 2c9f4c22c..8d1f8e333 100644
--- a/app/src/gambas3/.src/Options/FOption.form
+++ b/app/src/gambas3/.src/Options/FOption.form
@@ -245,31 +245,31 @@
       Font = Font["Bold"]
       Text = ("Interface")
     }
-    { HBox8 HBox
+    { HBox3 HBox
       MoveScaled(1,5,66,4)
       Spacing = True
       Indent = True
-      { Label2 Label
+      { Label10 Label
         MoveScaled(0,0,42,4)
         Expand = True
-        Text = ("Sort properties")
+        Text = ("Show tooltips")
       }
-      { btnSortProperty SwitchButton
-        MoveScaled(51,0,8,4)
+      { btnTooltip SwitchButton
+        MoveScaled(43,0,8,4)
         Animated = True
       }
     }
-    { HBox21 HBox
+    { HBox58 HBox
       MoveScaled(1,10,66,4)
       Spacing = True
       Indent = True
-      { Label21 Label
+      { Label57 Label
         MoveScaled(0,0,42,4)
         Expand = True
-        Text = ("Minimize at runtime")
+        Text = ("Show animations")
       }
-      { btnMinimize SwitchButton
-        MoveScaled(51,0,8,4)
+      { btnAnimation SwitchButton
+        MoveScaled(43,0,8,4)
         Animated = True
       }
     }
@@ -287,10 +287,38 @@
         Animated = True
       }
     }
-    { HBox44 HBox
+    { HBox8 HBox
       MoveScaled(1,20,66,4)
       Spacing = True
       Indent = True
+      { Label2 Label
+        MoveScaled(0,0,42,4)
+        Expand = True
+        Text = ("Sort properties")
+      }
+      { btnSortProperty SwitchButton
+        MoveScaled(51,0,8,4)
+        Animated = True
+      }
+    }
+    { HBox21 HBox
+      MoveScaled(1,25,66,4)
+      Spacing = True
+      Indent = True
+      { Label21 Label
+        MoveScaled(0,0,42,4)
+        Expand = True
+        Text = ("Minimize at runtime")
+      }
+      { btnMinimize SwitchButton
+        MoveScaled(51,0,8,4)
+        Animated = True
+      }
+    }
+    { HBox44 HBox
+      MoveScaled(1,30,66,4)
+      Spacing = True
+      Indent = True
       { Label53 Label
         MoveScaled(0,0,42,4)
         Expand = True
@@ -301,34 +329,6 @@
         Animated = True
       }
     }
-    { HBox3 HBox
-      MoveScaled(1,25,66,4)
-      Spacing = True
-      Indent = True
-      { Label10 Label
-        MoveScaled(0,0,42,4)
-        Expand = True
-        Text = ("Show tooltips")
-      }
-      { btnTooltip SwitchButton
-        MoveScaled(43,0,8,4)
-        Animated = True
-      }
-    }
-    { HBox58 HBox
-      MoveScaled(1,30,66,4)
-      Spacing = True
-      Indent = True
-      { Label57 Label
-        MoveScaled(0,0,42,4)
-        Expand = True
-        Text = ("Show animations")
-      }
-      { btnAnimation SwitchButton
-        MoveScaled(43,0,8,4)
-        Animated = True
-      }
-    }
     { HBox48 HBox
       MoveScaled(1,35,66,4)
       Spacing = True