Moving session Color submenu to Session menu + Other consistency improvements between Session menu and Session popup menu

Source commit: e0d68fed3c0be4d407cc649e3bd66a944ccbb861

source/forms/NonVisual.dfm

@@ -3003,6 +3003,12 @@ object NonVisualDataModule: TNonVisualDataModule
     object TBXItem52: TTBXItem
       Action = SessionGenerateUrlAction2
     end
+    object TBXSeparatorItem52: TTBXSeparatorItem
+    end
+    object ColorMenuItem: TTBXColorItem
+      Action = ColorMenuAction
+      Color = clNone
+    end
     object TBXSeparatorItem34: TTBXSeparatorItem
     end
     object TBXItem123: TTBXItem
@@ -3012,12 +3018,6 @@ object NonVisualDataModule: TNonVisualDataModule
       Action = SavedSessionsAction2
       Options = [tboDropdownArrow]
     end
-    object TBXSeparatorItem52: TTBXSeparatorItem
-    end
-    object ColorMenuItem: TTBXColorItem
-      Action = ColorMenuAction
-      Color = clNone
-    end
     object TBXSeparatorItem35: TTBXSeparatorItem
     end
     object SessionsTabsAction4: TTBXItem

source/forms/ScpCommander.dfm

@@ -409,12 +409,12 @@ inherited ScpCommanderForm: TScpCommanderForm
         object TBXItem113: TTBXItem
           Action = NonVisualDataModule.NewSessionAction
         end
-        object TBXItem218: TTBXItem
-          Action = NonVisualDataModule.DuplicateSessionAction
-        end
         object TBXItem115: TTBXItem
           Action = NonVisualDataModule.CloseSessionAction
         end
+        object TBXItem218: TTBXItem
+          Action = NonVisualDataModule.DuplicateSessionAction
+        end
         object TBXItem114: TTBXItem
           Action = NonVisualDataModule.SaveCurrentSessionAction2
         end
@@ -432,6 +432,12 @@ inherited ScpCommanderForm: TScpCommanderForm
         object TBXItem76: TTBXItem
           Action = NonVisualDataModule.PrivateKeyUploadAction
         end
+        object TBXSeparatorItem23: TTBXSeparatorItem
+        end
+        object ColorMenuItem: TTBXColorItem
+          Action = NonVisualDataModule.ColorMenuAction
+          Color = clNone
+        end
         object TBXSeparatorItem29: TTBXSeparatorItem
         end
         object TBXSubmenuItem21: TTBXSubmenuItem
@@ -603,12 +609,6 @@ inherited ScpCommanderForm: TScpCommanderForm
             Action = NonVisualDataModule.QueuePreferencesAction
           end
         end
-        object TBXSeparatorItem23: TTBXSeparatorItem
-        end
-        object ColorMenuItem: TTBXColorItem
-          Action = NonVisualDataModule.ColorMenuAction
-          Color = clNone
-        end
         object TBXSeparatorItem49: TTBXSeparatorItem
         end
         object TBXItem82: TTBXItem

source/forms/ScpExplorer.dfm

@@ -285,12 +285,12 @@ inherited ScpExplorerForm: TScpExplorerForm
         object TBXItem113: TTBXItem
           Action = NonVisualDataModule.NewSessionAction
         end
-        object TBXItem90: TTBXItem
-          Action = NonVisualDataModule.DuplicateSessionAction
-        end
         object TBXItem115: TTBXItem
           Action = NonVisualDataModule.CloseSessionAction
         end
+        object TBXItem90: TTBXItem
+          Action = NonVisualDataModule.DuplicateSessionAction
+        end
         object TBXItem114: TTBXItem
           Action = NonVisualDataModule.SaveCurrentSessionAction2
         end
@@ -308,6 +308,12 @@ inherited ScpExplorerForm: TScpExplorerForm
         object TBXItem14: TTBXItem
           Action = NonVisualDataModule.PrivateKeyUploadAction
         end
+        object TBXSeparatorItem23: TTBXSeparatorItem
+        end
+        object ColorMenuItem: TTBXColorItem
+          Action = NonVisualDataModule.ColorMenuAction
+          Color = clNone
+        end
         object TBXSeparatorItem29: TTBXSeparatorItem
         end
         object TBXSubmenuItem21: TTBXSubmenuItem
@@ -544,12 +550,6 @@ inherited ScpExplorerForm: TScpExplorerForm
         object TBXItem138: TTBXItem
           Action = NonVisualDataModule.RemoteFilterAction
         end
-        object TBXSeparatorItem23: TTBXSeparatorItem
-        end
-        object ColorMenuItem: TTBXColorItem
-          Action = NonVisualDataModule.ColorMenuAction
-          Color = clNone
-        end
         object TBXSeparatorItem5: TTBXSeparatorItem
         end
         object TBXItem21: TTBXItem