diff --git a/mRemoteV1/Forms/frmOptions.vb b/mRemoteV1/Forms/frmOptions.vb
index eaac0f2f..1bba6937 100644
--- a/mRemoteV1/Forms/frmOptions.vb
+++ b/mRemoteV1/Forms/frmOptions.vb
@@ -1865,6 +1865,7 @@ Public Class frmOptions
         lvPages.Items(4).Text = My.Language.strSQLServer
         lvPages.Items(5).Text = My.Language.strTabUpdates
         lvPages.Items(6).Text = My.Language.strTabAdvanced
+        lvPages.Items(7).Text = Language.strOptionsTabTheme
 #If Not PORTABLE Then
         lblUpdatesExplanation.Text = My.Language.strUpdateCheck
 #Else
@@ -1942,6 +1943,8 @@ Public Class frmOptions
         chkEncryptCompleteFile.Text = My.Language.strEncryptCompleteConnectionFile
         lblLanguage.Text = My.Language.strLanguage
         lblLanguageRestartRequired.Text = String.Format(My.Language.strLanguageRestartRequired, My.Application.Info.ProductName)
+        btnThemeDelete.Text = Language.strOptionsThemeButtonDelete
+        btnThemeNew.Text = Language.strOptionsThemeButtonNew
     End Sub
 
     Public Shadows Sub Show(ByVal dockPanel As DockPanel, Optional ByVal initialTab As Integer = 0)
@@ -2105,7 +2108,7 @@ Public Class frmOptions
 
     Private Sub btnThemeNew_Click(ByVal sender As Object, ByVal e As EventArgs) Handles btnThemeNew.Click
         Dim newTheme As ThemeInfo = ThemeManager.ActiveTheme.Clone()
-        newTheme.Name = "Unnamed Theme"
+        newTheme.Name = Language.strUnnamedTheme
 
         _themeList.Add(newTheme)
 
diff --git a/mRemoteV1/Language/Language.Designer.vb b/mRemoteV1/Language/Language.Designer.vb
index 92aaafb0..d645983e 100644
--- a/mRemoteV1/Language/Language.Designer.vb
+++ b/mRemoteV1/Language/Language.Designer.vb
@@ -1326,6 +1326,15 @@ Namespace My
             End Get
         End Property
         
+        '''<summary>
+        '''  Looks up a localized string similar to Default Theme.
+        '''</summary>
+        Friend Shared ReadOnly Property strDefaultTheme() As String
+            Get
+                Return ResourceManager.GetString("strDefaultTheme", resourceCulture)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Looks up a localized string similar to Detect.
         '''</summary>
@@ -3239,6 +3248,33 @@ Namespace My
             End Get
         End Property
         
+        '''<summary>
+        '''  Looks up a localized string similar to Theme.
+        '''</summary>
+        Friend Shared ReadOnly Property strOptionsTabTheme() As String
+            Get
+                Return ResourceManager.GetString("strOptionsTabTheme", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to &amp;Delete.
+        '''</summary>
+        Friend Shared ReadOnly Property strOptionsThemeButtonDelete() As String
+            Get
+                Return ResourceManager.GetString("strOptionsThemeButtonDelete", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to &amp;New.
+        '''</summary>
+        Friend Shared ReadOnly Property strOptionsThemeButtonNew() As String
+            Get
+                Return ResourceManager.GetString("strOptionsThemeButtonNew", resourceCulture)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Looks up a localized string similar to Panel Name.
         '''</summary>
@@ -5456,6 +5492,339 @@ Namespace My
             End Get
         End Property
         
+        '''<summary>
+        '''  Looks up a localized string similar to Config Panel.
+        '''</summary>
+        Friend Shared ReadOnly Property strThemeCategoryConfigPanel() As String
+            Get
+                Return ResourceManager.GetString("strThemeCategoryConfigPanel", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Connections Panel.
+        '''</summary>
+        Friend Shared ReadOnly Property strThemeCategoryConnectionsPanel() As String
+            Get
+                Return ResourceManager.GetString("strThemeCategoryConnectionsPanel", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to General.
+        '''</summary>
+        Friend Shared ReadOnly Property strThemeCategoryGeneral() As String
+            Get
+                Return ResourceManager.GetString("strThemeCategoryGeneral", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to The background color of the config panel..
+        '''</summary>
+        Friend Shared ReadOnly Property strThemeDescriptionConfigPanelBackgroundColor() As String
+            Get
+                Return ResourceManager.GetString("strThemeDescriptionConfigPanelBackgroundColor", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to The color of the category text in the config panel..
+        '''</summary>
+        Friend Shared ReadOnly Property strThemeDescriptionConfigPanelCategoryTextColor() As String
+            Get
+                Return ResourceManager.GetString("strThemeDescriptionConfigPanelCategoryTextColor", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to The color of the grid lines in the config panel.
+        '''</summary>
+        Friend Shared ReadOnly Property strThemeDescriptionConfigPanelGridLineColor() As String
+            Get
+                Return ResourceManager.GetString("strThemeDescriptionConfigPanelGridLineColor", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to The background color of the help area of the config panel..
+        '''</summary>
+        Friend Shared ReadOnly Property strThemeDescriptionConfigPanelHelpBackgroundColor() As String
+            Get
+                Return ResourceManager.GetString("strThemeDescriptionConfigPanelHelpBackgroundColor", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to The color of the text in the help area of the config panel..
+        '''</summary>
+        Friend Shared ReadOnly Property strThemeDescriptionConfigPanelHelpTextColor() As String
+            Get
+                Return ResourceManager.GetString("strThemeDescriptionConfigPanelHelpTextColor", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to The color of the text in the config panel..
+        '''</summary>
+        Friend Shared ReadOnly Property strThemeDescriptionConfigPanelTextColor() As String
+            Get
+                Return ResourceManager.GetString("strThemeDescriptionConfigPanelTextColor", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to The background color of the connections panel..
+        '''</summary>
+        Friend Shared ReadOnly Property strThemeDescriptionConnectionsPanelBackgroundColor() As String
+            Get
+                Return ResourceManager.GetString("strThemeDescriptionConnectionsPanelBackgroundColor", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to The color of the text in the connections panel..
+        '''</summary>
+        Friend Shared ReadOnly Property strThemeDescriptionConnectionsPanelTextColor() As String
+            Get
+                Return ResourceManager.GetString("strThemeDescriptionConnectionsPanelTextColor", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to The color of the tree lines in the connections panel..
+        '''</summary>
+        Friend Shared ReadOnly Property strThemeDescriptionConnectionsPanelTreeLineColor() As String
+            Get
+                Return ResourceManager.GetString("strThemeDescriptionConnectionsPanelTreeLineColor", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to The background color of the menus..
+        '''</summary>
+        Friend Shared ReadOnly Property strThemeDescriptionMenuBackgroundColor() As String
+            Get
+                Return ResourceManager.GetString("strThemeDescriptionMenuBackgroundColor", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to The color of the text in the menus..
+        '''</summary>
+        Friend Shared ReadOnly Property strThemeDescriptionMenuTextColor() As String
+            Get
+                Return ResourceManager.GetString("strThemeDescriptionMenuTextColor", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to The background color of the search box..
+        '''</summary>
+        Friend Shared ReadOnly Property strThemeDescriptionSearchBoxBackgroundColor() As String
+            Get
+                Return ResourceManager.GetString("strThemeDescriptionSearchBoxBackgroundColor", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to The color of the text in the search box..
+        '''</summary>
+        Friend Shared ReadOnly Property strThemeDescriptionSearchBoxTextColor() As String
+            Get
+                Return ResourceManager.GetString("strThemeDescriptionSearchBoxTextColor", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to The color of the prompt text in the search box..
+        '''</summary>
+        Friend Shared ReadOnly Property strThemeDescriptionSearchBoxTextPromptColor() As String
+            Get
+                Return ResourceManager.GetString("strThemeDescriptionSearchBoxTextPromptColor", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to The background color of the toolbars..
+        '''</summary>
+        Friend Shared ReadOnly Property strThemeDescriptionToolbarBackgroundColor() As String
+            Get
+                Return ResourceManager.GetString("strThemeDescriptionToolbarBackgroundColor", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to The color of the text in the toolbars..
+        '''</summary>
+        Friend Shared ReadOnly Property strThemeDescriptionToolbarTextColor() As String
+            Get
+                Return ResourceManager.GetString("strThemeDescriptionToolbarTextColor", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to The background color of the main window..
+        '''</summary>
+        Friend Shared ReadOnly Property strThemeDescriptionWindowBackgroundColor() As String
+            Get
+                Return ResourceManager.GetString("strThemeDescriptionWindowBackgroundColor", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Config Panel Background Color.
+        '''</summary>
+        Friend Shared ReadOnly Property strThemeNameConfigPanelBackgroundColor() As String
+            Get
+                Return ResourceManager.GetString("strThemeNameConfigPanelBackgroundColor", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Config Panel Category Text Color.
+        '''</summary>
+        Friend Shared ReadOnly Property strThemeNameConfigPanelCategoryTextColor() As String
+            Get
+                Return ResourceManager.GetString("strThemeNameConfigPanelCategoryTextColor", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Config Panel Grid Line Color.
+        '''</summary>
+        Friend Shared ReadOnly Property strThemeNameConfigPanelGridLineColor() As String
+            Get
+                Return ResourceManager.GetString("strThemeNameConfigPanelGridLineColor", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Config Panel Help Background Color.
+        '''</summary>
+        Friend Shared ReadOnly Property strThemeNameConfigPanelHelpBackgroundColor() As String
+            Get
+                Return ResourceManager.GetString("strThemeNameConfigPanelHelpBackgroundColor", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Config Panel Help Text Color.
+        '''</summary>
+        Friend Shared ReadOnly Property strThemeNameConfigPanelHelpTextColor() As String
+            Get
+                Return ResourceManager.GetString("strThemeNameConfigPanelHelpTextColor", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Config Panel Text Color.
+        '''</summary>
+        Friend Shared ReadOnly Property strThemeNameConfigPanelTextColor() As String
+            Get
+                Return ResourceManager.GetString("strThemeNameConfigPanelTextColor", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Connections Panel Background Color.
+        '''</summary>
+        Friend Shared ReadOnly Property strThemeNameConnectionsPanelBackgroundColor() As String
+            Get
+                Return ResourceManager.GetString("strThemeNameConnectionsPanelBackgroundColor", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Connections Panel Text Color.
+        '''</summary>
+        Friend Shared ReadOnly Property strThemeNameConnectionsPanelTextColor() As String
+            Get
+                Return ResourceManager.GetString("strThemeNameConnectionsPanelTextColor", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Connections Panel Tree Line Color.
+        '''</summary>
+        Friend Shared ReadOnly Property strThemeNameConnectionsPanelTreeLineColor() As String
+            Get
+                Return ResourceManager.GetString("strThemeNameConnectionsPanelTreeLineColor", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Menu Background Color.
+        '''</summary>
+        Friend Shared ReadOnly Property strThemeNameMenuBackgroundColor() As String
+            Get
+                Return ResourceManager.GetString("strThemeNameMenuBackgroundColor", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Menu Text Color.
+        '''</summary>
+        Friend Shared ReadOnly Property strThemeNameMenuTextColor() As String
+            Get
+                Return ResourceManager.GetString("strThemeNameMenuTextColor", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Search Box Background Color.
+        '''</summary>
+        Friend Shared ReadOnly Property strThemeNameSearchBoxBackgroundColor() As String
+            Get
+                Return ResourceManager.GetString("strThemeNameSearchBoxBackgroundColor", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Search Box Text Color.
+        '''</summary>
+        Friend Shared ReadOnly Property strThemeNameSearchBoxTextColor() As String
+            Get
+                Return ResourceManager.GetString("strThemeNameSearchBoxTextColor", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Search Box Text Prompt Color.
+        '''</summary>
+        Friend Shared ReadOnly Property strThemeNameSearchBoxTextPromptColor() As String
+            Get
+                Return ResourceManager.GetString("strThemeNameSearchBoxTextPromptColor", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Toolbar Background Color.
+        '''</summary>
+        Friend Shared ReadOnly Property strThemeNameToolbarBackgroundColor() As String
+            Get
+                Return ResourceManager.GetString("strThemeNameToolbarBackgroundColor", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Toolbar Text Color.
+        '''</summary>
+        Friend Shared ReadOnly Property strThemeNameToolbarTextColor() As String
+            Get
+                Return ResourceManager.GetString("strThemeNameToolbarTextColor", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Window Background Color.
+        '''</summary>
+        Friend Shared ReadOnly Property strThemeNameWindowBackgroundColor() As String
+            Get
+                Return ResourceManager.GetString("strThemeNameWindowBackgroundColor", resourceCulture)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Looks up a localized string similar to Error ({0}).
         '''</summary>
@@ -5564,6 +5933,15 @@ Namespace My
             End Get
         End Property
         
+        '''<summary>
+        '''  Looks up a localized string similar to Unnamed Theme.
+        '''</summary>
+        Friend Shared ReadOnly Property strUnnamedTheme() As String
+            Get
+                Return ResourceManager.GetString("strUnnamedTheme", resourceCulture)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Looks up a localized string similar to mRemoteNG requires an update.
         '''</summary>
diff --git a/mRemoteV1/Language/Language.resx b/mRemoteV1/Language/Language.resx
index 61f2f8dd..29b6c748 100644
--- a/mRemoteV1/Language/Language.resx
+++ b/mRemoteV1/Language/Language.resx
@@ -2085,4 +2085,130 @@ mRemoteNG will now quit and begin with the installation.</value>
   <data name="strRadioCloseWarnNever" xml:space="preserve">
     <value>Do &amp;not warn me when closing connections</value>
   </data>
+  <data name="strThemeCategoryGeneral" xml:space="preserve">
+    <value>General</value>
+  </data>
+  <data name="strThemeDescriptionConfigPanelBackgroundColor" xml:space="preserve">
+    <value>The background color of the config panel.</value>
+  </data>
+  <data name="strThemeDescriptionConfigPanelCategoryTextColor" xml:space="preserve">
+    <value>The color of the category text in the config panel.</value>
+  </data>
+  <data name="strThemeDescriptionConfigPanelGridLineColor" xml:space="preserve">
+    <value>The color of the grid lines in the config panel</value>
+  </data>
+  <data name="strThemeDescriptionConfigPanelHelpBackgroundColor" xml:space="preserve">
+    <value>The background color of the help area of the config panel.</value>
+  </data>
+  <data name="strThemeDescriptionConfigPanelHelpTextColor" xml:space="preserve">
+    <value>The color of the text in the help area of the config panel.</value>
+  </data>
+  <data name="strThemeDescriptionConfigPanelTextColor" xml:space="preserve">
+    <value>The color of the text in the config panel.</value>
+  </data>
+  <data name="strThemeDescriptionConnectionsPanelBackgroundColor" xml:space="preserve">
+    <value>The background color of the connections panel.</value>
+  </data>
+  <data name="strThemeDescriptionConnectionsPanelTextColor" xml:space="preserve">
+    <value>The color of the text in the connections panel.</value>
+  </data>
+  <data name="strThemeDescriptionConnectionsPanelTreeLineColor" xml:space="preserve">
+    <value>The color of the tree lines in the connections panel.</value>
+  </data>
+  <data name="strThemeDescriptionMenuBackgroundColor" xml:space="preserve">
+    <value>The background color of the menus.</value>
+  </data>
+  <data name="strThemeDescriptionMenuTextColor" xml:space="preserve">
+    <value>The color of the text in the menus.</value>
+  </data>
+  <data name="strThemeDescriptionSearchBoxBackgroundColor" xml:space="preserve">
+    <value>The background color of the search box.</value>
+  </data>
+  <data name="strThemeDescriptionSearchBoxTextColor" xml:space="preserve">
+    <value>The color of the text in the search box.</value>
+  </data>
+  <data name="strThemeDescriptionSearchBoxTextPromptColor" xml:space="preserve">
+    <value>The color of the prompt text in the search box.</value>
+  </data>
+  <data name="strThemeDescriptionToolbarBackgroundColor" xml:space="preserve">
+    <value>The background color of the toolbars.</value>
+  </data>
+  <data name="strThemeDescriptionToolbarTextColor" xml:space="preserve">
+    <value>The color of the text in the toolbars.</value>
+  </data>
+  <data name="strThemeDescriptionWindowBackgroundColor" xml:space="preserve">
+    <value>The background color of the main window.</value>
+  </data>
+  <data name="strThemeNameConfigPanelBackgroundColor" xml:space="preserve">
+    <value>Config Panel Background Color</value>
+  </data>
+  <data name="strThemeNameConfigPanelCategoryTextColor" xml:space="preserve">
+    <value>Config Panel Category Text Color</value>
+  </data>
+  <data name="strThemeNameConfigPanelGridLineColor" xml:space="preserve">
+    <value>Config Panel Grid Line Color</value>
+  </data>
+  <data name="strThemeNameConfigPanelHelpBackgroundColor" xml:space="preserve">
+    <value>Config Panel Help Background Color</value>
+  </data>
+  <data name="strThemeNameConfigPanelHelpTextColor" xml:space="preserve">
+    <value>Config Panel Help Text Color</value>
+  </data>
+  <data name="strThemeNameConfigPanelTextColor" xml:space="preserve">
+    <value>Config Panel Text Color</value>
+  </data>
+  <data name="strThemeNameConnectionsPanelBackgroundColor" xml:space="preserve">
+    <value>Connections Panel Background Color</value>
+  </data>
+  <data name="strThemeNameConnectionsPanelTextColor" xml:space="preserve">
+    <value>Connections Panel Text Color</value>
+  </data>
+  <data name="strThemeNameConnectionsPanelTreeLineColor" xml:space="preserve">
+    <value>Connections Panel Tree Line Color</value>
+  </data>
+  <data name="strThemeNameMenuBackgroundColor" xml:space="preserve">
+    <value>Menu Background Color</value>
+  </data>
+  <data name="strThemeNameMenuTextColor" xml:space="preserve">
+    <value>Menu Text Color</value>
+  </data>
+  <data name="strThemeNameSearchBoxBackgroundColor" xml:space="preserve">
+    <value>Search Box Background Color</value>
+  </data>
+  <data name="strThemeNameSearchBoxTextColor" xml:space="preserve">
+    <value>Search Box Text Color</value>
+  </data>
+  <data name="strThemeNameSearchBoxTextPromptColor" xml:space="preserve">
+    <value>Search Box Text Prompt Color</value>
+  </data>
+  <data name="strThemeNameToolbarBackgroundColor" xml:space="preserve">
+    <value>Toolbar Background Color</value>
+  </data>
+  <data name="strThemeNameToolbarTextColor" xml:space="preserve">
+    <value>Toolbar Text Color</value>
+  </data>
+  <data name="strThemeNameWindowBackgroundColor" xml:space="preserve">
+    <value>Window Background Color</value>
+  </data>
+  <data name="strThemeCategoryConfigPanel" xml:space="preserve">
+    <value>Config Panel</value>
+  </data>
+  <data name="strThemeCategoryConnectionsPanel" xml:space="preserve">
+    <value>Connections Panel</value>
+  </data>
+  <data name="strDefaultTheme" xml:space="preserve">
+    <value>Default Theme</value>
+  </data>
+  <data name="strOptionsTabTheme" xml:space="preserve">
+    <value>Theme</value>
+  </data>
+  <data name="strOptionsThemeButtonDelete" xml:space="preserve">
+    <value>&amp;Delete</value>
+  </data>
+  <data name="strOptionsThemeButtonNew" xml:space="preserve">
+    <value>&amp;New</value>
+  </data>
+  <data name="strUnnamedTheme" xml:space="preserve">
+    <value>Unnamed Theme</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/mRemoteV1/Themes/ThemeInfo.vb b/mRemoteV1/Themes/ThemeInfo.vb
index ac37a6e5..3cac6c12 100644
--- a/mRemoteV1/Themes/ThemeInfo.vb
+++ b/mRemoteV1/Themes/ThemeInfo.vb
@@ -1,4 +1,5 @@
 Imports System.ComponentModel
+Imports mRemoteNG.Tools.LocalizedAttributes
 Imports mRemoteNG.My
 
 Namespace Themes
@@ -42,7 +43,7 @@ Namespace Themes
 #End Region
 
 #Region "Properties"
-        Private _name As String = "Unnamed Theme"
+        Private _name As String = Language.strUnnamedTheme
         <Browsable(False)> _
         Public Property Name As String
             Get
@@ -57,9 +58,9 @@ Namespace Themes
 
 #Region "General"
         Private _windowBackgroundColor As Color = SystemColors.AppWorkspace
-        <Category(vbTab & "General"), _
-            DisplayNameAttribute("Window Background Color"), _
-            DescriptionAttribute("Description")> _
+        <LocalizedCategory("strThemeCategoryGeneral", 1), _
+            LocalizedDisplayName("strThemeNameWindowBackgroundColor"), _
+            LocalizedDescription("strThemeDescriptionWindowBackgroundColor")> _
         Public Property WindowBackgroundColor() As Color
             Get
                 Return (_windowBackgroundColor)
@@ -72,10 +73,10 @@ Namespace Themes
         End Property
 
         Private _menuBackgroundColor As Color = SystemColors.Control
-        <Category(vbTab & "General"),
+        <LocalizedCategory("strThemeCategoryGeneral", 1), _
             Browsable(False),
-            DisplayNameAttribute("Menu Background Color"),
-            DescriptionAttribute("Description")>
+            LocalizedDisplayName("strThemeNameMenuBackgroundColor"),
+            LocalizedDescription("strThemeDescriptionMenuBackgroundColor")>
         Public Property MenuBackgroundColor() As Color
             Get
                 Return _menuBackgroundColor
@@ -88,10 +89,10 @@ Namespace Themes
         End Property
 
         Private _menuTextColor As Color = SystemColors.ControlText
-        <Category(vbTab & "General"),
+        <LocalizedCategory("strThemeCategoryGeneral", 1), _
             Browsable(False),
-            DisplayNameAttribute("Menu Text Color"),
-            DescriptionAttribute("Description")>
+            LocalizedDisplayName("strThemeNameMenuTextColor"),
+            LocalizedDescription("strThemeDescriptionMenuTextColor")>
         Public Property MenuTextColor() As Color
             Get
                 Return _menuTextColor
@@ -104,10 +105,10 @@ Namespace Themes
         End Property
 
         Private _toolbarBackgroundColor As Color = SystemColors.Control
-        <Category(vbTab & "General"), _
+        <LocalizedCategory("strThemeCategoryGeneral", 1), _
             Browsable(False), _
-            DisplayNameAttribute("Toolbar Background Color"), _
-            DescriptionAttribute("Description")> _
+            LocalizedDisplayName("strThemeNameToolbarBackgroundColor"), _
+            LocalizedDescription("strThemeDescriptionToolbarBackgroundColor")> _
         Public Property ToolbarBackgroundColor() As Color
             Get
                 Return _toolbarBackgroundColor
@@ -120,10 +121,10 @@ Namespace Themes
         End Property
 
         Private _toolbarTextColor As Color = SystemColors.ControlText
-        <Category(vbTab & "General"), _
+        <LocalizedCategory("strThemeCategoryGeneral", 1), _
             Browsable(False), _
-            DisplayNameAttribute("Toolbar Text Color"), _
-            DescriptionAttribute("Description")> _
+            LocalizedDisplayName("strThemeNameToolbarTextColor"), _
+            LocalizedDescription("strThemeDescriptionToolbarTextColor")> _
         Public Property ToolbarTextColor() As Color
             Get
                 Return _toolbarTextColor
@@ -138,9 +139,9 @@ Namespace Themes
 
 #Region "Connections Panel"
         Private _connectionsPanelBackgroundColor As Color = SystemColors.Window
-        <Category("Connections Panel"), _
-            DisplayNameAttribute("Connections Panel Background Color"), _
-            DescriptionAttribute("Description")> _
+        <LocalizedCategory("strThemeCategoryConnectionsPanel", 2), _
+            LocalizedDisplayName("strThemeNameConnectionsPanelBackgroundColor"), _
+            LocalizedDescription("strThemeDescriptionConnectionsPanelBackgroundColor")> _
         Public Property ConnectionsPanelBackgroundColor() As Color
             Get
                 Return _connectionsPanelBackgroundColor
@@ -153,9 +154,9 @@ Namespace Themes
         End Property
 
         Private _connectionsPanelTextColor As Color = SystemColors.WindowText
-        <Category("Connections Panel Color"),
-            DisplayNameAttribute("Connections Panel Text"),
-            DescriptionAttribute("Description")>
+        <LocalizedCategory("strThemeCategoryConnectionsPanel", 2),
+            LocalizedDisplayName("strThemeNameConnectionsPanelTextColor"),
+            LocalizedDescription("strThemeDescriptionConnectionsPanelTextColor")>
         Public Property ConnectionsPanelTextColor() As Color
             Get
                 Return _connectionsPanelTextColor
@@ -168,9 +169,9 @@ Namespace Themes
         End Property
 
         Private _connectionsPanelTreeLineColor As Color = Color.Black
-        <Category("Connections Panel"),
-            DisplayNameAttribute("Connections Panel Tree Line Color"),
-            DescriptionAttribute("Description")>
+        <LocalizedCategory("strThemeCategoryConnectionsPanel", 2),
+            LocalizedDisplayName("strThemeNameConnectionsPanelTreeLineColor"),
+            LocalizedDescription("strThemeDescriptionConnectionsPanelTreeLineColor")>
         Public Property ConnectionsPanelTreeLineColor() As Color
             Get
                 Return _connectionsPanelTreeLineColor
@@ -183,9 +184,9 @@ Namespace Themes
         End Property
 
         Private _searchBoxBackgroundColor As Color = SystemColors.Window
-        <Category("Connections Panel"), _
-            DisplayNameAttribute("Search Box Background Color"), _
-            DescriptionAttribute("Description")> _
+        <LocalizedCategory("strThemeCategoryConnectionsPanel", 2), _
+            LocalizedDisplayName("strThemeNameSearchBoxBackgroundColor"), _
+            LocalizedDescription("strThemeDescriptionSearchBoxBackgroundColor")> _
         Public Property SearchBoxBackgroundColor() As Color
             Get
                 Return _searchBoxBackgroundColor
@@ -198,9 +199,9 @@ Namespace Themes
         End Property
 
         Private _searchBoxTextPromptColor As Color = SystemColors.GrayText
-        <Category("Connections Panel"), _
-            DisplayNameAttribute("Search Box Text Prompt Color"), _
-            DescriptionAttribute("Description")> _
+        <LocalizedCategory("strThemeCategoryConnectionsPanel", 2), _
+            LocalizedDisplayName("strThemeNameSearchBoxTextPromptColor"), _
+            LocalizedDescription("strThemeDescriptionSearchBoxTextPromptColor")> _
         Public Property SearchBoxTextPromptColor() As Color
             Get
                 Return _searchBoxTextPromptColor
@@ -213,9 +214,9 @@ Namespace Themes
         End Property
 
         Private _searchBoxTextColor As Color = SystemColors.WindowText
-        <Category("Connections Panel"), _
-            DisplayNameAttribute("Search Box Text Color"), _
-            DescriptionAttribute("Description")> _
+        <LocalizedCategory("strThemeCategoryConnectionsPanel", 2), _
+            LocalizedDisplayName("strThemeNameSearchBoxTextColor"), _
+            LocalizedDescription("strThemeDescriptionSearchBoxTextColor")> _
         Public Property SearchBoxTextColor() As Color
             Get
                 Return _searchBoxTextColor
@@ -230,9 +231,9 @@ Namespace Themes
 
 #Region "Config Panel"
         Private _configPanelBackgroundColor As Color = SystemColors.Window
-        <Category("Config Panel"), _
-            DisplayNameAttribute("Config Panel Background Color"), _
-            DescriptionAttribute("Description")> _
+        <LocalizedCategory("strThemeCategoryConfigPanel", 3), _
+            LocalizedDisplayName("strThemeNameConfigPanelBackgroundColor"), _
+            LocalizedDescription("strThemeDescriptionConfigPanelBackgroundColor")> _
         Public Property ConfigPanelBackgroundColor() As Color
             Get
                 Return _configPanelBackgroundColor
@@ -245,9 +246,9 @@ Namespace Themes
         End Property
 
         Private _configPanelTextColor As Color = SystemColors.WindowText
-        <Category("Config Panel"), _
-            DisplayNameAttribute("Config Panel Text Color"), _
-            DescriptionAttribute("Description")> _
+        <LocalizedCategory("strThemeCategoryConfigPanel", 3), _
+            LocalizedDisplayName("strThemeNameConfigPanelTextColor"), _
+            LocalizedDescription("strThemeDescriptionConfigPanelTextColor")> _
         Public Property ConfigPanelTextColor() As Color
             Get
                 Return _configPanelTextColor
@@ -260,9 +261,9 @@ Namespace Themes
         End Property
 
         Private _configPanelCategoryTextColor As Color = SystemColors.ControlText
-        <Category("Config Panel"), _
-            DisplayNameAttribute("Config Panel Category Text Color"), _
-            DescriptionAttribute("Description")> _
+        <LocalizedCategory("strThemeCategoryConfigPanel", 3), _
+            LocalizedDisplayName("strThemeNameConfigPanelCategoryTextColor"), _
+            LocalizedDescription("strThemeDescriptionConfigPanelCategoryTextColor")> _
         Public Property ConfigPanelCategoryTextColor() As Color
             Get
                 Return _configPanelCategoryTextColor
@@ -275,9 +276,9 @@ Namespace Themes
         End Property
 
         Private _configPanelHelpBackgroundColor As Color = SystemColors.Control
-        <Category("Config Panel"), _
-            DisplayNameAttribute("Config Panel Help Background Color"), _
-            DescriptionAttribute("Description")> _
+        <LocalizedCategory("strThemeCategoryConfigPanel", 3), _
+            LocalizedDisplayName("strThemeNameConfigPanelHelpBackgroundColor"), _
+            LocalizedDescription("strThemeDescriptionConfigPanelHelpBackgroundColor")> _
         Public Property ConfigPanelHelpBackgroundColor() As Color
             Get
                 Return _configPanelHelpBackgroundColor
@@ -290,9 +291,9 @@ Namespace Themes
         End Property
 
         Private _configPanelHelpTextColor As Color = SystemColors.ControlText
-        <Category("Config Panel"), _
-            DisplayNameAttribute("Config Panel Help Text Color"), _
-            DescriptionAttribute("Description")> _
+        <LocalizedCategory("strThemeCategoryConfigPanel", 3), _
+            LocalizedDisplayName("strThemeNameConfigPanelHelpTextColor"), _
+            LocalizedDescription("strThemeDescriptionConfigPanelHelpTextColor")> _
         Public Property ConfigPanelHelpTextColor() As Color
             Get
                 Return _configPanelHelpTextColor
@@ -305,9 +306,9 @@ Namespace Themes
         End Property
 
         Private _configPanelGridLineColor As Color = SystemColors.InactiveBorder
-        <Category("Config Panel"), _
-            DisplayNameAttribute("Config Panel Grid Line Color"), _
-            DescriptionAttribute("Description")> _
+        <LocalizedCategory("strThemeCategoryConfigPanel", 3), _
+            LocalizedDisplayName("strThemeNameConfigPanelGridLineColor"), _
+            LocalizedDescription("strThemeDescriptionConfigPanelGridLineColor")> _
         Public Property ConfigPanelGridLineColor() As Color
             Get
                 Return _configPanelGridLineColor
diff --git a/mRemoteV1/Themes/ThemeManager.vb b/mRemoteV1/Themes/ThemeManager.vb
index f04a64d4..28263950 100644
--- a/mRemoteV1/Themes/ThemeManager.vb
+++ b/mRemoteV1/Themes/ThemeManager.vb
@@ -1,5 +1,6 @@
 Imports System.IO
 Imports System.ComponentModel
+Imports mRemoteNG.My
 
 Namespace Themes
     Public Class ThemeManager
@@ -53,7 +54,7 @@ Namespace Themes
 
 #Region "Properties"
         ' ReSharper disable InconsistentNaming
-        Private Shared ReadOnly _defaultTheme As New ThemeInfo("(Default Theme)")
+        Private Shared ReadOnly _defaultTheme As New ThemeInfo(Language.strDefaultTheme)
         ' ReSharper restore InconsistentNaming
         Public Shared ReadOnly Property DefaultTheme As ThemeInfo
             Get