diff --git a/share/qtcreator/themes/dark.creatortheme b/share/qtcreator/themes/dark.creatortheme
index 26e5b58b73f..e145ffa9fbe 100644
--- a/share/qtcreator/themes/dark.creatortheme
+++ b/share/qtcreator/themes/dark.creatortheme
@@ -47,6 +47,8 @@ FancyTabWidgetEnabledUnselectedTextColor=text
 FancyToolButtonHoverColor=hoverBackground
 FancyToolButtonSelectedColor=selectedBackground
 FutureProgressBackgroundColor=shadowBackground
+InfoBarBackground=shadowBackground
+InfoBarText=text
 MenuBarEmptyAreaBackgroundColor=shadowBackground
 MenuBarItemBackgroundColor=shadowBackground
 MenuBarItemTextColorDisabled=textDisabled
@@ -55,26 +57,15 @@ MiniProjectTargetSelectorBackgroundColor=shadowBackground
 MiniProjectTargetSelectorBorderColor=shadowBackground
 MiniProjectTargetSelectorSummaryBackgroundColor=shadowBackground
 MiniProjectTargetSelectorTextColor=text
-OutputFormatter_DebugTextColor=text
-OutputFormatter_ErrorMessageTextColor=error
-OutputFormatter_NormalMessageTextColor=text
-OutputFormatter_StdErrTextColor=error
-OutputFormatter_StdOutTextColor=text
-OutputPaneButtonFlashColor=error
-OutputPaneToggleButtonTextColorChecked=text
-OutputPaneToggleButtonTextColorUnchecked=text
 PanelButtonToolBackgroundColorHover=hoverBackground
 PanelStatusBarBackgroundColor=shadowBackground
-PanelTextColorLight=text
-PanelTextColorDark=text
 PanelsWidgetSeparatorLineColor=0
+PanelTextColorDark=text
+PanelTextColorLight=text
 ProgressBarColorError=error
 ProgressBarColorFinished=ff5aaa3c
 ProgressBarColorNormal=hoverBackground
 ProgressBarTitleColor=text
-QtOutputFormatter_LinkTextColor=ff0000ff
-InfoBarBackground=shadowBackground
-InfoBarText=text
 TextColorDisabled=textDisabled
 TextColorHighlight=ffff0000
 TextColorNormal=text
@@ -83,6 +74,17 @@ ToggleButtonBackgroundColor=shadowBackground
 ToolBarBackgroundColor=shadowBackground
 TreeViewArrowColorNormal=hoverBackground
 TreeViewArrowColorSelected=text
+
+OutputFormatter_DebugTextColor=text
+OutputFormatter_ErrorMessageTextColor=error
+OutputFormatter_NormalMessageTextColor=text
+OutputFormatter_StdErrTextColor=error
+OutputFormatter_StdOutTextColor=text
+OutputPaneButtonFlashColor=error
+OutputPaneToggleButtonTextColorChecked=text
+OutputPaneToggleButtonTextColorUnchecked=text
+QtOutputFormatter_LinkTextColor=ff0000ff
+
 Welcome_BackgroundColorNormal=normalBackground
 Welcome_Button_BorderColorNormal=0
 Welcome_Button_BorderColorPressed=0
diff --git a/share/qtcreator/themes/default.creatortheme b/share/qtcreator/themes/default.creatortheme
index 4a91e94e2a7..a357183fe2a 100644
--- a/share/qtcreator/themes/default.creatortheme
+++ b/share/qtcreator/themes/default.creatortheme
@@ -41,6 +41,8 @@ FancyTabWidgetEnabledUnselectedTextColor=ffffffff
 FancyToolButtonHoverColor=28ffffff
 FancyToolButtonSelectedColor=32000000
 FutureProgressBackgroundColor=ffff0000
+InfoBarBackground=ffffffe1
+InfoBarText=ff000000
 MenuBarEmptyAreaBackgroundColor=ffff0000
 MenuBarItemBackgroundColor=ffff0000
 MenuBarItemTextColorDisabled=ffa0a0a4
@@ -49,26 +51,15 @@ MiniProjectTargetSelectorBackgroundColor=ffa0a0a0
 MiniProjectTargetSelectorBorderColor=ff000000
 MiniProjectTargetSelectorSummaryBackgroundColor=ff464646
 MiniProjectTargetSelectorTextColor=a0ffffff
-OutputFormatter_DebugTextColor=ffaa00aa
-OutputFormatter_ErrorMessageTextColor=ffaa0000
-OutputFormatter_NormalMessageTextColor=ff0000aa
-OutputFormatter_StdErrTextColor=ffaa0000
-OutputFormatter_StdOutTextColor=ff000000
-OutputPaneButtonFlashColor=ffff0000
-OutputPaneToggleButtonTextColorChecked=ffffffff
-OutputPaneToggleButtonTextColorUnchecked=ff000000
-PanelTextColorLight=brightText
-PanelTextColorDark=darkText
 PanelButtonToolBackgroundColorHover=25ffffff
 PanelStatusBarBackgroundColor=ffff0000
 PanelsWidgetSeparatorLineColor=ffbfbcb8
+PanelTextColorDark=darkText
+PanelTextColorLight=brightText
 ProgressBarColorError=d2ff3c00
 ProgressBarColorFinished=ff5aaa3c
 ProgressBarColorNormal=b4ffffff
 ProgressBarTitleColor=ffffffff
-QtOutputFormatter_LinkTextColor=ff0000aa
-InfoBarBackground=ffffffe1
-InfoBarText=ff000000
 TextColorDisabled=ff000000
 TextColorHighlight=ffa0a0a4
 TextColorNormal=ff000000
@@ -77,6 +68,17 @@ ToggleButtonBackgroundColor=ffff0000
 ToolBarBackgroundColor=ffff0000
 TreeViewArrowColorNormal=ffff0000
 TreeViewArrowColorSelected=ffff0000
+
+OutputFormatter_DebugTextColor=ffaa00aa
+OutputFormatter_ErrorMessageTextColor=ffaa0000
+OutputFormatter_NormalMessageTextColor=ff0000aa
+OutputFormatter_StdErrTextColor=ffaa0000
+OutputFormatter_StdOutTextColor=ff000000
+OutputPaneButtonFlashColor=ffff0000
+OutputPaneToggleButtonTextColorChecked=ffffffff
+OutputPaneToggleButtonTextColorUnchecked=ff000000
+QtOutputFormatter_LinkTextColor=ff0000aa
+
 Welcome_BackgroundColorNormal=ffffffff
 Welcome_Button_BorderColorNormal=ff737373
 Welcome_Button_BorderColorPressed=ff333333
diff --git a/src/libs/utils/theme/theme.h b/src/libs/utils/theme/theme.h
index 684e8479484..3cc97241db2 100644
--- a/src/libs/utils/theme/theme.h
+++ b/src/libs/utils/theme/theme.h
@@ -71,27 +71,29 @@ public:
         ComboBoxArrowColor,
         ComboBoxArrowColorDisabled,
         ComboBoxTextColor,
-        DetailsWidgetBackgroundColor,
         DetailsButtonBackgroundColorHover,
+        DetailsWidgetBackgroundColor,
         DockWidgetResizeHandleColor,
         DoubleTabWidget1stEmptyAreaBackgroundColor,
         DoubleTabWidget1stSeparatorColor,
-        DoubleTabWidget2ndSeparatorColor,
-        DoubleTabWidget1stTabBackgroundColor,
-        DoubleTabWidget2ndTabBackgroundColor,
         DoubleTabWidget1stTabActiveTextColor,
+        DoubleTabWidget1stTabBackgroundColor,
         DoubleTabWidget1stTabInactiveTextColor,
+        DoubleTabWidget2ndSeparatorColor,
         DoubleTabWidget2ndTabActiveTextColor,
+        DoubleTabWidget2ndTabBackgroundColor,
         DoubleTabWidget2ndTabInactiveTextColor,
         EditorPlaceholderColor,
         FancyTabBarBackgroundColor,
-        FancyTabWidgetEnabledSelectedTextColor,
-        FancyTabWidgetEnabledUnselectedTextColor,
         FancyTabWidgetDisabledSelectedTextColor,
         FancyTabWidgetDisabledUnselectedTextColor,
+        FancyTabWidgetEnabledSelectedTextColor,
+        FancyTabWidgetEnabledUnselectedTextColor,
         FancyToolButtonHoverColor,
         FancyToolButtonSelectedColor,
         FutureProgressBackgroundColor,
+        InfoBarBackground,
+        InfoBarText,
         MenuBarEmptyAreaBackgroundColor,
         MenuBarItemBackgroundColor,
         MenuBarItemTextColorDisabled,
@@ -104,16 +106,14 @@ public:
         OutputPaneToggleButtonTextColorChecked,
         OutputPaneToggleButtonTextColorUnchecked,
         PanelButtonToolBackgroundColorHover,
-        PanelTextColorLight,
-        PanelTextColorDark,
-        PanelsWidgetSeparatorLineColor,
         PanelStatusBarBackgroundColor,
-        ProgressBarTitleColor,
+        PanelsWidgetSeparatorLineColor,
+        PanelTextColorDark,
+        PanelTextColorLight,
         ProgressBarColorError,
         ProgressBarColorFinished,
         ProgressBarColorNormal,
-        InfoBarBackground,
-        InfoBarText,
+        ProgressBarTitleColor,
         TextColorDisabled,
         TextColorHighlight,
         TextColorNormal,