1 files changed, 48 insertions, 3 deletions
diff --git a/Game/Code/Screens/UScreenOptionsThemes.pas b/Game/Code/Screens/UScreenOptionsThemes.pas
index 750e8859..5b7e4d43 100644
--- a/Game/Code/Screens/UScreenOptionsThemes.pas
+++ b/Game/Code/Screens/UScreenOptionsThemes.pas
@@ -37,13 +37,28 @@ begin
       SDLK_BACKSPACE :
         begin
           Ini.Save;
+
+          // Reload all screens, after Theme changed
+          // Todo : JB - Check if theme was actually changed
+          UGraphic.UnLoadScreens();
+          UGraphic.LoadScreens();
+
           AudioPlayback.PlayBack;
           FadeTo(@ScreenOptions);
         end;
       SDLK_RETURN:
         begin
-          if SelInteraction = 3 then begin
+          if SelInteraction = 3 then
+          begin
             Ini.Save;
+
+            // Reload all screens, after Theme changed
+            // Todo : JB - Check if theme was actually changed
+            UGraphic.UnLoadScreens();
+            UGraphic.LoadScreens();
+
+            UGraphic.LoadScreens();
+
             AudioPlayback.PlayBack;
             FadeTo(@ScreenOptions);
           end;
@@ -54,14 +69,16 @@ begin
         InteractPrev;
       SDLK_RIGHT:
         begin
-          if (SelInteraction >= 0) and (SelInteraction <= 2) then begin
+          if (SelInteraction >= 0) and (SelInteraction <= 2) then 
+          begin
             AudioPlayback.PlayOption;
             InteractInc;
           end;
         end;
       SDLK_LEFT:
         begin
-          if (SelInteraction >= 0) and (SelInteraction <= 2) then begin
+          if (SelInteraction >= 0) and (SelInteraction <= 2) then 
+          begin
             AudioPlayback.PlayOption;
             InteractDec;
           end;
@@ -78,6 +95,20 @@ begin
   begin
     Skin.OnThemeChange;
     UpdateSelectSlideOptions (Theme.OptionsThemes.SelectSkin, SkinSelect, ISkin, Ini.SkinNo);
+
+    Theme.LoadTheme('Themes\' + ITheme[Ini.Theme] + '.ini', Ini.Color);
+
+    ScreenOptionsThemes := TScreenOptionsThemes.create();
+    ScreenOptionsThemes.onshow;
+    Display.ActualScreen := @ScreenOptionsThemes;
+    ScreenOptionsThemes.Draw;
+
+
+    Display.Draw;
+    SwapBuffers;
+
+    freeandnil( self );
+    
   end;
 end;
 
@@ -89,6 +120,20 @@ begin
   begin
     Skin.OnThemeChange;
     UpdateSelectSlideOptions (Theme.OptionsThemes.SelectSkin, SkinSelect, ISkin, Ini.SkinNo);
+
+    Theme.LoadTheme('Themes\' + ITheme[Ini.Theme] + '.ini', Ini.Color);
+
+    ScreenOptionsThemes := TScreenOptionsThemes.create();
+    ScreenOptionsThemes.onshow;
+    Display.ActualScreen := @ScreenOptionsThemes;
+    ScreenOptionsThemes.Draw;
+
+
+    Display.Draw;
+    SwapBuffers;
+
+    freeandnil( self );
+    
   end;
 end;