diff --git a/README.md b/README.md
index 45222a2..ea42806 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ DITE supports
 * Delphi 7. 
 * RAD Studio 2005-2010 
 * RAD Studio XE-XE8 
-* RAD Studio 10 Seattle, RAD Studio 10.1 Berlin, RAD Studio 10.2 Tokyo, RAD Studio 10.3 Rio, RAD Studio 10.4 Sydney, RAD Studio 11 Alexandria
+* RAD Studio 10 Seattle, 10.1 Berlin, 10.2 Tokyo, 10.3 Rio, 10.4 Sydney, 11 Alexandria, 12 Athens
 * Lazarus v1.0.6
 * Appmethod 1.13-1.16
 * Smart Mobile Studio IDE v1.1.2.17
diff --git a/delphi-ide-theme-editor/DITE.dproj b/delphi-ide-theme-editor/DITE.dproj
index 3476444..20040e0 100644
--- a/delphi-ide-theme-editor/DITE.dproj
+++ b/delphi-ide-theme-editor/DITE.dproj
@@ -131,10 +131,10 @@
         <DCC_DebugInformation>true</DCC_DebugInformation>
         <DCC_MapFile>3</DCC_MapFile>
         <DCC_GenerateStackFrames>true</DCC_GenerateStackFrames>
-        <VerInfo_MinorVer>97</VerInfo_MinorVer>
+        <VerInfo_MinorVer>98</VerInfo_MinorVer>
         <VerInfo_Build>1</VerInfo_Build>
         <DCC_UNIT_PLATFORM>false</DCC_UNIT_PLATFORM>
-        <VerInfo_Keys>CompanyName=The road to Delphi;FileDescription=Delphi IDE Theme Editor;FileVersion=1.97.1.1;InternalName=DITE;LegalCopyright=RRUZ;LegalTrademarks=;OriginalFilename=;ProductName=Delphi IDE Theme Editor;ProductVersion=1.0.0.0;Comments=That is not dead which can eternal lie.
+        <VerInfo_Keys>CompanyName=The road to Delphi;FileDescription=Delphi IDE Theme Editor;FileVersion=1.98.1.1;InternalName=DITE;LegalCopyright=RRUZ;LegalTrademarks=;OriginalFilename=;ProductName=Delphi IDE Theme Editor;ProductVersion=1.0.0.0;Comments=That is not dead which can eternal lie.
 And with strange aeons even death may die.;ProgramID=com.embarcadero.$(MSBuildProjectName)</VerInfo_Keys>
         <Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
     </PropertyGroup>
diff --git a/delphi-ide-theme-editor/DITE.res b/delphi-ide-theme-editor/DITE.res
index 4555efa..23deb09 100644
Binary files a/delphi-ide-theme-editor/DITE.res and b/delphi-ide-theme-editor/DITE.res differ
diff --git a/delphi-ide-theme-editor/Units/DITE.DelphiVersions.pas b/delphi-ide-theme-editor/Units/DITE.DelphiVersions.pas
index dfc415d..738b9e2 100644
--- a/delphi-ide-theme-editor/Units/DITE.DelphiVersions.pas
+++ b/delphi-ide-theme-editor/Units/DITE.DelphiVersions.pas
@@ -42,7 +42,7 @@ interface
     Delphi7, Delphi8, Delphi2005, Delphi2006, Delphi2007, Delphi2009, Delphi2010,
     DelphiXE, DelphiXE2, DelphiXE3, DelphiXE4, DelphiXE5, Appmethod, DelphiXE6,
     DelphiXE7, DelphiXE8, Delphi10Seattle, Delphi10Berlin, Delphi10Tokyo, Delphi10Rio,
-    Delphi10Sydney, Delphi11Alexandria);
+    Delphi10Sydney, Delphi11Alexandria, Delphi12Athens);
 
   TDelphiVersionData = Class
   private
@@ -103,7 +103,7 @@ interface
     'RAD Studio XE6/Appmethod 1.14', 'RAD Studio XE7/Appmethod 1.15',
     'RAD Studio XE8', 'RAD Studio 10 Seattle', 'RAD Studio 10.1 Berlin',
     'RAD Studio 10.2 Tokyo', 'RAD Studio 10.3 Rio', 'RAD Studio 10.4 Sydney',
-    'RAD Studio 11.0 Alexandria');
+    'RAD Studio 11.0 Alexandria', 'RAD Studio 12.0 Athens');
 
   DelphiVersionNumbers: array [TDelphiVersions] of double = (
 {$IFDEF DELPHI_OLDER_VERSIONS_SUPPORT}
@@ -131,7 +131,8 @@ interface
     32, // 'RAD Studio 10.2 Tokyo'
     33, // 'RAD Studio 10.3 Rio'
     34, // 'RAD Studio 10.4 Sydney'
-    35  // 'RAD Studio 11.0 Alexandria'
+    35, // 'RAD Studio 11.0 Alexandria'
+    36  // 'RAD Studio 12.0 Athens'
     );
 
   DelphiVCLStylesPaths: array [TDelphiVersions] of string = (
@@ -152,7 +153,8 @@ interface
     'Embarcadero\Studio\19.0\Styles',
     'Embarcadero\Studio\20.0\Styles',
     'Embarcadero\Studio\21.0\Styles',
-    'Embarcadero\Studio\22.0\Styles'
+    'Embarcadero\Studio\22.0\Styles',
+    'Embarcadero\Studio\23.0\Styles'
     );
 
 procedure FillCurrentDelphiVersion(Data: TDelphiVersionData);
@@ -220,7 +222,8 @@ implementation
     '\Software\Embarcadero\BDS\19.0',
     '\Software\Embarcadero\BDS\20.0',
     '\Software\Embarcadero\BDS\21.0',
-    '\Software\Embarcadero\BDS\22.0'
+    '\Software\Embarcadero\BDS\22.0',
+    '\Software\Embarcadero\BDS\23.0'
     );
 
   DelphiCustomRegPaths: array [TDelphiVersions] of string = (
@@ -249,7 +252,8 @@ implementation
     '\Software\Embarcadero\%s\19.0', // BDS
     '\Software\Embarcadero\%s\20.0', // BDS
     '\Software\Embarcadero\%s\21.0', // BDS
-    '\Software\Embarcadero\%s\22.0'  // BDS
+    '\Software\Embarcadero\%s\22.0', // BDS
+    '\Software\Embarcadero\%s\23.0'  // BDS
     );
 
   DelphiRegPathNumbers: array [TDelphiVersions] of Integer = (
@@ -279,7 +283,8 @@ implementation
     19, // 'RAD Studio 10.2 Tokyo'
     20, // 'RAD Studio 10.3 Rio'
     21, // 'RAD Studio 10.4 Sydney'
-    22  // 'RAD Studio 11.0 Alexandria'
+    22, // 'RAD Studio 11.0 Alexandria'
+    23  // 'RAD Studio 12.0 Athens'
     );
 
   DelphiCmpnyNames: array [TDelphiVersions] of TDelphiCmpnyName = (
@@ -308,7 +313,8 @@ implementation
     Embarcadero, // 'RAD Studio 10.2 Tokyo
     Embarcadero, // 'RAD Studio 10.3 Rio
     Embarcadero, // 'RAD Studio 10.4 Sydney
-    Embarcadero  // 'RAD Studio 11 Alexandria
+    Embarcadero, // 'RAD Studio 11 Alexandria
+    Embarcadero  // 'RAD Studio 12 Athens
     );
 
 {$IFDEF DELPHI_OLDER_VERSIONS_SUPPORT}
@@ -506,7 +512,7 @@   TBDSKeysItem = record
     BDSKeysItems[2].Key := '\Software\CodeGear';
 
     BDSKeysItems[3].MinValue := DelphiRegPathNumbers[DelphiXE];
-    BDSKeysItems[3].MaxValue := DelphiRegPathNumbers[Delphi11Alexandria];
+    BDSKeysItems[3].MaxValue := DelphiRegPathNumbers[Delphi12Athens];
     BDSKeysItems[3].Company := Embarcadero;
     BDSKeysItems[3].Key := '\Software\Embarcadero';
 
diff --git a/delphi-ide-theme-editor/Units/DITE.HelpInsight.pas b/delphi-ide-theme-editor/Units/DITE.HelpInsight.pas
index 32b5f83..d6ba934 100644
--- a/delphi-ide-theme-editor/Units/DITE.HelpInsight.pas
+++ b/delphi-ide-theme-editor/Units/DITE.HelpInsight.pas
@@ -54,7 +54,8 @@ interface
     '\ObjRepos\en', // 10.2 Tokyo
     '\ObjRepos\en', // 10.3 Rio
     '\ObjRepos\en', // 10.4 Sydney
-    '\ObjRepos\en'  // 11.0 Alexandria
+    '\ObjRepos\en', // 11.0 Alexandria
+    '\ObjRepos\en'  // 12.0 Athens
     );
 
 procedure ApplyThemeHelpInsight(const ATheme: TIDETheme; IDEData: TDelphiVersionData);
diff --git a/delphi-ide-theme-editor/default/DefaultThemes.RC b/delphi-ide-theme-editor/default/DefaultThemes.RC
index 9029d4f..a638a62 100644
--- a/delphi-ide-theme-editor/default/DefaultThemes.RC
+++ b/delphi-ide-theme-editor/default/DefaultThemes.RC
@@ -20,4 +20,5 @@ Delphi10Berlin RCDATA "RAD Studio 10.1 Berlin.reg"
 Delphi10Tokyo RCDATA "RAD Studio 10.2 Tokio.reg"
 Delphi10Rio RCDATA "RAD Studio 10.3.reg"
 Delphi10Sydney RCDATA "RAD Studio 10.4.reg"
-Delphi11Alexandria RCDATA "RAD Studio 11.0.reg"
\ No newline at end of file
+Delphi11Alexandria RCDATA "RAD Studio 11.0.reg"
+Delphi12Athens RCDATA "RAD Studio 12.0.reg"
\ No newline at end of file
diff --git a/delphi-ide-theme-editor/default/RAD Studio 12.0.reg b/delphi-ide-theme-editor/default/RAD Studio 12.0.reg
new file mode 100644
index 0000000..4003001
Binary files /dev/null and b/delphi-ide-theme-editor/default/RAD Studio 12.0.reg differ