diff --git a/mRemoteV1/Connection/Connection.Info.vb b/mRemoteV1/Connection/Connection.Info.vb
index a4fa4d9ee..e7fcbf796 100644
--- a/mRemoteV1/Connection/Connection.Info.vb
+++ b/mRemoteV1/Connection/Connection.Info.vb
@@ -1451,7 +1451,6 @@ Namespace Connection
 #End Region
 
 #Region "Inheritance"
-
         Public Class Inheritance
             Public Sub New(ByVal Parent As Object, Optional ByVal InheritEverything As Boolean = False)
                 Me._Parent = Parent
@@ -1552,9 +1551,11 @@ Namespace Connection
 #Region "1 General"
             <LocalizedCategory("strCategoryGeneral", 1), _
                 Browsable(True), _
-                LocalizedDisplayName("strPropertyNameInheritAll"), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameAll"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionAll"), _
                 TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _
             Public Property EverythingInherited() As Boolean
+                'LocalizedDisplayName("strPropertyNameInheritAll"), _
                 Get
                     If Me._CacheBitmaps And Me._Colors And Me._Description And Me._DisplayThemes And Me._DisplayWallpaper _
                     And Me._Domain And Me._Icon And Me._Password And Me._Port And Me._Protocol And Me._PuttySession _
@@ -1581,7 +1582,8 @@ Namespace Connection
             Private _Description As Boolean = My.Settings.InhDefaultDescription
             <LocalizedCategory("strCategoryDisplay", 2), _
                 Browsable(True), _
-                LocalizedDisplayName("strPropertyNameInheritDescription"), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameDescription"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionDescription"), _
                 TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _
             Public Property Description() As Boolean
                 Get
@@ -1595,7 +1597,8 @@ Namespace Connection
             Private _Icon As Boolean = My.Settings.InhDefaultIcon
             <LocalizedCategory("strCategoryDisplay", 2), _
                 Browsable(True), _
-                LocalizedDisplayName("strPropertyNameInheritIcon"), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameIcon"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionIcon"), _
                 TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _
             Public Property Icon() As Boolean
                 Get
@@ -1609,7 +1612,8 @@ Namespace Connection
             Private _Panel As Boolean = My.Settings.InhDefaultPanel
             <LocalizedCategory("strCategoryDisplay", 2), _
                 Browsable(True), _
-                LocalizedDisplayName("strPropertyNameInheritPanel"), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNamePanel"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionPanel"), _
                 TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _
             Public Property Panel() As Boolean
                 Get
@@ -1624,7 +1628,8 @@ Namespace Connection
             Private _Username As Boolean = My.Settings.InhDefaultUsername
             <LocalizedCategory("strCategoryConnection", 3), _
                 Browsable(True), _
-                LocalizedDisplayName("strPropertyNameInheritUsername"), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameUsername"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionUsername"), _
                 TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _
             Public Property Username() As Boolean
                 Get
@@ -1638,7 +1643,8 @@ Namespace Connection
             Private _Password As Boolean = My.Settings.InhDefaultPassword
             <LocalizedCategory("strCategoryConnection", 3), _
                 Browsable(True), _
-                LocalizedDisplayName("strPropertyNameInheritPassword"), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNamePassword"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionPassword"), _
                 TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _
             Public Property Password() As Boolean
                 Get
@@ -1652,7 +1658,8 @@ Namespace Connection
             Private _Domain As Boolean = My.Settings.InhDefaultDomain
             <LocalizedCategory("strCategoryConnection", 3), _
                 Browsable(True), _
-                LocalizedDisplayName("strPropertyNameInheritDomain"), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameDomain"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionDomain"), _
                 TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _
             Public Property Domain() As Boolean
                 Get
@@ -1667,7 +1674,8 @@ Namespace Connection
             Private _Protocol As Boolean = My.Settings.InhDefaultProtocol
             <LocalizedCategory("strCategoryProtocol", 4), _
                 Browsable(True), _
-                LocalizedDisplayName("strPropertyNameInheritProtocol"), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameProtocol"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionProtocol"), _
                 TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _
             Public Property Protocol() As Boolean
                 Get
@@ -1681,7 +1689,8 @@ Namespace Connection
             Private _ExtApp As Boolean = My.Settings.InhDefaultExtApp
             <LocalizedCategory("strCategoryProtocol", 4), _
                 Browsable(True), _
-                LocalizedDisplayName("strPropertyNameInheritExternalTool"), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameExternalTool"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionExternalTool"), _
                 TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _
             Public Property ExtApp() As Boolean
                 Get
@@ -1695,7 +1704,8 @@ Namespace Connection
             Private _Port As Boolean = My.Settings.InhDefaultPort
             <LocalizedCategory("strCategoryProtocol", 4), _
                 Browsable(True), _
-                LocalizedDisplayName("strPropertyNameInheritPort"), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNamePort"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionPort"), _
                 TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _
             Public Property Port() As Boolean
                 Get
@@ -1709,7 +1719,8 @@ Namespace Connection
             Private _PuttySession As Boolean = My.Settings.InhDefaultPuttySession
             <LocalizedCategory("strCategoryProtocol", 4), _
                 Browsable(True), _
-                LocalizedDisplayName("strPropertyNameInheritPuttySession"), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNamePuttySession"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionPuttySession"), _
                 TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _
             Public Property PuttySession() As Boolean
                 Get
@@ -1723,7 +1734,8 @@ Namespace Connection
             Private _ICAEncryption As Boolean = My.Settings.InhDefaultICAEncryptionStrength
             <LocalizedCategory("strCategoryProtocol", 4), _
                 Browsable(True), _
-                LocalizedDisplayName("strPropertyNameInheritEncryptionStrength"), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameEncryptionStrength"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionEncryptionStrength"), _
                 TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _
             Public Property ICAEncryption() As Boolean
                 Get
@@ -1737,7 +1749,8 @@ Namespace Connection
             Private _RDPAuthenticationLevel As Boolean = My.Settings.InhDefaultRDPAuthenticationLevel
             <LocalizedCategory("strCategoryProtocol", 4), _
                 Browsable(True), _
-                LocalizedDisplayName("strPropertyNameInheritAuthenticationLevel"), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameAuthenticationLevel"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionAuthenticationLevel"), _
                 TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _
             Public Property RDPAuthenticationLevel() As Boolean
                 Get
@@ -1751,7 +1764,8 @@ Namespace Connection
             Private _RenderingEngine As Boolean = My.Settings.InhDefaultRenderingEngine
             <LocalizedCategory("strCategoryProtocol", 4), _
                 Browsable(True), _
-                LocalizedDisplayName("strPropertyNameInheritRenderingEngine"), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameRenderingEngine"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionRenderingEngine"), _
                 TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _
             Public Property RenderingEngine() As Boolean
                 Get
@@ -1765,7 +1779,8 @@ Namespace Connection
             Private _UseConsoleSession As Boolean = My.Settings.InhDefaultUseConsoleSession
             <LocalizedCategory("strCategoryProtocol", 4), _
                 Browsable(True), _
-                LocalizedDisplayName("strPropertyNameInheritUseConsoleSession"), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameUseConsoleSession"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionUseConsoleSession"), _
                 TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _
             Public Property UseConsoleSession() As Boolean
                 Get
@@ -1780,7 +1795,8 @@ Namespace Connection
             Private _RDGatewayUsageMethod As Boolean = My.Settings.InhDefaultRDGatewayUsageMethod
             <LocalizedCategory("strCategoryGateway", 5), _
                 Browsable(True), _
-                LocalizedDisplayName("strPropertyNameRDGatewayUsageMethodInherit"), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameRDGatewayUsageMethod"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionRDGatewayUsageMethod"), _
                 TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _
             Public Property RDGatewayUsageMethod() As Boolean
                 Get
@@ -1794,7 +1810,8 @@ Namespace Connection
             Private _RDGatewayHostname As Boolean = My.Settings.InhDefaultRDGatewayHostname
             <LocalizedCategory("strCategoryGateway", 5), _
                 Browsable(True), _
-                LocalizedDisplayName("strPropertyNameRDGatewayHostnameInherit"), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameRDGatewayHostname"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionRDGatewayHostname"), _
                 TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _
             Public Property RDGatewayHostname() As Boolean
                 Get
@@ -1808,7 +1825,8 @@ Namespace Connection
             Private _RDGatewayUseConnectionCredentials As Boolean = My.Settings.InhDefaultRDGatewayUseConnectionCredentials
             <LocalizedCategory("strCategoryGateway", 5), _
                 Browsable(True), _
-                LocalizedDisplayName("strPropertyNameRDGatewayUseConnectionCredentialsInherit"), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameRDGatewayUseConnectionCredentials"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionRDGatewayUseConnectionCredentials"), _
                 TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _
             Public Property RDGatewayUseConnectionCredentials() As Boolean
                 Get
@@ -1822,8 +1840,8 @@ Namespace Connection
             Private _RDGatewayUsername As Boolean = My.Settings.InhDefaultRDGatewayUsername
             <LocalizedCategory("strCategoryGateway", 5), _
                 Browsable(True), _
-                LocalizedDisplayName("strPropertyNameRDGatewayUsername"), _
-                LocalizedDescription("strPropertyDescriptionRDGatewayUsername"), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameRDGatewayUsername"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionRDGatewayUsername"), _
                 TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _
             Public Property RDGatewayUsername() As Boolean
                 Get
@@ -1837,8 +1855,8 @@ Namespace Connection
             Private _RDGatewayPassword As Boolean = My.Settings.InhDefaultRDGatewayPassword
             <LocalizedCategory("strCategoryGateway", 5), _
                 Browsable(True), _
-                LocalizedDisplayName("strPropertyNameRDGatewayPasswordInherit"), _
-                LocalizedDescription("strPropertyDescriptionRDGatewayPasswordInherit"), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameRDGatewayPassword"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionRDGatewayPassword"), _
                 TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _
             Public Property RDGatewayPassword() As Boolean
                 Get
@@ -1852,7 +1870,8 @@ Namespace Connection
             Private _RDGatewayDomain As Boolean = My.Settings.InhDefaultRDGatewayDomain
             <LocalizedCategory("strCategoryGateway", 5), _
                 Browsable(True), _
-                LocalizedDisplayName("strPropertyNameRDGatewayDomainInherit"), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameRDGatewayDomain"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionRDGatewayDomain"), _
                 TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _
             Public Property RDGatewayDomain() As Boolean
                 Get
@@ -1867,7 +1886,8 @@ Namespace Connection
             Private _Resolution As Boolean = My.Settings.InhDefaultResolution
             <LocalizedCategory("strCategoryAppearance", 6), _
                 Browsable(True), _
-                LocalizedDisplayName("strPropertyNameInheritResolution"), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameResolution"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionResolution"), _
                 TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _
             Public Property Resolution() As Boolean
                 Get
@@ -1881,7 +1901,8 @@ Namespace Connection
             Private _Colors As Boolean = My.Settings.InhDefaultColors
             <LocalizedCategory("strCategoryAppearance", 6), _
                 Browsable(True), _
-                LocalizedDisplayName("strPropertyNameInheritColors"), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameColors"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionColors"), _
                 TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _
             Public Property Colors() As Boolean
                 Get
@@ -1895,7 +1916,8 @@ Namespace Connection
             Private _CacheBitmaps As Boolean = My.Settings.InhDefaultCacheBitmaps
             <LocalizedCategory("strCategoryAppearance", 6), _
                 Browsable(True), _
-                LocalizedDisplayName("strPropertyNameInheritCacheBitmaps"), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameCacheBitmaps"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionCacheBitmaps"), _
                 TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _
             Public Property CacheBitmaps() As Boolean
                 Get
@@ -1909,7 +1931,8 @@ Namespace Connection
             Private _DisplayWallpaper As Boolean = My.Settings.InhDefaultDisplayWallpaper
             <LocalizedCategory("strCategoryAppearance", 6), _
                 Browsable(True), _
-                LocalizedDisplayName("strPropertyNameInheritDisplayWallpaper"), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameDisplayWallpaper"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionDisplayWallpaper"), _
                 TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _
             Public Property DisplayWallpaper() As Boolean
                 Get
@@ -1923,7 +1946,8 @@ Namespace Connection
             Private _DisplayThemes As Boolean = My.Settings.InhDefaultDisplayThemes
             <LocalizedCategory("strCategoryAppearance", 6), _
                 Browsable(True), _
-                LocalizedDisplayName("strPropertyNameInheritDisplayThemes"), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameDisplayThemes"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionDisplayThemes"), _
                 TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _
             Public Property DisplayThemes() As Boolean
                 Get
@@ -1938,7 +1962,8 @@ Namespace Connection
             Private _RedirectKeys As Boolean = My.Settings.InhDefaultRedirectKeys
             <LocalizedCategory("strCategoryRedirect", 7), _
                 Browsable(True), _
-                LocalizedDisplayName("strPropertyNameInheritRedirectKeys"), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameRedirectKeys"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionRedirectKeys"), _
                 TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _
             Public Property RedirectKeys() As Boolean
                 Get
@@ -1952,7 +1977,8 @@ Namespace Connection
             Private _RedirectDiskDrives As Boolean = My.Settings.InhDefaultRedirectDiskDrives
             <LocalizedCategory("strCategoryRedirect", 7), _
                 Browsable(True), _
-                LocalizedDisplayName("strPropertyNameInheritRedirectDrives"), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameRedirectDrives"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionRedirectDrives"), _
                 TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _
             Public Property RedirectDiskDrives() As Boolean
                 Get
@@ -1966,7 +1992,8 @@ Namespace Connection
             Private _RedirectPrinters As Boolean = My.Settings.InhDefaultRedirectPrinters
             <LocalizedCategory("strCategoryRedirect", 7), _
                 Browsable(True), _
-                LocalizedDisplayName("strPropertyNameInheritRedirectPrinters"), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameRedirectPrinters"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionRedirectPrinters"), _
                 TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _
             Public Property RedirectPrinters() As Boolean
                 Get
@@ -1980,7 +2007,8 @@ Namespace Connection
             Private _RedirectPorts As Boolean = My.Settings.InhDefaultRedirectPorts
             <LocalizedCategory("strCategoryRedirect", 7), _
                 Browsable(True), _
-                LocalizedDisplayName("strPropertyNameInheritRedirectPorts"), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameRedirectPorts"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionRedirectPorts"), _
                 TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _
             Public Property RedirectPorts() As Boolean
                 Get
@@ -1994,7 +2022,8 @@ Namespace Connection
             Private _RedirectSmartCards As Boolean = My.Settings.InhDefaultRedirectSmartCards
             <LocalizedCategory("strCategoryRedirect", 7), _
                 Browsable(True), _
-                LocalizedDisplayName("strPropertyNameInheritRedirectSmartCards"), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameRedirectSmartCards"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionRedirectSmartCards"), _
                 TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _
             Public Property RedirectSmartCards() As Boolean
                 Get
@@ -2008,7 +2037,8 @@ Namespace Connection
             Private _RedirectSound As Boolean = My.Settings.InhDefaultRedirectSound
             <LocalizedCategory("strCategoryRedirect", 7), _
                 Browsable(True), _
-                LocalizedDisplayName("strPropertyNameInheritRedirectSounds"), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameRedirectSounds"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionRedirectSounds"), _
                 TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _
             Public Property RedirectSound() As Boolean
                 Get
@@ -2023,7 +2053,8 @@ Namespace Connection
             Private _PreExtApp As Boolean = My.Settings.InhDefaultPreExtApp
             <LocalizedCategory("strCategoryMiscellaneous", 8), _
                 Browsable(True), _
-                LocalizedDisplayName("strPropertyNameInheritExternalToolBefore"), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameExternalToolBefore"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionExternalToolBefore"), _
                 TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _
             Public Property PreExtApp() As Boolean
                 Get
@@ -2037,7 +2068,8 @@ Namespace Connection
             Private _PostExtApp As Boolean = My.Settings.InhDefaultPostExtApp
             <LocalizedCategory("strCategoryMiscellaneous", 8), _
                 Browsable(True), _
-                LocalizedDisplayName("strPropertyNameInheritExternalToolAfter"), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameExternalToolAfter"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionExternalToolAfter"), _
                 TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _
             Public Property PostExtApp() As Boolean
                 Get
@@ -2051,7 +2083,8 @@ Namespace Connection
             Private _MacAddress As Boolean = My.Settings.InhDefaultMacAddress
             <LocalizedCategory("strCategoryMiscellaneous", 8), _
                 Browsable(True), _
-                LocalizedDisplayName("strPropertyNameInheritMACAddress"), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameMACAddress"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionMACAddress"), _
                 TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _
             Public Property MacAddress() As Boolean
                 Get
@@ -2065,7 +2098,8 @@ Namespace Connection
             Private _UserField As Boolean = My.Settings.InhDefaultUserField
             <LocalizedCategory("strCategoryMiscellaneous", 8), _
                 Browsable(True), _
-                LocalizedDisplayName("strPropertyNameInheritUser1"), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameUser1"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionUser1"), _
                 TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _
             Public Property UserField() As Boolean
                 Get
@@ -2080,7 +2114,8 @@ Namespace Connection
             Private _VNCCompression As Boolean = My.Settings.InhDefaultVNCCompression
             <LocalizedCategory("strCategoryAppearance", 9), _
                 Browsable(True), _
-                LocalizedDisplayName("strPropertyNameInheritCompression"), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameCompression"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionCompression"), _
                 TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _
             Public Property VNCCompression() As Boolean
                 Get
@@ -2094,7 +2129,8 @@ Namespace Connection
             Private _VNCEncoding As Boolean = My.Settings.InhDefaultVNCEncoding
             <LocalizedCategory("strCategoryAppearance", 9), _
                 Browsable(True), _
-                LocalizedDisplayName("strPropertyNameInheritEncoding"), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameEncoding"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionEncoding"), _
                 TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _
             Public Property VNCEncoding() As Boolean
                 Get
@@ -2108,7 +2144,8 @@ Namespace Connection
             Private _VNCAuthMode As Boolean = My.Settings.InhDefaultVNCAuthMode
             <LocalizedCategory("strCategoryConnection", 9), _
                 Browsable(True), _
-                LocalizedDisplayName("strPropertyNameInheritAuthenticationMode"), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameAuthenticationMode"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionAuthenticationMode"), _
                 TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _
             Public Property VNCAuthMode() As Boolean
                 Get
@@ -2122,7 +2159,8 @@ Namespace Connection
             Private _VNCProxyType As Boolean = My.Settings.InhDefaultVNCProxyType
             <LocalizedCategory("strCategoryMiscellaneous", 9), _
                 Browsable(True), _
-                LocalizedDisplayName("strPropertyNameInheritVNCProxyType"), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameVNCProxyType"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionVNCProxyType"), _
                 TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _
             Public Property VNCProxyType() As Boolean
                 Get
@@ -2136,7 +2174,8 @@ Namespace Connection
             Private _VNCProxyIP As Boolean = My.Settings.InhDefaultVNCProxyIP
             <LocalizedCategory("strCategoryMiscellaneous", 9), _
                 Browsable(True), _
-                LocalizedDisplayName("strPropertyNameInheritVNCProxyAddress"), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameVNCProxyAddress"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionVNCProxyAddress"), _
                 TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _
             Public Property VNCProxyIP() As Boolean
                 Get
@@ -2150,7 +2189,8 @@ Namespace Connection
             Private _VNCProxyPort As Boolean = My.Settings.InhDefaultVNCProxyPort
             <LocalizedCategory("strCategoryMiscellaneous", 9), _
                 Browsable(True), _
-                LocalizedDisplayName("strPropertyNameInheritVNCProxyPort"), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameVNCProxyPort"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionVNCProxyPort"), _
                 TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _
             Public Property VNCProxyPort() As Boolean
                 Get
@@ -2164,7 +2204,8 @@ Namespace Connection
             Private _VNCProxyUsername As Boolean = My.Settings.InhDefaultVNCProxyUsername
             <LocalizedCategory("strCategoryMiscellaneous", 9), _
                 Browsable(True), _
-                LocalizedDisplayName("strPropertyNameInheritVNCProxyUsername"), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameVNCProxyUsername"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionVNCProxyUsername"), _
                 TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _
             Public Property VNCProxyUsername() As Boolean
                 Get
@@ -2178,7 +2219,8 @@ Namespace Connection
             Private _VNCProxyPassword As Boolean = My.Settings.InhDefaultVNCProxyPassword
             <LocalizedCategory("strCategoryMiscellaneous", 9), _
                 Browsable(True), _
-                LocalizedDisplayName("strPropertyNameInheritVNCProxyPassword"), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameVNCProxyPassword"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionVNCProxyPassword"), _
                 TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _
             Public Property VNCProxyPassword() As Boolean
                 Get
@@ -2192,7 +2234,8 @@ Namespace Connection
             Private _VNCColors As Boolean = My.Settings.InhDefaultVNCColors
             <LocalizedCategory("strCategoryAppearance", 9), _
                 Browsable(True), _
-                LocalizedDisplayName("strPropertyNameInheritColors"), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameColors"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionColors"), _
                 TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _
             Public Property VNCColors() As Boolean
                 Get
@@ -2206,7 +2249,8 @@ Namespace Connection
             Private _VNCSmartSizeMode As Boolean = My.Settings.InhDefaultVNCSmartSizeMode
             <LocalizedCategory("strCategoryAppearance", 9), _
                 Browsable(True), _
-                LocalizedDisplayName("strPropertyNameInheritSmartSizeMode"), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameSmartSizeMode"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionSmartSizeMode"), _
                 TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _
             Public Property VNCSmartSizeMode() As Boolean
                 Get
@@ -2220,7 +2264,8 @@ Namespace Connection
             Private _VNCViewOnly As Boolean = My.Settings.InhDefaultVNCViewOnly
             <LocalizedCategory("strCategoryAppearance", 9), _
                 Browsable(True), _
-                LocalizedDisplayName("strPropertyNameInheritViewOnly"), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameViewOnly"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionViewOnly"), _
                 TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _
             Public Property VNCViewOnly() As Boolean
                 Get
diff --git a/mRemoteV1/Language/Resources.de.resx b/mRemoteV1/Language/Resources.de.resx
index 91654c8b6..9ded4675a 100644
--- a/mRemoteV1/Language/Resources.de.resx
+++ b/mRemoteV1/Language/Resources.de.resx
@@ -643,30 +643,6 @@
   </data>
 	<data name="strPropertyNameIcon" xml:space="preserve">
     <value>Symbol</value>
-  </data>
-	<data name="strPropertyNameInheritDescription" xml:space="preserve">
-    <value>Vererbe Beschreibung</value>
-  </data>
-	<data name="strPropertyNameInheritDomain" xml:space="preserve">
-    <value>Vererbe Domäne</value>
-  </data>
-	<data name="strPropertyNameInheritIcon" xml:space="preserve">
-    <value>Vererbe Icon</value>
-  </data>
-	<data name="strPropertyNameInheritPanel" xml:space="preserve">
-    <value>Vererbe Panel</value>
-  </data>
-	<data name="strPropertyNameInheritPassword" xml:space="preserve">
-    <value>Vererbe Passwort</value>
-  </data>
-	<data name="strPropertyNameInheritPort" xml:space="preserve">
-    <value>Vererbe Port</value>
-  </data>
-	<data name="strPropertyNameInheritProtocol" xml:space="preserve">
-    <value>Vererbe Protokoll</value>
-  </data>
-	<data name="strPropertyNameInheritUsername" xml:space="preserve">
-    <value>Vererbe Benutzername</value>
   </data>
 	<data name="strPropertyNameName" xml:space="preserve">
     <value>Name</value>
@@ -823,105 +799,8 @@
     <value>Externes Programm vorher</value>
     <comment>Need translation</comment>
   </data>
-	<data name="strPropertyNameInheritAll" xml:space="preserve">
-    <value>Alles vererben</value>
-  </data>
-	<data name="strPropertyNameInheritAuthenticationLevel" xml:space="preserve">
-    <value>Vererbe Serverauthentifizierung</value>
-  </data>
-	<data name="strPropertyNameInheritAuthenticationMode" xml:space="preserve">
-    <value>Vererbe Authentication Mode</value>
-  </data>
-	<data name="strPropertyNameInheritCacheBitmaps" xml:space="preserve">
-    <value>Vererbe Cache Bitmaps</value>
-  </data>
-	<data name="strPropertyNameInheritColors" xml:space="preserve">
-    <value>Vererbe Farben</value>
-  </data>
-	<data name="strPropertyNameInheritCompression" xml:space="preserve">
-    <value>Vererbe Kompremierung</value>
-  </data>
-	<data name="strPropertyNameInheritDisplayThemes" xml:space="preserve">
-    <value>Vererbe Display Themes</value>
-  </data>
-	<data name="strPropertyNameInheritDisplayWallpaper" xml:space="preserve">
-    <value>Vererbe Display Wallpaper</value>
-  </data>
-	<data name="strPropertyNameInheritEncoding" xml:space="preserve">
-    <value>Vererbe Codierung</value>
-  </data>
-	<data name="strPropertyNameInheritEncryptionStrength" xml:space="preserve">
-    <value>Vererbe Verschlüsselungsstärke</value>
-  </data>
-	<data name="strPropertyNameInheritExternalTool" xml:space="preserve">
-    <value>Vererbe External Tool</value>
-    <comment>Need translation</comment>
-  </data>
-	<data name="strPropertyNameInheritExternalToolAfter" xml:space="preserve">
-    <value>Vererbe External Tool After</value>
-    <comment>Need translation</comment>
-  </data>
-	<data name="strPropertyNameInheritExternalToolBefore" xml:space="preserve">
-    <value>Vererbe External Tool Before</value>
-    <comment>Need translation</comment>
-  </data>
-	<data name="strPropertyNameInheritMACAddress" xml:space="preserve">
-    <value>Vererbe MAC Adresse</value>
-  </data>
-	<data name="strPropertyNameInheritPuttySession" xml:space="preserve">
-    <value>Vererbe PuTTY Sitzung</value>
-  </data>
-	<data name="strPropertyNameInheritRedirectDrives" xml:space="preserve">
-    <value>Vererbe Disk Drives</value>
-  </data>
-	<data name="strPropertyNameInheritRedirectKeys" xml:space="preserve">
-    <value>Vererbe Key Combinations</value>
-  </data>
-	<data name="strPropertyNameInheritRedirectPorts" xml:space="preserve">
-    <value>Vererbe Ports</value>
-  </data>
-	<data name="strPropertyNameInheritRedirectPrinters" xml:space="preserve">
-    <value>Vererbe Printers</value>
-  </data>
-	<data name="strPropertyNameInheritRedirectSmartCards" xml:space="preserve">
-    <value>Vererbe Smart Cards</value>
-  </data>
-	<data name="strPropertyNameInheritRedirectSounds" xml:space="preserve">
-    <value>Vererbe Sounds</value>
-  </data>
-	<data name="strPropertyNameInheritRenderingEngine" xml:space="preserve">
-    <value>Vererbe Rendering Engine</value>
-  </data>
-	<data name="strPropertyNameInheritResolution" xml:space="preserve">
-    <value>Vererbe Resolution</value>
-  </data>
-	<data name="strPropertyNameInheritSmartSizeMode" xml:space="preserve">
-    <value>Vererbe SmartSize Modus</value>
-  </data>
-	<data name="strPropertyNameInheritUseConsoleSession" xml:space="preserve">
-    <value>Vererbe Verwende Konsolen Sitzung</value>
-  </data>
-	<data name="strPropertyNameInheritUser1" xml:space="preserve">
-    <value>Vererbe Benutzer Feld</value>
-  </data>
-	<data name="strPropertyNameInheritViewOnly" xml:space="preserve">
-    <value>Vererbe View-Only</value>
-  </data>
-	<data name="strPropertyNameInheritVNCProxyAddress" xml:space="preserve">
-    <value>Vererbe Proxy Address</value>
-    <comment>Need translation</comment>
-  </data>
-	<data name="strPropertyNameInheritVNCProxyPassword" xml:space="preserve">
-    <value>Vererbe Proxy Passwort</value>
-  </data>
-	<data name="strPropertyNameInheritVNCProxyPort" xml:space="preserve">
-    <value>Vererbe Proxy Port</value>
-  </data>
-	<data name="strPropertyNameInheritVNCProxyType" xml:space="preserve">
-    <value>Vererbe Proxy Typ</value>
-  </data>
-	<data name="strPropertyNameInheritVNCProxyUsername" xml:space="preserve">
-    <value>Vererbe Proxy Benutzername</value>
+	<data name="strPropertyNameAll" xml:space="preserve">
+    <value>Alles</value>
   </data>
 	<data name="strPropertyNameMACAddress" xml:space="preserve">
     <value>MAC Adresse</value>
@@ -1229,9 +1108,6 @@ Wenn Sie noch immer Probleme mit der (RDP) Sitzungs Funktion in mRemoteNG haben,
 	<data name="strPropertyDescriptionRDGatewayUsageMethod" xml:space="preserve">
 		<value>Spezifiziert ob ein Remote Desktop Gateway (RD Gateway) Server verwendet werden soll.</value>
 	</data>
-	<data name="strPropertyNameRDGatewayPasswordInherit" xml:space="preserve">
-		<value>Vererbe Gateway Passwort</value>
-	</data>
 	<data name="strPropertyNameRDGatewayUsername" xml:space="preserve">
 		<value>Gateway Benutzername</value>
 	</data>
@@ -1286,15 +1162,6 @@ Wenn Sie noch immer Probleme mit der (RDP) Sitzungs Funktion in mRemoteNG haben,
 	<data name="strPropertyDescriptionRDGatewayDomain" xml:space="preserve">
 		<value>Gibt den Domänennamen an, der für die Verbindung zum Gateway Server verwendet werden soll.</value>
 	</data>
-	<data name="strPropertyNameRDGatewayUsageMethodInherit" xml:space="preserve">
-		<value>Vererbe Verwende Gateway</value>
-	</data>
-	<data name="strPropertyNameRDGatewayUseConnectionCredentialsInherit" xml:space="preserve">
-		<value>Vererbe Gateway Anmeldedaten</value>
-	</data>
-	<data name="strPropertyNameRDGatewayHostnameInherit" xml:space="preserve">
-		<value>Vererbe Gateway Hostname</value>
-	</data>
 	<data name="strNoCompression" xml:space="preserve">
 		<value>Keine Kompression</value>
 	</data>
@@ -2075,7 +1942,13 @@ Fehler Beschreibung: {1}</value>
 	<data name="strConnectionSetDefaultPortFailed" xml:space="preserve">
 		<value>Setzen der Standard Verbindungsdaten fehlgeschlagen!</value>
 	</data>
-	<data name="strPropertyNameRDGatewayDomainInherit" xml:space="preserve">
-		<value>Vererbe Gateway Domäne</value>
+	<data name="strFormatInherit" xml:space="preserve">
+		<value>Vererbe {0}</value>
+	</data>
+	<data name="strFormatInheritDescription" xml:space="preserve">
+		<value>Beschreibung des zu vererbenden Elements: {0}</value>
+	</data>
+	<data name="strPropertyDescriptionAll" xml:space="preserve">
+		<value>Umschalten aller Vererbungen</value>
 	</data>
 </root>
\ No newline at end of file
diff --git a/mRemoteV1/Language/Resources.en-US.resx b/mRemoteV1/Language/Resources.en-US.resx
index 09b087c0a..73dd11859 100644
--- a/mRemoteV1/Language/Resources.en-US.resx
+++ b/mRemoteV1/Language/Resources.en-US.resx
@@ -122,9 +122,6 @@
   </data>
 	<data name="strPropertyNameColors" xml:space="preserve">
     <value>Colors</value>
-  </data>
-	<data name="strPropertyNameInheritColors" xml:space="preserve">
-    <value>Inherit Colors</value>
   </data>
 	<data name="strComponentsCheck" xml:space="preserve">
 		<value>Components Check</value>
diff --git a/mRemoteV1/My Project/Resources.Designer.vb b/mRemoteV1/My Project/Resources.Designer.vb
index 0a3ebce65..49d401c27 100644
--- a/mRemoteV1/My Project/Resources.Designer.vb	
+++ b/mRemoteV1/My Project/Resources.Designer.vb	
@@ -2213,6 +2213,24 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Zeichenfolge, die Inherit {0} ähnelt.
+        '''</summary>
+        Friend ReadOnly Property strFormatInherit() As String
+            Get
+                Return ResourceManager.GetString("strFormatInherit", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Zeichenfolge, die Description of inherited property: {0} ähnelt.
+        '''</summary>
+        Friend ReadOnly Property strFormatInheritDescription() As String
+            Get
+                Return ResourceManager.GetString("strFormatInheritDescription", resourceCulture)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Zeichenfolge, die Free ähnelt.
         '''</summary>
@@ -3690,6 +3708,15 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Zeichenfolge, die Toggle all inheritance options. ähnelt.
+        '''</summary>
+        Friend ReadOnly Property strPropertyDescriptionAll() As String
+            Get
+                Return ResourceManager.GetString("strPropertyDescriptionAll", resourceCulture)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Zeichenfolge, die Select which authentication level this connection should use. ähnelt.
         '''</summary>
@@ -4104,6 +4131,15 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Zeichenfolge, die All ähnelt.
+        '''</summary>
+        Friend ReadOnly Property strPropertyNameAll() As String
+            Get
+                Return ResourceManager.GetString("strPropertyNameAll", resourceCulture)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Zeichenfolge, die Server Authentication ähnelt.
         '''</summary>
@@ -4239,366 +4275,6 @@ Namespace My.Resources
             End Get
         End Property
         
-        '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die Inherit All ähnelt.
-        '''</summary>
-        Friend ReadOnly Property strPropertyNameInheritAll() As String
-            Get
-                Return ResourceManager.GetString("strPropertyNameInheritAll", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die Inherit Server Authentication ähnelt.
-        '''</summary>
-        Friend ReadOnly Property strPropertyNameInheritAuthenticationLevel() As String
-            Get
-                Return ResourceManager.GetString("strPropertyNameInheritAuthenticationLevel", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die Inherit Authentication Mode ähnelt.
-        '''</summary>
-        Friend ReadOnly Property strPropertyNameInheritAuthenticationMode() As String
-            Get
-                Return ResourceManager.GetString("strPropertyNameInheritAuthenticationMode", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die Inherit Cache Bitmaps ähnelt.
-        '''</summary>
-        Friend ReadOnly Property strPropertyNameInheritCacheBitmaps() As String
-            Get
-                Return ResourceManager.GetString("strPropertyNameInheritCacheBitmaps", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die Inherit Colours ähnelt.
-        '''</summary>
-        Friend ReadOnly Property strPropertyNameInheritColors() As String
-            Get
-                Return ResourceManager.GetString("strPropertyNameInheritColors", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die Inherit Compression ähnelt.
-        '''</summary>
-        Friend ReadOnly Property strPropertyNameInheritCompression() As String
-            Get
-                Return ResourceManager.GetString("strPropertyNameInheritCompression", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die Inherit Description ähnelt.
-        '''</summary>
-        Friend ReadOnly Property strPropertyNameInheritDescription() As String
-            Get
-                Return ResourceManager.GetString("strPropertyNameInheritDescription", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die Inherit Display Themes ähnelt.
-        '''</summary>
-        Friend ReadOnly Property strPropertyNameInheritDisplayThemes() As String
-            Get
-                Return ResourceManager.GetString("strPropertyNameInheritDisplayThemes", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die Inherit Display Wallpaper ähnelt.
-        '''</summary>
-        Friend ReadOnly Property strPropertyNameInheritDisplayWallpaper() As String
-            Get
-                Return ResourceManager.GetString("strPropertyNameInheritDisplayWallpaper", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die Inherit Domain ähnelt.
-        '''</summary>
-        Friend ReadOnly Property strPropertyNameInheritDomain() As String
-            Get
-                Return ResourceManager.GetString("strPropertyNameInheritDomain", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die Inherit Encoding ähnelt.
-        '''</summary>
-        Friend ReadOnly Property strPropertyNameInheritEncoding() As String
-            Get
-                Return ResourceManager.GetString("strPropertyNameInheritEncoding", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die Inherit Encryption Strength ähnelt.
-        '''</summary>
-        Friend ReadOnly Property strPropertyNameInheritEncryptionStrength() As String
-            Get
-                Return ResourceManager.GetString("strPropertyNameInheritEncryptionStrength", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die Inherit External Tool ähnelt.
-        '''</summary>
-        Friend ReadOnly Property strPropertyNameInheritExternalTool() As String
-            Get
-                Return ResourceManager.GetString("strPropertyNameInheritExternalTool", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die Inherit External Tool After ähnelt.
-        '''</summary>
-        Friend ReadOnly Property strPropertyNameInheritExternalToolAfter() As String
-            Get
-                Return ResourceManager.GetString("strPropertyNameInheritExternalToolAfter", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die Inherit External Tool Before ähnelt.
-        '''</summary>
-        Friend ReadOnly Property strPropertyNameInheritExternalToolBefore() As String
-            Get
-                Return ResourceManager.GetString("strPropertyNameInheritExternalToolBefore", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die Inherit Icon ähnelt.
-        '''</summary>
-        Friend ReadOnly Property strPropertyNameInheritIcon() As String
-            Get
-                Return ResourceManager.GetString("strPropertyNameInheritIcon", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die Inherit MAC Address ähnelt.
-        '''</summary>
-        Friend ReadOnly Property strPropertyNameInheritMACAddress() As String
-            Get
-                Return ResourceManager.GetString("strPropertyNameInheritMACAddress", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die Inherit Panel ähnelt.
-        '''</summary>
-        Friend ReadOnly Property strPropertyNameInheritPanel() As String
-            Get
-                Return ResourceManager.GetString("strPropertyNameInheritPanel", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die Inherit Password ähnelt.
-        '''</summary>
-        Friend ReadOnly Property strPropertyNameInheritPassword() As String
-            Get
-                Return ResourceManager.GetString("strPropertyNameInheritPassword", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die Inherit Port ähnelt.
-        '''</summary>
-        Friend ReadOnly Property strPropertyNameInheritPort() As String
-            Get
-                Return ResourceManager.GetString("strPropertyNameInheritPort", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die Inherit Protocol ähnelt.
-        '''</summary>
-        Friend ReadOnly Property strPropertyNameInheritProtocol() As String
-            Get
-                Return ResourceManager.GetString("strPropertyNameInheritProtocol", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die Inherit PuTTY Session ähnelt.
-        '''</summary>
-        Friend ReadOnly Property strPropertyNameInheritPuttySession() As String
-            Get
-                Return ResourceManager.GetString("strPropertyNameInheritPuttySession", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die Inherit Disk Drives ähnelt.
-        '''</summary>
-        Friend ReadOnly Property strPropertyNameInheritRedirectDrives() As String
-            Get
-                Return ResourceManager.GetString("strPropertyNameInheritRedirectDrives", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die Inherit Key Combinations ähnelt.
-        '''</summary>
-        Friend ReadOnly Property strPropertyNameInheritRedirectKeys() As String
-            Get
-                Return ResourceManager.GetString("strPropertyNameInheritRedirectKeys", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die Inherit Ports ähnelt.
-        '''</summary>
-        Friend ReadOnly Property strPropertyNameInheritRedirectPorts() As String
-            Get
-                Return ResourceManager.GetString("strPropertyNameInheritRedirectPorts", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die Inherit Printers ähnelt.
-        '''</summary>
-        Friend ReadOnly Property strPropertyNameInheritRedirectPrinters() As String
-            Get
-                Return ResourceManager.GetString("strPropertyNameInheritRedirectPrinters", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die Inherit Smart Cards ähnelt.
-        '''</summary>
-        Friend ReadOnly Property strPropertyNameInheritRedirectSmartCards() As String
-            Get
-                Return ResourceManager.GetString("strPropertyNameInheritRedirectSmartCards", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die Inherit Sounds ähnelt.
-        '''</summary>
-        Friend ReadOnly Property strPropertyNameInheritRedirectSounds() As String
-            Get
-                Return ResourceManager.GetString("strPropertyNameInheritRedirectSounds", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die Inherit Rendering Engine ähnelt.
-        '''</summary>
-        Friend ReadOnly Property strPropertyNameInheritRenderingEngine() As String
-            Get
-                Return ResourceManager.GetString("strPropertyNameInheritRenderingEngine", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die Inherit Resolution ähnelt.
-        '''</summary>
-        Friend ReadOnly Property strPropertyNameInheritResolution() As String
-            Get
-                Return ResourceManager.GetString("strPropertyNameInheritResolution", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die Inherit SmartSize Mode ähnelt.
-        '''</summary>
-        Friend ReadOnly Property strPropertyNameInheritSmartSizeMode() As String
-            Get
-                Return ResourceManager.GetString("strPropertyNameInheritSmartSizeMode", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die Inherit Use Console Session ähnelt.
-        '''</summary>
-        Friend ReadOnly Property strPropertyNameInheritUseConsoleSession() As String
-            Get
-                Return ResourceManager.GetString("strPropertyNameInheritUseConsoleSession", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die Inherit User Field ähnelt.
-        '''</summary>
-        Friend ReadOnly Property strPropertyNameInheritUser1() As String
-            Get
-                Return ResourceManager.GetString("strPropertyNameInheritUser1", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die Inherit Username ähnelt.
-        '''</summary>
-        Friend ReadOnly Property strPropertyNameInheritUsername() As String
-            Get
-                Return ResourceManager.GetString("strPropertyNameInheritUsername", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die Inherit View Only ähnelt.
-        '''</summary>
-        Friend ReadOnly Property strPropertyNameInheritViewOnly() As String
-            Get
-                Return ResourceManager.GetString("strPropertyNameInheritViewOnly", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die Inherit Proxy Address ähnelt.
-        '''</summary>
-        Friend ReadOnly Property strPropertyNameInheritVNCProxyAddress() As String
-            Get
-                Return ResourceManager.GetString("strPropertyNameInheritVNCProxyAddress", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die Inherit Proxy Password ähnelt.
-        '''</summary>
-        Friend ReadOnly Property strPropertyNameInheritVNCProxyPassword() As String
-            Get
-                Return ResourceManager.GetString("strPropertyNameInheritVNCProxyPassword", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die Inherit Proxy Port ähnelt.
-        '''</summary>
-        Friend ReadOnly Property strPropertyNameInheritVNCProxyPort() As String
-            Get
-                Return ResourceManager.GetString("strPropertyNameInheritVNCProxyPort", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die Inherit Proxy Type ähnelt.
-        '''</summary>
-        Friend ReadOnly Property strPropertyNameInheritVNCProxyType() As String
-            Get
-                Return ResourceManager.GetString("strPropertyNameInheritVNCProxyType", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die Inherit Proxy Username ähnelt.
-        '''</summary>
-        Friend ReadOnly Property strPropertyNameInheritVNCProxyUsername() As String
-            Get
-                Return ResourceManager.GetString("strPropertyNameInheritVNCProxyUsername", resourceCulture)
-            End Get
-        End Property
-        
         '''<summary>
         '''  Sucht eine lokalisierte Zeichenfolge, die MAC Address ähnelt.
         '''</summary>
@@ -4671,15 +4347,6 @@ Namespace My.Resources
             End Get
         End Property
         
-        '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die Inherit Gateway Domain ähnelt.
-        '''</summary>
-        Friend ReadOnly Property strPropertyNameRDGatewayDomainInherit() As String
-            Get
-                Return ResourceManager.GetString("strPropertyNameRDGatewayDomainInherit", resourceCulture)
-            End Get
-        End Property
-        
         '''<summary>
         '''  Sucht eine lokalisierte Zeichenfolge, die Gateway Hostname ähnelt.
         '''</summary>
@@ -4689,15 +4356,6 @@ Namespace My.Resources
             End Get
         End Property
         
-        '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die Inherit Gateway Hostname ähnelt.
-        '''</summary>
-        Friend ReadOnly Property strPropertyNameRDGatewayHostnameInherit() As String
-            Get
-                Return ResourceManager.GetString("strPropertyNameRDGatewayHostnameInherit", resourceCulture)
-            End Get
-        End Property
-        
         '''<summary>
         '''  Sucht eine lokalisierte Zeichenfolge, die Remote Desktop Gateway Password ähnelt.
         '''</summary>
@@ -4707,15 +4365,6 @@ Namespace My.Resources
             End Get
         End Property
         
-        '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die Inherit Remote Desktop Gateway Password ähnelt.
-        '''</summary>
-        Friend ReadOnly Property strPropertyNameRDGatewayPasswordInherit() As String
-            Get
-                Return ResourceManager.GetString("strPropertyNameRDGatewayPasswordInherit", resourceCulture)
-            End Get
-        End Property
-        
         '''<summary>
         '''  Sucht eine lokalisierte Zeichenfolge, die Use Gateway ähnelt.
         '''</summary>
@@ -4725,15 +4374,6 @@ Namespace My.Resources
             End Get
         End Property
         
-        '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die Inherit Use Gateway ähnelt.
-        '''</summary>
-        Friend ReadOnly Property strPropertyNameRDGatewayUsageMethodInherit() As String
-            Get
-                Return ResourceManager.GetString("strPropertyNameRDGatewayUsageMethodInherit", resourceCulture)
-            End Get
-        End Property
-        
         '''<summary>
         '''  Sucht eine lokalisierte Zeichenfolge, die Gateway Credentials ähnelt.
         '''</summary>
@@ -4743,15 +4383,6 @@ Namespace My.Resources
             End Get
         End Property
         
-        '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die Inherit Gateway Credentials ähnelt.
-        '''</summary>
-        Friend ReadOnly Property strPropertyNameRDGatewayUseConnectionCredentialsInherit() As String
-            Get
-                Return ResourceManager.GetString("strPropertyNameRDGatewayUseConnectionCredentialsInherit", resourceCulture)
-            End Get
-        End Property
-        
         '''<summary>
         '''  Sucht eine lokalisierte Zeichenfolge, die Gateway Username ähnelt.
         '''</summary>
diff --git a/mRemoteV1/My Project/Resources.resx b/mRemoteV1/My Project/Resources.resx
index b14974989..47a9e960b 100644
--- a/mRemoteV1/My Project/Resources.resx	
+++ b/mRemoteV1/My Project/Resources.resx	
@@ -1002,30 +1002,6 @@
   </data>
 	<data name="strPropertyNameIcon" xml:space="preserve">
     <value>Icon</value>
-  </data>
-	<data name="strPropertyNameInheritDescription" xml:space="preserve">
-    <value>Inherit Description</value>
-  </data>
-	<data name="strPropertyNameInheritDomain" xml:space="preserve">
-    <value>Inherit Domain</value>
-  </data>
-	<data name="strPropertyNameInheritIcon" xml:space="preserve">
-    <value>Inherit Icon</value>
-  </data>
-	<data name="strPropertyNameInheritPanel" xml:space="preserve">
-    <value>Inherit Panel</value>
-  </data>
-	<data name="strPropertyNameInheritPassword" xml:space="preserve">
-    <value>Inherit Password</value>
-  </data>
-	<data name="strPropertyNameInheritPort" xml:space="preserve">
-    <value>Inherit Port</value>
-  </data>
-	<data name="strPropertyNameInheritProtocol" xml:space="preserve">
-    <value>Inherit Protocol</value>
-  </data>
-	<data name="strPropertyNameInheritUsername" xml:space="preserve">
-    <value>Inherit Username</value>
   </data>
 	<data name="strPropertyNameName" xml:space="preserve">
     <value>Name</value>
@@ -1174,101 +1150,8 @@
 	<data name="strPropertyNameExternalToolBefore" xml:space="preserve">
     <value>External Tool Before</value>
   </data>
-	<data name="strPropertyNameInheritAll" xml:space="preserve">
-    <value>Inherit All</value>
-  </data>
-	<data name="strPropertyNameInheritAuthenticationLevel" xml:space="preserve">
-    <value>Inherit Server Authentication</value>
-  </data>
-	<data name="strPropertyNameInheritAuthenticationMode" xml:space="preserve">
-    <value>Inherit Authentication Mode</value>
-  </data>
-	<data name="strPropertyNameInheritCacheBitmaps" xml:space="preserve">
-    <value>Inherit Cache Bitmaps</value>
-  </data>
-	<data name="strPropertyNameInheritColors" xml:space="preserve">
-    <value>Inherit Colours</value>
-  </data>
-	<data name="strPropertyNameInheritCompression" xml:space="preserve">
-    <value>Inherit Compression</value>
-  </data>
-	<data name="strPropertyNameInheritDisplayThemes" xml:space="preserve">
-    <value>Inherit Display Themes</value>
-  </data>
-	<data name="strPropertyNameInheritDisplayWallpaper" xml:space="preserve">
-    <value>Inherit Display Wallpaper</value>
-  </data>
-	<data name="strPropertyNameInheritEncoding" xml:space="preserve">
-    <value>Inherit Encoding</value>
-  </data>
-	<data name="strPropertyNameInheritEncryptionStrength" xml:space="preserve">
-    <value>Inherit Encryption Strength</value>
-  </data>
-	<data name="strPropertyNameInheritExternalTool" xml:space="preserve">
-    <value>Inherit External Tool</value>
-  </data>
-	<data name="strPropertyNameInheritExternalToolAfter" xml:space="preserve">
-    <value>Inherit External Tool After</value>
-  </data>
-	<data name="strPropertyNameInheritExternalToolBefore" xml:space="preserve">
-    <value>Inherit External Tool Before</value>
-  </data>
-	<data name="strPropertyNameInheritMACAddress" xml:space="preserve">
-    <value>Inherit MAC Address</value>
-  </data>
-	<data name="strPropertyNameInheritPuttySession" xml:space="preserve">
-    <value>Inherit PuTTY Session</value>
-  </data>
-	<data name="strPropertyNameInheritRedirectDrives" xml:space="preserve">
-    <value>Inherit Disk Drives</value>
-  </data>
-	<data name="strPropertyNameInheritRedirectKeys" xml:space="preserve">
-    <value>Inherit Key Combinations</value>
-  </data>
-	<data name="strPropertyNameInheritRedirectPorts" xml:space="preserve">
-    <value>Inherit Ports</value>
-  </data>
-	<data name="strPropertyNameInheritRedirectPrinters" xml:space="preserve">
-    <value>Inherit Printers</value>
-  </data>
-	<data name="strPropertyNameInheritRedirectSmartCards" xml:space="preserve">
-    <value>Inherit Smart Cards</value>
-  </data>
-	<data name="strPropertyNameInheritRedirectSounds" xml:space="preserve">
-    <value>Inherit Sounds</value>
-  </data>
-	<data name="strPropertyNameInheritRenderingEngine" xml:space="preserve">
-    <value>Inherit Rendering Engine</value>
-  </data>
-	<data name="strPropertyNameInheritResolution" xml:space="preserve">
-    <value>Inherit Resolution</value>
-  </data>
-	<data name="strPropertyNameInheritSmartSizeMode" xml:space="preserve">
-    <value>Inherit SmartSize Mode</value>
-  </data>
-	<data name="strPropertyNameInheritUseConsoleSession" xml:space="preserve">
-    <value>Inherit Use Console Session</value>
-  </data>
-	<data name="strPropertyNameInheritUser1" xml:space="preserve">
-    <value>Inherit User Field</value>
-  </data>
-	<data name="strPropertyNameInheritViewOnly" xml:space="preserve">
-    <value>Inherit View Only</value>
-  </data>
-	<data name="strPropertyNameInheritVNCProxyAddress" xml:space="preserve">
-    <value>Inherit Proxy Address</value>
-  </data>
-	<data name="strPropertyNameInheritVNCProxyPassword" xml:space="preserve">
-    <value>Inherit Proxy Password</value>
-  </data>
-	<data name="strPropertyNameInheritVNCProxyPort" xml:space="preserve">
-    <value>Inherit Proxy Port</value>
-  </data>
-	<data name="strPropertyNameInheritVNCProxyType" xml:space="preserve">
-    <value>Inherit Proxy Type</value>
-  </data>
-	<data name="strPropertyNameInheritVNCProxyUsername" xml:space="preserve">
-    <value>Inherit Proxy Username</value>
+	<data name="strPropertyNameAll" xml:space="preserve">
+    <value>All</value>
   </data>
 	<data name="strPropertyNameMACAddress" xml:space="preserve">
     <value>MAC Address</value>
@@ -1535,9 +1418,6 @@ If you are still not able to pass this check or use the (RDP) Sessions feature i
   </data>
 	<data name="strPropertyDescriptionRDGatewayUsageMethod" xml:space="preserve">
     <value>Specifies when to use a Remote Desktop Gateway (RD Gateway) server.</value>
-  </data>
-	<data name="strPropertyNameRDGatewayPasswordInherit" xml:space="preserve">
-    <value>Inherit Remote Desktop Gateway Password</value>
   </data>
 	<data name="strPropertyNameRDGatewayUsername" xml:space="preserve">
     <value>Gateway Username</value>
@@ -1592,15 +1472,6 @@ If you are still not able to pass this check or use the (RDP) Sessions feature i
   </data>
 	<data name="strPropertyDescriptionRDGatewayDomain" xml:space="preserve">
     <value>Specifies the domain name that a user provides to connect to the RD Gateway server.</value>
-  </data>
-	<data name="strPropertyNameRDGatewayUsageMethodInherit" xml:space="preserve">
-    <value>Inherit Use Gateway</value>
-  </data>
-	<data name="strPropertyNameRDGatewayUseConnectionCredentialsInherit" xml:space="preserve">
-    <value>Inherit Gateway Credentials</value>
-  </data>
-	<data name="strPropertyNameRDGatewayHostnameInherit" xml:space="preserve">
-    <value>Inherit Gateway Hostname</value>
   </data>
 	<data name="strNoCompression" xml:space="preserve">
     <value>No Compression</value>
@@ -2388,7 +2259,13 @@ Error Description: {1}</value>
 	<data name="strConnectionSetDefaultPortFailed" xml:space="preserve">
 		<value>Couldn't set default port!</value>
 	</data>
-	<data name="strPropertyNameRDGatewayDomainInherit" xml:space="preserve">
-		<value>Inherit Gateway Domain</value>
+	<data name="strFormatInherit" xml:space="preserve">
+		<value>Inherit {0}</value>
+	</data>
+	<data name="strPropertyDescriptionAll" xml:space="preserve">
+		<value>Toggle all inheritance options.</value>
+	</data>
+	<data name="strFormatInheritDescription" xml:space="preserve">
+		<value>Description of inherited property: {0}</value>
 	</data>
 </root>
\ No newline at end of file
diff --git a/mRemoteV1/Tools/Tools.LocalizedAttributes.vb b/mRemoteV1/Tools/Tools.LocalizedAttributes.vb
index 6d21327de..d2c6faa8e 100644
--- a/mRemoteV1/Tools/Tools.LocalizedAttributes.vb
+++ b/mRemoteV1/Tools/Tools.LocalizedAttributes.vb
@@ -73,5 +73,58 @@ Namespace Tools
                 End Get
             End Property
         End Class
+
+#Region "Special localization - with String.Format"
+
+        <AttributeUsage(AttributeTargets.All, AllowMultiple:=False, Inherited:=True)> _
+        Public Class LocalizedDisplayNameInheritAttribute
+            Inherits DisplayNameAttribute
+
+            Private Localized As Boolean
+
+            Public Sub New(ByVal value As String)
+                MyBase.New(value)
+
+                Me.Localized = False
+            End Sub
+
+            Public Overrides ReadOnly Property DisplayName() As String
+                Get
+                    If Not Me.Localized Then
+                        Me.Localized = True
+                        Me.DisplayNameValue = String.Format(My.Resources.strFormatInherit, My.Resources.ResourceManager.GetString(Me.DisplayNameValue))
+                    End If
+
+                    Return MyBase.DisplayName
+                End Get
+            End Property
+        End Class
+
+        <AttributeUsage(AttributeTargets.All, AllowMultiple:=False, Inherited:=True)> _
+        Public Class LocalizedDescriptionInheritAttribute
+            Inherits DescriptionAttribute
+
+            Private Localized As Boolean
+
+            Public Sub New(ByVal value As String)
+                MyBase.New(value)
+
+                Me.Localized = False
+            End Sub
+
+            Public Overrides ReadOnly Property Description() As String
+                Get
+                    If Not Me.Localized Then
+                        Me.Localized = True
+                        Me.DescriptionValue = String.Format(My.Resources.strFormatInheritDescription, My.Resources.ResourceManager.GetString(Me.DescriptionValue))
+                    End If
+
+                    Return MyBase.Description
+                End Get
+            End Property
+        End Class
+#End Region
+
     End Class
+
 End Namespace