diff --git a/app/src/gambas3/.src/Component/CClassInfo.class b/app/src/gambas3/.src/Component/CClassInfo.class
index 4e968d8ea..e4c3affb4 100644
--- a/app/src/gambas3/.src/Component/CClassInfo.class
+++ b/app/src/gambas3/.src/Component/CClassInfo.class
@@ -165,6 +165,9 @@ Public Sub InitControl()
     If hSym Then DefaultText = hSym.Value
   Endif
 
+  Try DrawWith = Symbols["_DrawWith"].Value
+  If Family <> "Form" And If MultiContainer And If Not DrawWith Then DrawWith = "TabStrip"
+
   hSym = Symbols["_Similar"]
   If hSym Then Similars = Split(hSym.Value, ",")
 
@@ -250,8 +253,10 @@ Public Sub InitControl()
           Continue
         Endif
       Endif
+      
+      If sProp = "Count" Then Stop
 
-      If hSym.Component = CComponent.PROJECT_NAME Then
+      If hSym.Component = CComponent.PROJECT_NAME And If Not DrawWith Then
         bDoNotApply = True
       Else If Family <> "Form" Then 
         If MultiContainer Then
@@ -334,8 +339,6 @@ Public Sub InitControl()
   CPropertyInfo.CreatingSpecialProperty = False
   
   'IF Name = "Timer" THEN
-  Try DrawWith = Symbols["_DrawWith"].Value
-  If Family <> "Form" And If MultiContainer And If Not DrawWith Then DrawWith = "TabStrip"
   'IF DrawWith THEN ?Me. <= CRASH!
   '  PRINT ME.Name;; "->";; DrawWith
   'ENDIF
diff --git a/app/src/gambas3/.src/Editor/Code/FEditor.class b/app/src/gambas3/.src/Editor/Code/FEditor.class
index ea4e15871..61f3a78dc 100644
--- a/app/src/gambas3/.src/Editor/Code/FEditor.class
+++ b/app/src/gambas3/.src/Editor/Code/FEditor.class
@@ -153,7 +153,6 @@ Public Sub GetEditor() As TextEditor
   
 End
 
-
 Public Sub Refresh()
 
   edtEditor.TabSize = Project.TabSize
diff --git a/app/src/gambas3/theme/gambas b/app/src/gambas3/theme/gambas
index e4962e0f3..80121290b 100644
--- a/app/src/gambas3/theme/gambas
+++ b/app/src/gambas3/theme/gambas
@@ -14,7 +14,7 @@ Preprocessor="#1CC01C,Bold"
 Breakpoint="#FF5F5F"
 Current="#42C9FF"
 Selection="#A4D9F0"
-Highlight="#8BDF37"
+Highlight="#FFEB7F"
 CurrentLine="#E7F7FF"
 Error="#BF0303,Underline"
 Escape="#A01717,Bold"