diff --git a/app/src/gambas3/.lang/.pot b/app/src/gambas3/.lang/.pot
index 2c3cde9b0..1bc46d43d 100644
--- a/app/src/gambas3/.lang/.pot
+++ b/app/src/gambas3/.lang/.pot
@@ -442,7 +442,7 @@ msgstr ""
 
 #: CWaitingAnimation.class:56 FColorChooser.form:60 FCommit.form:229
 #: FConflict.class:185 FConnectionEditor.class:294 FCreateFile.form:437
-#: FDebugInfo.form:238 FEditor.class:2338 FExportData.class:126
+#: FDebugInfo.form:243 FEditor.class:2338 FExportData.class:126
 #: FFieldChooser.form:138 FFontChooser.form:40 FForm.class:3085
 #: FGotoLine.form:23 FHelpBrowser.form:61 FIconEditor.class:1376
 #: FList.form:121 FMain.class:194 FMakeInstall.class:350 FMenu.form:377
@@ -499,7 +499,7 @@ msgstr ""
 msgid "Keep"
 msgstr ""
 
-#: ComponentItem.class:252 FDebugInfo.form:132
+#: ComponentItem.class:252 FDebugInfo.form:137
 msgid "Remove all"
 msgstr ""
 
@@ -642,7 +642,7 @@ msgstr ""
 
 #: FCommit.form:109 FConflict.form:71 FConnectionEditor.form:387
 #: FEditor.form:129 FForm.form:213 FIconEditor.form:87 FImageEditor.form:99
-#: FOption.form:524 FOutput.form:41 FTextEditor.form:91
+#: FOption.form:526 FOutput.form:41 FTextEditor.form:91
 msgid "Undo"
 msgstr ""
 
@@ -731,7 +731,7 @@ msgstr ""
 msgid "Sol&ve"
 msgstr ""
 
-#: FConflict.form:184 FDebugInfo.form:245 FEditor.form:311 FForm.form:399
+#: FConflict.form:184 FDebugInfo.form:250 FEditor.form:311 FForm.form:399
 #: FIconEditor.class:1389 FImportTable.form:218 FSystemInfo.form:81
 #: FTextEditor.form:244 FTips.form:84
 msgid "Close"
@@ -890,7 +890,7 @@ msgstr ""
 
 #: FConnectionEditor.class:34 FCreateFile.form:289 FDebugInfo.class:38
 #: FMakeInstall.form:162 FNewConnection.form:60 FNewTable.form:33
-#: FOption.form:1038
+#: FOption.form:1040
 msgid "Name"
 msgstr ""
 
@@ -1279,93 +1279,87 @@ msgstr ""
 msgid "Symbol"
 msgstr ""
 
-#: FDebugInfo.form:45 FMain.form:1342
+#: FDebugInfo.form:46 FMain.form:1342
 msgid "Debug"
 msgstr ""
 
-#: FDebugInfo.form:56 FMain.form:1029 FOption.form:345 FSearch.class:92
+#: FDebugInfo.form:57 FMain.form:1029 FOption.form:345 FSearch.class:92
 msgid "Console"
 msgstr ""
 
-#: FDebugInfo.form:65
+#: FDebugInfo.form:66
 msgid "Local variables"
 msgstr ""
 
-#: FDebugInfo.form:83
+#: FDebugInfo.form:84
 msgid "Current object"
 msgstr ""
 
-#: FDebugInfo.form:101
+#: FDebugInfo.form:102
 msgid "Watch"
 msgstr ""
 
-#: FDebugInfo.form:114
+#: FDebugInfo.form:115
 msgid "Add expression"
 msgstr ""
 
-#: FDebugInfo.form:116 FMakeInstall.form:589 FOption.form:1001
-#: FPropertyComponent.form:184
-msgid "&Add"
+#: FDebugInfo.form:121
+msgid "Copy to clipboard"
 msgstr ""
 
-#: FDebugInfo.form:122
+#: FDebugInfo.form:128
 msgid "Remove current expression"
 msgstr ""
 
-#: FDebugInfo.form:124 FMain.form:785 FMakeInstall.form:595 FOption.form:938
-#: FPropertyComponent.form:190 FPropertyProject.form:484
-msgid "&Remove"
-msgstr ""
-
-#: FDebugInfo.form:130
+#: FDebugInfo.form:135
 msgid "Remove all expressions"
 msgstr ""
 
-#: FDebugInfo.form:138
+#: FDebugInfo.form:143
 msgid "Display ME"
 msgstr ""
 
-#: FDebugInfo.form:140
+#: FDebugInfo.form:145
 msgid "Display"
 msgstr ""
 
-#: FDebugInfo.form:164 MTheme.module:6
+#: FDebugInfo.form:169 MTheme.module:6
 msgid "Breakpoints"
 msgstr ""
 
-#: FDebugInfo.form:172
+#: FDebugInfo.form:177
 msgid "Remove current breakpoint"
 msgstr ""
 
-#: FDebugInfo.form:180
+#: FDebugInfo.form:185
 msgid "Remove all breakpoints"
 msgstr ""
 
-#: FDebugInfo.form:213
+#: FDebugInfo.form:218
 msgid "Tasks"
 msgstr ""
 
-#: FDebugInfo.form:227
+#: FDebugInfo.form:232
 msgid "Search list"
 msgstr ""
 
-#: FDebugInfo.form:236
+#: FDebugInfo.form:241
 msgid "Cancel current search"
 msgstr ""
 
-#: FDebugInfo.form:252
+#: FDebugInfo.form:257
 msgid "Search again"
 msgstr ""
 
-#: FDebugInfo.form:259
+#: FDebugInfo.form:264
 msgid "Show search window"
 msgstr ""
 
-#: FDebugInfo.form:300 FSearch.class:485 FTranslate.class:588
+#: FDebugInfo.form:305 FSearch.class:485 FTranslate.class:588
 msgid "Search string cannot be found."
 msgstr ""
 
-#: FDebugInfo.form:318
+#: FDebugInfo.form:323
 msgid "Stack backtrace"
 msgstr ""
 
@@ -1378,7 +1372,7 @@ msgid "Function"
 msgstr ""
 
 #: FDebugInfo.class:62 FIconEditor.form:200 FImportTable.class:64
-#: FOption.form:587
+#: FOption.form:589
 msgid "Line"
 msgstr ""
 
@@ -2490,6 +2484,11 @@ msgstr ""
 msgid "&Open"
 msgstr ""
 
+#: FMain.form:785 FMakeInstall.form:595 FOption.form:940
+#: FPropertyComponent.form:190 FPropertyProject.form:484
+msgid "&Remove"
+msgstr ""
+
 #: FMain.form:839
 msgid "&?"
 msgstr ""
@@ -2746,7 +2745,7 @@ msgstr ""
 msgid "Package name"
 msgstr ""
 
-#: FMakeInstall.form:143 FOption.form:1121
+#: FMakeInstall.form:143 FOption.form:1123
 msgid "Prefix package name with the vendor name"
 msgstr ""
 
@@ -2754,19 +2753,19 @@ msgstr ""
 msgid "Maintainer information"
 msgstr ""
 
-#: FMakeInstall.form:178 FOption.form:1070
+#: FMakeInstall.form:178 FOption.form:1072
 msgid "E-mail"
 msgstr ""
 
-#: FMakeInstall.form:194 FOption.form:1054
+#: FMakeInstall.form:194 FOption.form:1056
 msgid "Vendor name"
 msgstr ""
 
-#: FMakeInstall.form:210 FOption.form:1105
+#: FMakeInstall.form:210 FOption.form:1107
 msgid "URL"
 msgstr ""
 
-#: FMakeInstall.form:247 FOption.form:1086
+#: FMakeInstall.form:247 FOption.form:1088
 msgid "License"
 msgstr ""
 
@@ -2825,6 +2824,10 @@ msgstr ""
 msgid "Same dependencies for all targets"
 msgstr ""
 
+#: FMakeInstall.form:589 FOption.form:1003 FPropertyComponent.form:184
+msgid "&Add"
+msgstr ""
+
 #: FMakeInstall.form:613
 msgid "&Clear"
 msgstr ""
@@ -3229,199 +3232,199 @@ msgstr ""
 msgid "Theme"
 msgstr ""
 
-#: FOption.form:483
+#: FOption.form:484
 msgid "Icon theme"
 msgstr ""
 
-#: FOption.form:498
+#: FOption.form:500
 msgid "Color theme"
 msgstr ""
 
-#: FOption.form:512
+#: FOption.form:514
 msgid "Import theme"
 msgstr ""
 
-#: FOption.form:518
+#: FOption.form:520
 msgid "Export theme"
 msgstr ""
 
-#: FOption.form:557
+#: FOption.form:559
 msgid "Default tab size"
 msgstr ""
 
-#: FOption.form:569 FPropertyProject.form:300
+#: FOption.form:571 FPropertyProject.form:300
 msgid "space(s)"
 msgstr ""
 
-#: FOption.form:581
+#: FOption.form:583
 msgid "Procedure separation"
 msgstr ""
 
-#: FOption.form:587 FProperty.class:748
+#: FOption.form:589 FProperty.class:748
 msgid "None"
 msgstr ""
 
-#: FOption.form:587
+#: FOption.form:589
 msgid "Blend"
 msgstr ""
 
-#: FOption.form:587 MTheme.module:6
+#: FOption.form:589 MTheme.module:6
 msgid "Background"
 msgstr ""
 
-#: FOption.form:599
+#: FOption.form:601
 msgid "Highlight current line"
 msgstr ""
 
-#: FOption.form:621
+#: FOption.form:623
 msgid "Highlight modified lines"
 msgstr ""
 
-#: FOption.form:643
+#: FOption.form:645
 msgid "Show line numbers"
 msgstr ""
 
-#: FOption.form:665
+#: FOption.form:667
 msgid "Show spaces at end of line with dots"
 msgstr ""
 
-#: FOption.form:687
+#: FOption.form:689
 msgid "Procedure folding"
 msgstr ""
 
-#: FOption.form:709
+#: FOption.form:711
 msgid "Fold procedures by default"
 msgstr ""
 
-#: FOption.form:731
+#: FOption.form:733
 msgid "Keywords in upper case"
 msgstr ""
 
-#: FOption.form:745
+#: FOption.form:747
 msgid "Code formatting"
 msgstr ""
 
-#: FOption.form:751
+#: FOption.form:753
 msgid "Automatic formatting"
 msgstr ""
 
-#: FOption.form:762
+#: FOption.form:764
 msgid "Control structure automatic completion"
 msgstr ""
 
-#: FOption.form:784
+#: FOption.form:786
 msgid "Local variable automatic declaration"
 msgstr ""
 
-#: FOption.form:801
+#: FOption.form:803
 msgid "Explicit formating"
 msgstr ""
 
-#: FOption.form:812
+#: FOption.form:814
 msgid "Format on load & save"
 msgstr ""
 
-#: FOption.form:834
+#: FOption.form:836
 msgid "Indent local variable declaration"
 msgstr ""
 
-#: FOption.form:856
+#: FOption.form:858
 msgid "Remove useless spaces at end of line"
 msgstr ""
 
-#: FOption.form:878
+#: FOption.form:880
 msgid "Keep successive void lines"
 msgstr ""
 
-#: FOption.form:892
+#: FOption.form:894
 msgid "Code snippets"
 msgstr ""
 
-#: FOption.form:903
+#: FOption.form:905
 msgid "Activate code snippets"
 msgstr ""
 
-#: FOption.form:924 FTranslate.form:299
+#: FOption.form:926 FTranslate.form:299
 msgid "&New..."
 msgstr ""
 
-#: FOption.form:931
+#: FOption.form:933
 msgid "&Edit..."
 msgstr ""
 
-#: FOption.form:946
+#: FOption.form:948
 msgid "Re&set"
 msgstr ""
 
-#: FOption.form:954
+#: FOption.form:956
 msgid "E&xport..."
 msgstr ""
 
-#: FOption.form:962
+#: FOption.form:964
 msgid "&Import..."
 msgstr ""
 
-#: FOption.form:968
+#: FOption.form:970
 msgid "Source archives"
 msgstr ""
 
-#: FOption.form:981
+#: FOption.form:983
 msgid "These files will be ignored when making source archives."
 msgstr ""
 
-#: FOption.form:1021
+#: FOption.form:1023
 msgid "Packaging"
 msgstr ""
 
-#: FOption.form:1027
+#: FOption.form:1029
 msgid "Default maintainer information"
 msgstr ""
 
-#: FOption.form:1131
+#: FOption.form:1133
 msgid "Applications"
 msgstr ""
 
-#: FOption.form:1148
+#: FOption.form:1150
 msgid "Browser"
 msgstr ""
 
-#: FOption.form:1165
+#: FOption.form:1167
 msgid "Terminal"
 msgstr ""
 
-#: FOption.form:1182
+#: FOption.form:1184
 msgid "Image editor"
 msgstr ""
 
-#: FOption.form:1199
+#: FOption.form:1201
 msgid "Quiet external commands"
 msgstr ""
 
-#: FOption.form:1213 MTheme.module:6
+#: FOption.form:1215 MTheme.module:6
 msgid "Help"
 msgstr ""
 
-#: FOption.form:1230
+#: FOption.form:1232
 msgid "Display property help"
 msgstr ""
 
-#: FOption.form:1252
+#: FOption.form:1254
 msgid "Show tooltips"
 msgstr ""
 
-#: FOption.form:1274
+#: FOption.form:1276
 msgid "Show documentation in popups"
 msgstr ""
 
-#: FOption.form:1296
+#: FOption.form:1298
 msgid "Always display optional messages"
 msgstr ""
 
-#: FOption.form:1318
+#: FOption.form:1320
 msgid "Clear documentation cache"
 msgstr ""
 
-#: FOption.form:1331
+#: FOption.form:1333
 msgid "Proxy configuration..."
 msgstr ""
 
diff --git a/app/src/gambas3/.src/Debug/FDebugInfo.class b/app/src/gambas3/.src/Debug/FDebugInfo.class
index f55fe1b64..7c5703c09 100644
--- a/app/src/gambas3/.src/Debug/FDebugInfo.class
+++ b/app/src/gambas3/.src/Debug/FDebugInfo.class
@@ -600,7 +600,7 @@ End
 
 Public Sub ReadConfig()
 
-  Dim hButton As ToolButton
+  'Dim hButton As ToolButton
   Dim hCtrl As Control
 
   Settings.Read(panStack)
@@ -619,11 +619,11 @@ Public Sub ReadConfig()
     Project.SetSmallFont(hCtrl)
   Next
 
-  For Each hButton In [btnClearBreak, btnKillAllWatch, btnKillWatch, btnRemoveBreak, btnShowMe, btnWatch]
-    hButton.AutoResize = False
-    hButton.W = 8
-    hButton.AutoResize = True
-  Next
+  ' For Each hButton In [btnClearBreak, btnKillAllWatch, btnKillWatch, btnRemoveBreak, btnShowMe, btnWatch]
+  '   hButton.AutoResize = False
+  '   hButton.W = 8
+  '   hButton.AutoResize = True
+  ' Next
 
 End
 
@@ -1403,3 +1403,9 @@ Public Sub GotoFirstWarning()
   gvwCompilation_Activate
   
 End
+
+Public Sub btnCopy_Click()
+
+  Try Clipboard.Copy(cvwWatch.Current[1])
+
+End
diff --git a/app/src/gambas3/.src/Debug/FDebugInfo.form b/app/src/gambas3/.src/Debug/FDebugInfo.form
index 90e69d97c..56902c7e6 100644
--- a/app/src/gambas3/.src/Debug/FDebugInfo.form
+++ b/app/src/gambas3/.src/Debug/FDebugInfo.form
@@ -1,12 +1,12 @@
 # Gambas Form File 3.0
 
 { Form Form
-  MoveScaled(0,2,118,47)
+  MoveScaled(0,2,125,47)
   Text = ("Debug")
   Persistent = True
   Arrangement = Arrange.Horizontal
   { tabDebug TabPanel
-    MoveScaled(3,3,89,41)
+    MoveScaled(3,3,94,41)
     Expand = True
     Arrangement = Arrange.Vertical
     Border = False
@@ -29,10 +29,10 @@
     { tbvLocal TableView
       MoveScaled(3,12,63,18)
       Expand = True
+      Border = False
       Mode = Select.Single
       Grid = False
       Header = GridView.Horizontal
-      Border = False
       NoKeyboard = True
     }
     Index = 2
@@ -45,51 +45,54 @@
     { tbvObject TableView
       MoveScaled(3,12,69,20)
       Expand = True
+      Border = False
       Mode = Select.Single
       Grid = False
       Header = GridView.Horizontal
-      Border = False
       NoKeyboard = True
     }
     Index = 3
     Text = ("Watch")
     Picture = Picture["icon:/small/watch"]
     { panWatch HBox
-      MoveScaled(1,1,84,4)
+      MoveScaled(1,1,91,4)
       { cmbWatch ComboBox
         MoveScaled(0,0,27,4)
         Expand = True
       }
       { btnWatch ToolButton
-        MoveScaled(27,0,7,4)
+        MoveScaled(27,0,4,4)
         ToolTip = ("Add expression")
-        AutoResize = True
-        Text = ("&Add")
         Picture = Picture["icon:/small/add"]
       }
+      { btnCopy ToolButton
+        MoveScaled(32,0,4,4)
+        ToolTip = ("Copy to clipboard")
+        AutoResize = True
+        Picture = Picture["icon:/small/copy"]
+      }
       { btnKillWatch ToolButton
-        MoveScaled(34,0,10,4)
+        MoveScaled(37,0,4,4)
         ToolTip = ("Remove current expression")
         AutoResize = True
-        Text = ("&Remove")
         Picture = Picture["icon:/small/remove"]
       }
       { btnKillAllWatch ToolButton
-        MoveScaled(44,0,12,4)
+        MoveScaled(44,0,14,4)
         ToolTip = ("Remove all expressions")
         AutoResize = True
         Text = ("Remove all")
         Picture = Picture["icon:/small/trash"]
       }
       { btnShow ToolButton
-        MoveScaled(57,0,12,4)
+        MoveScaled(59,0,10,4)
         ToolTip = ("Display ME")
         AutoResize = True
         Text = ("Display")
         Picture = Picture["icon:/small/watch"]
       }
       { btnShowMe ToolButton
-        MoveScaled(70,0,12,4)
+        MoveScaled(71,0,12,4)
         ToolTip = ("Display ME")
         AutoResize = True
         Text = ("Display ME")
@@ -144,9 +147,9 @@
     { gvwCompilation GridView
       MoveScaled(28,9,41,23)
       Expand = True
+      Border = False
       Mode = Select.Single
       Header = GridView.Horizontal
-      Border = False
     }
     Index = 6
     Text = ("Tasks")
@@ -154,9 +157,9 @@
     { gvwTask GridView
       MoveScaled(18,8,52,22)
       Expand = True
+      Border = False
       Mode = Select.Single
       Header = GridView.Horizontal
-      Border = False
     }
     { timTask #Timer
       #MoveScaled(73,17)
@@ -213,10 +216,10 @@
       { gvwFind GridView
         MoveScaled(23,4,47,16)
         Visible = False
+        Border = False
         Mode = Select.Single
         Header = GridView.Horizontal
         ScrollBar = Scroll.Vertical
-        Border = False
         Resizable = False
       }
       { lblNotFound TextLabel
@@ -230,7 +233,7 @@
     Index = 0
   }
   { panStack SidePanel
-    MoveScaled(93,3,24,43)
+    MoveScaled(99,3,24,43)
     Arrangement = Arrange.Fill
     Orientation = Align.Right
     Separator = True
diff --git a/app/src/gambas3/.src/Options/FOption.form b/app/src/gambas3/.src/Options/FOption.form
index 1fb0dbea6..c919e1926 100644
--- a/app/src/gambas3/.src/Options/FOption.form
+++ b/app/src/gambas3/.src/Options/FOption.form
@@ -145,12 +145,12 @@
         Text = ("Sort properties")
       }
       { cmbSortProperty ComboBox
-        MoveScaled(43,0,15,4)
+        MoveScaled(43,0,10,4)
         ReadOnly = True
         List = [("No"), ("Yes")]
       }
       { Panel2 Panel
-        MoveScaled(59,0,7,4)
+        MoveScaled(54,0,12,4)
       }
     }
     { HBox21 HBox
@@ -233,6 +233,7 @@
     { HBox11 HBox
       MoveScaled(1,3,65,4)
       Spacing = True
+      Indent = True
       { Label12 Label
         MoveScaled(0,0,18,4)
         Expand = True
@@ -245,6 +246,7 @@
     }
     { HBox1 HBox
       MoveScaled(1,9,65,4)
+      Indent = True
       { Label54 Label
         MoveScaled(0,0,18,4)
         Expand = True