diff --git a/app/DD-Record-Organiser/ClassControlBuilder.vb b/app/DD-Record-Organiser/ClassControlBuilder.vb
index 35ae0c9..a3f35fd 100644
--- a/app/DD-Record-Organiser/ClassControlBuilder.vb
+++ b/app/DD-Record-Organiser/ClassControlBuilder.vb
@@ -565,6 +565,10 @@ Public Class ClassControlBuilder
                 ActiveControl.BackColor = ActiveColor
             Case "System.Windows.Forms.PictureBox"
                 ActiveControl.BackColor = ActiveColor
+            Case "DevExpress.XtraEditors.CheckedListBoxControl"
+                ActiveControl.BackColor = ActiveColor
+            Case "DevExpress.XtraEditors.ListBoxControl"
+                ActiveControl.BackColor = ActiveColor
         End Select
     End Sub
 
@@ -590,6 +594,10 @@ Public Class ClassControlBuilder
                         inctrl.BackColor = SystemColors.Control
                     Case "System.Windows.Forms.GroupBox"
                         inctrl.BackColor = SystemColors.Control
+                    Case "DevExpress.XtraEditors.CheckedListBoxControl"
+                        inctrl.BackColor = Color.White
+                    Case "DevExpress.XtraEditors.ListBoxControl"
+                        inctrl.BackColor = Color.White
                     Case "System.Windows.Forms.PictureBox"
                         inctrl.BackColor = SystemColors.ControlDark
 
@@ -614,6 +622,10 @@ Public Class ClassControlBuilder
                                         gbctrl.BackColor = SystemColors.Control
                                     Case "System.Windows.Forms.PictureBox"
                                         inctrl.BackColor = SystemColors.ControlDark
+                                    Case "DevExpress.XtraEditors.CheckedListBoxControl"
+                                        inctrl.BackColor = Color.White
+                                    Case "DevExpress.XtraEditors.ListBoxControl"
+                                        inctrl.BackColor = Color.White
                                 End Select
                             End If
                         Next
diff --git a/app/DD-Record-Organiser/frmLevel_Designer.Designer.vb b/app/DD-Record-Organiser/frmLevel_Designer.Designer.vb
index 5eee3fb..f030ac8 100644
--- a/app/DD-Record-Organiser/frmLevel_Designer.Designer.vb
+++ b/app/DD-Record-Organiser/frmLevel_Designer.Designer.vb
@@ -164,6 +164,7 @@ Partial Class frmLevel_Designer
         '
         'ToolStrip2
         '
+        Me.ToolStrip2.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden
         Me.ToolStrip2.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.btnSaveControl, Me.btnDeleteControl})
         resources.ApplyResources(Me.ToolStrip2, "ToolStrip2")
         Me.ToolStrip2.Name = "ToolStrip2"
diff --git a/app/DD-Record-Organiser/frmLevel_Designer.resx b/app/DD-Record-Organiser/frmLevel_Designer.resx
index 6cdf5dc..c02e389 100644
--- a/app/DD-Record-Organiser/frmLevel_Designer.resx
+++ b/app/DD-Record-Organiser/frmLevel_Designer.resx
@@ -268,10 +268,10 @@
     <value>609, 17</value>
   </metadata>
   <data name="lblStatus.Size" type="System.Drawing.Size, System.Drawing">
-    <value>137, 17</value>
+    <value>55, 17</value>
   </data>
   <data name="lblStatus.Text" xml:space="preserve">
-    <value>ToolStripStatusLabel1</value>
+    <value>Status</value>
   </data>
   <data name="StatusStrip2.Location" type="System.Drawing.Point, System.Drawing">
     <value>3, 540</value>
@@ -304,10 +304,13 @@
     <value>Magenta</value>
   </data>
   <data name="btnSaveControl.Size" type="System.Drawing.Size, System.Drawing">
-    <value>79, 22</value>
+    <value>133, 22</value>
   </data>
   <data name="btnSaveControl.Text" xml:space="preserve">
-    <value>Speichern</value>
+    <value>Speichern (Invisible)</value>
+  </data>
+  <data name="btnSaveControl.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
   </data>
   <data name="btnDeleteControl.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
     <value>Magenta</value>
diff --git a/app/DD-Record-Organiser/frmLevel_Designer.vb b/app/DD-Record-Organiser/frmLevel_Designer.vb
index 0df48d6..84391b3 100644
--- a/app/DD-Record-Organiser/frmLevel_Designer.vb
+++ b/app/DD-Record-Organiser/frmLevel_Designer.vb
@@ -539,7 +539,6 @@
 
     Private Sub Control_MouseUp(ByVal sender As Object, ByVal e As System.Windows.Forms.MouseEventArgs) Handles Me.MouseUp
         ' The button was released, so we're going back to Static mode.
-        Console.WriteLine("mouseup")
         If Mouse_Moving = True Then
             Mouse_Moving = False
             'end_location = e.Location
@@ -769,7 +768,7 @@
                                           CType(r.Item("CTRLSCR_FONT_STYLE"), FontStyle))
                     props.ColumnTitle = r.Item("CONTROL_COL_NAME")
                     Dim i = r.Item("CONTROL_DEF_VALUE")
-                    props.DefaultValue = NotNull(r.Item("CONTROL_DEF_VALUE"), EnumDateTimePickerDefaultValueOptions.Empty)
+                    props.DefaultValue = NotNull(Of Object)(r.Item("CONTROL_DEF_VALUE"), EnumDateTimePickerDefaultValueOptions.Empty)
                     props.IsRequired = r.Item("CONTROL_REQUIRED")
                     props.IsReadOnly = r.Item("CONTROL_READ_ONLY")
                     props.ShowColumn = NotNull(CBool(r.Item("CONTROL_SHOW_COLUMN")), True)
@@ -952,7 +951,7 @@
         End If
     End Sub
 
-    Private Sub pgControlProperties_PropertyValueChanged(s As Object, e As PropertyValueChangedEventArgs)
+    Private Sub pgControlProperties_PropertyValueChanged(s As Object, e As PropertyValueChangedEventArgs) Handles pgControlProperties.PropertyValueChanged
 
         Dim oldValue As Object = e.OldValue
         Dim newValue As Object = e.ChangedItem.Value
@@ -984,7 +983,19 @@
                 ctrl.BackColor = newValue
         End Select
 
-        lblStatus.Text = "Ausstehende Änderungen"
-        lblStatus.Visible = True
+        Console.WriteLine("Property {0} was changed", e.ChangedItem.Label)
+
+        'lblStatus.Text = "Ausstehende Änderungen"
+        'lblStatus.Visible = True
+
+        If SaveControlProperties(CtrlBuilder.CurrentControl, pgControlProperties.SelectedObject) Then
+            If USER_LANGUAGE <> "de-DE" Then
+                lblStatus.Text = "Changes saved - " & Now
+            Else
+                lblStatus.Text = "Änderungen gespeichert - " & Now
+            End If
+        Else
+            lblStatus.Visible = False
+        End If
     End Sub
 End Class