From d477ea4677add2c195392e5e4b151dc6fcd7aaf0 Mon Sep 17 00:00:00 2001
From: Alessandro Portale <alessandro.portale@qt.io>
Date: Tue, 1 Oct 2024 22:51:00 +0200
Subject: [PATCH] Themes: Add new dark and light themes / editor schemes

As announced here:
https://www.qt.io/blog/review-new-themes-for-qt-creator

The initial code name is without opposition. It might change, however.

Fixes: QTCREATORBUG-31748
Change-Id: I114a4e6ce739de3d8193860c48a0797432beee2a
Reviewed-by: hjk <hjk@qt.io>
---
 share/qtcreator/styles/broccoli-dark.xml      |  77 ++++
 share/qtcreator/styles/broccoli-light.xml     |   5 +
 .../themes/broccoli-dark.creatortheme         | 392 ++++++++++++++++++
 .../themes/broccoli-light.creatortheme        | 389 +++++++++++++++++
 share/qtcreator/themes/broccoli.tokenmapping  | 107 +++++
 tests/manual/widgets/common/themes.qrc        |   9 +-
 6 files changed, 976 insertions(+), 3 deletions(-)
 create mode 100644 share/qtcreator/styles/broccoli-dark.xml
 create mode 100644 share/qtcreator/styles/broccoli-light.xml
 create mode 100644 share/qtcreator/themes/broccoli-dark.creatortheme
 create mode 100644 share/qtcreator/themes/broccoli-light.creatortheme
 create mode 100644 share/qtcreator/themes/broccoli.tokenmapping

diff --git a/share/qtcreator/styles/broccoli-dark.xml b/share/qtcreator/styles/broccoli-dark.xml
new file mode 100644
index 00000000000..8fa86caf771
--- /dev/null
+++ b/share/qtcreator/styles/broccoli-dark.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<style-scheme version="1.0" name="Broccoli Dark">
+  <style name="Text" foreground="#d6cf9a" background="#1f1f1f"/>
+  <style name="Link" foreground="#d6c540"/>
+  <style name="Selection" foreground="#bec0c2" background="#1d545c"/>
+  <style name="LineNumber" foreground="#aeaeae" background="#262626"/>
+  <style name="SearchResult" background="#8a7f2c"/>
+  <style name="SearchResultAlt1" foreground="#aaaaff" background="#363655"/>
+  <style name="SearchResultAlt2" foreground="#ffaaaa" background="#553636"/>
+  <style name="SearchResultContainingFunction" foreground="#d6cf9a" background="#2e2f30"/>
+  <style name="SearchScope" background="#8a602c"/>
+  <style name="Parentheses" foreground="#bec0c2" background="#1d545c"/>
+  <style name="ParenthesesMismatch" background="#ff6aad"/>
+  <style name="AutoComplete" foreground="#2c408a" background="#9aa7d6"/>
+  <style name="CurrentLine" background="#373737"/>
+  <style name="CurrentLineNumber" foreground="#d6c540" bold="true"/>
+  <style name="Occurrences" background="#8a402c"/>
+  <style name="Occurrences.Unused" foreground="#8a7f2c"/>
+  <style name="Occurrences.Rename" foreground="#ffaaaa" background="#553636"/>
+  <style name="Number" foreground="#8a602c"/>
+  <style name="String" foreground="#d69545"/>
+  <style name="Type" foreground="#ff8080"/>
+  <style name="Local" foreground="#d6bb9a"/>
+  <style name="Parameter" foreground="#d6bb9a"/>
+  <style name="Global" foreground="#9aa7d6"/>
+  <style name="Field"/>
+  <style name="Static" foreground="#66a334" italic="true"/>
+  <style name="VirtualMethod" italic="true"/>
+  <style name="Function"/>
+  <style name="Macro"/>
+  <style name="Keyword" foreground="#45c6d6" italic="true"/>
+  <style name="Attribute" foreground="#45c6d6" italic="true"/>
+  <style name="PrimitiveType" foreground="#d69aa7"/>
+  <style name="Punctuation"/>
+  <style name="Operator" foreground="#d6bb9a"/>
+  <style name="Overloaded Operator"/>
+  <style name="Preprocessor" foreground="#ff6aad"/>
+  <style name="Label" foreground="#d6c540"/>
+  <style name="Comment" foreground="#a8abb0" italic="true"/>
+  <style name="Doxygen.Comment" foreground="#65676a" bold="true" italic="true"/>
+  <style name="Doxygen.Tag" foreground="#66a334"/>
+  <style name="VisualWhitespace" foreground="#4c4d50"/>
+  <style name="QmlLocalId" foreground="#9acfd6" italic="true"/>
+  <style name="QmlExternalId" foreground="#9aa7d6" italic="true"/>
+  <style name="QmlTypeId" foreground="#66a334"/>
+  <style name="QmlRootObjectProperty" italic="true"/>
+  <style name="QmlScopeObjectProperty" italic="true"/>
+  <style name="QmlExternalObjectProperty" foreground="#9aa7d6" italic="true"/>
+  <style name="JsScopeVar" foreground="#9acfd6" italic="true"/>
+  <style name="JsImportVar" foreground="#4564d6" italic="true"/>
+  <style name="JsGlobalVar" foreground="#4564d6" italic="true"/>
+  <style name="QmlStateName" foreground="#45c6d6" italic="true"/>
+  <style name="Binding" foreground="#ff6aad"/>
+  <style name="DisabledCode" foreground="#969696" background="#474747"/>
+  <style name="AddedLine" foreground="#45c6d6"/>
+  <style name="RemovedLine" foreground="#d65645"/>
+  <style name="DiffFile" foreground="#66a334"/>
+  <style name="DiffLocation" foreground="#d6c540"/>
+  <style name="DiffFileLine" foreground="#2e2f30" background="#d6c540"/>
+  <style name="DiffContextLine" foreground="#2e2f30" background="#65676a"/>
+  <style name="DiffSourceLine" background="#8a2c40"/>
+  <style name="DiffSourceChar" foreground="#2e2f30" background="#c34141"/>
+  <style name="DiffDestLine" background="#588a2c"/>
+  <style name="DiffDestChar" foreground="#2e2f30" background="#7cc33e"/>
+  <style name="LogChangeLine" foreground="#d65645"/>
+  <style name="LogAuthorName" foreground="#ceffe5"/>
+  <style name="LogCommitDate" foreground="#00ff00"/>
+  <style name="LogCommitHash" foreground="#ff0000"/>
+  <style name="LogCommitSubject" foreground="#d6cf9a"/>
+  <style name="LogDecoration" foreground="#ff00ff"/>
+  <style name="Warning" underlineColor="#d6c545" underlineStyle="SingleUnderline"/>
+  <style name="WarningContext" underlineColor="#d6c545" underlineStyle="DotLine"/>
+  <style name="Error" underlineColor="#d65645" underlineStyle="SingleUnderline"/>
+  <style name="ErrorContext" underlineColor="#d65645" underlineStyle="DotLine"/>
+  <style name="Declaration" bold="true"/>
+  <style name="OutputArgument" italic="true"/>
+</style-scheme>
diff --git a/share/qtcreator/styles/broccoli-light.xml b/share/qtcreator/styles/broccoli-light.xml
new file mode 100644
index 00000000000..b4743e31b27
--- /dev/null
+++ b/share/qtcreator/styles/broccoli-light.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<style-scheme version="1.0" name="Broccoli Light">
+  <style name="Text" foreground="#0a0a0a" background="#fcfcfc"/>
+  <style name="LineNumber" foreground="#595959" background="#f2f2f2"/>
+</style-scheme>
diff --git a/share/qtcreator/themes/broccoli-dark.creatortheme b/share/qtcreator/themes/broccoli-dark.creatortheme
new file mode 100644
index 00000000000..51f4c9ebafc
--- /dev/null
+++ b/share/qtcreator/themes/broccoli-dark.creatortheme
@@ -0,0 +1,392 @@
+[General]
+Includes=dark.figmatokens, broccoli.tokenmapping
+ThemeName=Broccoli Dark
+PreferredStyles=
+DefaultTextEditorColorScheme=broccoli-dark.xml
+DefaultToolbarStyle=Relaxed
+
+[Palette]
+shadowBackground=ff404142
+text=ffd0d0d0
+textDisabled=60a4a6a8
+textHighlighted=fff0f0f0
+selectedBackground=7a000000
+selectedBackgroundText=ff1d545c
+normalBackground=ff2E2F30
+alternateBackground=ff353637
+error=ffdf4f4f
+warning=ffecbc1c
+splitter=ff06080A
+textColorLinkVisited=ffa57aff
+backgroundColorDisabled=ff444444
+qmlDesignerButtonColor=ff4c4e50
+
+;DS Theme Palette START
+;greyscale
+fullWhite=ffffffff
+lightWhite=ffdfdfdf
+offWhite=ffdcdada
+slateGrey=ff8d8d8d
+smokeGrey=ff8b8b8b
+shadowGrey=ff636363
+duskGrey=ff606060
+raincloudGrey=ff4d4d4d
+graniteGrey=ff343434
+ashGrey=ff434343
+midnightGrey=ff333333
+dawnGrey=ff2a2a2a
+coalGrey=ff282828
+offBlack=ff202020
+nearBlack=ff1b1b1b
+fullBlack=ff000000
+
+;special colors
+idleGreen=ff649a5d
+runningGreen=ff2eff68
+successGreen=ff2bcf32
+idleRed=ff6a4242
+recordingRed=ffcc3c34
+errorRed=ffaf2b2b
+warningOrange=ffca8113
+splitterBlue=ff64daff
+rgbBlue=ff64daff
+highlightBlue=ff57b9fc
+highlightHover=ff74CBFC
+;DS Theme Palette END
+
+[Colors]
+;DS controls theme START
+
+;NEW FOR QtDS 4.0
+DScontrolBackground_toolbarIdle=midnightGrey
+DScontrolBackground_toolbarHover=midnightGrey
+DScontrolBackground_topToolbarHover=ashGrey
+DScontrolBackground_statusbarIdle=offBlack
+DSControlBackground_statusbarHover=dawnGrey
+DScontrolOutline_topToolbarIdle=dawnGrey
+DScontrolOutline_topToolbarHover=raincloudGrey
+DSidleGreen=idleGreen
+DSrunningGreen=runningGreen
+DStoolbarBackground=midnightGrey
+DStoolbarIcon_blocked=shadowGrey
+DSthumbnailBackground_baseState=nearBlack
+DStextColor=lightWhite
+DSstatusbarBackground=offBlack
+DSprimaryButton_hoverHighlight=highlightHover
+DSstateBackgroundColor_hover=ashGrey
+DSstateControlBackgroundColor_globalHover=ashGrey
+DSstateControlBackgroundColor_hover=raincloudGrey
+DSpanelBackground=dawnGrey
+
+;4.3
+DSpopoutBackground=offBlack
+DSpopoutControlBackground_idle=offBlack
+DSpopoutControlBackground_hover=dawnGrey
+DSpopoutControlBackground_globalHover=dawnGrey
+DSpopoutControlBackground_interaction=highlightBlue
+DSpopoutControlBackground_disabled=offBlack
+DSpopoutPopupBackground=nearBlack
+
+DSpopoutControlBorder_idle=midnightGrey
+DSpopoutControlBorder_hover=raincloudGrey
+DSpopoutControlBorder_interaction=highlightBlue
+DSpopoutControlBorder_disabled=offBlack
+
+DSpopoutButtonBackground_idle=offBlack
+DSpopoutButtonBackground_hover=dawnGrey
+DSpopoutButtonBackground_interaction=highlightBlue
+DSpopoutButtonBackground_disabled=offBlack
+
+DSpopoutButtonBorder_idle=slateGrey
+DSpopoutButtonBorder_hover=lightWhite
+DSpopoutButtonBorder_interaction=highlightBlue
+DSpopoutButtonBorder_disabled=offBlack
+
+;4.4
+DSconnectionCodeEditor=midnightGrey
+DSconnectionEditorMicroToolbar=coalGrey
+DSconnectionEditorButtonBackground_hover=midnightGrey
+DSconnectionEditorButtonBorder_hover=duskGrey
+DSpillText=fullWhite
+DSpillTextSelected=fullBlack
+DspillTextEdit=fullWhite
+DSpillDefaultBackgroundIdle=graniteGrey
+DSpillDefaultBackgroundHover=raincloudGrey
+DSpillOperatorBackgroundIdle=ff6b2a7b
+DSpillOperatorBackgroundHover=ff7e478b
+DSpillLiteralBackgroundIdle=ff447953
+DSpillLiteralBackgroundHover=ff61866B
+
+;END NEW FOR QtDS 4
+
+DSwelcomeScreenBackground=ff242424
+DSsubPanelBackground=ff1c1c1c
+DSthumbnailBackground=ff232323
+DSthumbnailLabelBackground=ff2b2a2a
+
+DSgreenLight=ff5cdc68
+DSamberLight=ffffbf00
+DSredLight=ffff0401
+
+DSinteraction=highlightBlue
+DSerrorColor=ffdf3a3a
+DSwarningColor=warning
+DSdisabledColor=ff707070
+
+DSinteractionHover=ff74cbfc
+
+DScontrolBackground=dawnGrey
+DScontrolBackgroundInteraction=ff3d3d3d
+DScontrolBackgroundDisabled=ff2e2f30
+DScontrolBackgroundGlobalHover=ff333333
+DScontrolBackgroundHover=ff333333
+
+DScontrolOutline=nearBlack
+DScontrolOutlineInteraction=highlightBlue
+DScontrolOutlineDisabled=ff707070
+
+DStextColor=ffffffff
+DStextColorDisabled=ff707070
+DStextSelectionColor=ff2aafd3
+DStextSelectedTextColor=ff000000
+
+DSplaceholderTextColor=ffffffff
+DSplaceholderTextColorInteraction=ffababab
+
+DSiconColor=ffffffff
+DSiconColorHover=ffffffff
+DSiconColorInteraction=nearBlack
+DSiconColorDisabled=ffC7C7C7
+DSiconColorSelected=nearBlack
+
+DSlinkIndicatorColor=ff808080
+DSlinkIndicatorColorHover=ffffffff
+DSlinkIndicatorColorInteraction=ff2aafd3
+DSlinkIndicatorColorDisabled=ff707070
+
+DSpopupBackground=offBlack
+DSpopupOverlayColor=99191919
+
+DSsliderActiveTrack=ff7c7b7b
+DSsliderActiveTrackHover=ff000000
+DSsliderActiveTrackFocus=ffaaaaaa
+DSsliderInactiveTrack=ff595959
+DSsliderInactiveTrackHover=ff505050
+DSsliderInactiveTrackFocus=ff606060
+DSsliderHandle=ff1f1f1f
+DSsliderHandleHover=ff606060
+DSsliderHandleFocus=ff0492c9
+DSsliderHandleInteraction=ff2aafd3
+
+DSscrollBarTrack=dawnGrey
+DSscrollBarHandle=offBlack
+DSscrollBarHandle_idle=slateGrey
+
+DSsectionHeadBackground=midnightGrey
+
+DSstateDefaultHighlight=ffffe400
+DSstateSeparatorColor=graniteGrey
+DSstateBackgroundColor=ff383838
+DSstatePreviewOutline=ffaaaaaa
+
+DSstatePanelBackground=ff252525
+DSstateHighlight=ff727272
+
+DSchangedStateText=ff99ccff
+
+DS3DAxisXColor=ffd00000
+DS3DAxisYColor=ff009900
+DS3DAxisZColor=ff5050ff
+
+DSactionBinding=ff2aafd3
+DSactionAlias=fff93a3a
+DSactionKeyframe=ffe0e01b
+DSactionJIT=ff2db543
+
+DStableHeaderBackground=ffff0000
+DStableHeaderText=ff00ff00
+
+DSdockContainerBackground=ff242424
+DSdockContainerSplitter=ff323232
+DSdockAreaBackground=ff262728
+
+DSdockWidgetBackground=ff00ff00
+DSdockWidgetSplitter=fullBlack
+DSdockWidgetTitleBar=dawnGrey
+
+DStitleBarText=ffdadada
+DStitleBarIcon=ffffffff
+DStitleBarButtonHover=40ffffff
+DStitleBarButtonPress=60ffffff
+
+DStabContainerBackground=ff1f1f1f
+DStabSplitter=ff595959
+
+DStabInactiveBackground=ff1f1f1f
+DStabInactiveText=ffdadada
+DStabInactiveIcon=ffffffff
+DStabInactiveButtonHover=ff1f1f1f
+DStabInactiveButtonPress=ff1f1f1f
+
+DStabActiveBackground=raincloudGrey
+DStabActiveText=offWhite
+DStabActiveIcon=offWhite
+DStabActiveButtonHover=ffdadada
+DStabActiveButtonPress=ffdadada
+
+DStabFocusBackground=highlightBlue
+DStabFocusText=ff111111
+DStabFocusIcon=ff000000
+DStabFocusButtonHover=highlightBlue
+DStabFocusButtonPress=highlightBlue
+
+DSnavigatorBranch=ff7c7b7b
+DSnavigatorBranchIndicator=ff7c7b7b
+DSnavigatorItemBackground=dawnGrey
+DSnavigatorItemBackgroundHover=graniteGrey
+DSnavigatorItemBackgroundSelected=midnightGrey
+DSnavigatorText=lightWhite
+DSnavigatorTextHover=ffffffff
+DSnavigatorTextSelected=ff2aafd3
+DSnavigatorIcon=ffffffff
+DSnavigatorIconHover=ffa1a1a1
+DSnavigatorIconSelected=ffffffff
+DSnavigatorAliasIconChecked=ffff0000
+DSnavigatorDropIndicatorBackground=ff2aafd3
+DSnavigatorDropIndicatorOutline=ff2aafd3
+
+DSheaderViewBackground=ff1f1f1f
+DStableViewAlternateBackground=ff00ff00
+
+DStoolTipBackground=ff111111
+DStoolTipOutline=ffdadada
+DStoolTipText=ffdadada
+
+DSUnimportedModuleColor=ffe33c2e
+
+DSBackgroundColorAlternate=alternateBackground
+DSBackgroundColorNormal=normalBackground
+
+DStoolbarBackground=midnightGrey
+
+;DS controls theme END
+
+DetailsWidgetBackgroundColor=18ffffff
+DockWidgetResizeHandleColor=splitter
+IconsCodeModelKeywordColor=ff777777
+IconsCodeModelClassColor=ffc0b550
+IconsCodeModelStructColor=ff53b053
+IconsCodeModelFunctionColor=ffd34373
+IconsCodeModelVariableColor=ff2bbbcc
+IconsCodeModelEnumColor=ffc0b550
+IconsCodeModelMacroColor=ff476ba0
+IconsCodeModelAttributeColor=ff316511
+IconsCodeModelUniformColor=ff994899
+IconsCodeModelVaryingColor=ffa08833
+IconsCodeModelOverlayBackgroundColor=70000000
+IconsCodeModelOverlayForegroundColor=ffd0d0d0
+InfoBarBackground=ff505000
+MiniProjectTargetSelectorBackgroundColor=shadowBackground
+MiniProjectTargetSelectorBorderColor=shadowBackground
+TextColorHighlightBackground=7a6f1c
+
+OutputPanes_DebugTextColor=text
+OutputPanes_ErrorMessageTextColor=ffff6c6c
+OutputPanes_MessageOutput=ff008787
+OutputPanes_NormalMessageTextColor=ff008787
+OutputPanes_StdErrTextColor=ffff6666
+OutputPanes_StdOutTextColor=text
+OutputPanes_WarningMessageTextColor=fff3c300
+OutputPanes_TestPassTextColor=ff00b400
+OutputPanes_TestFailTextColor=ffcf4848
+OutputPanes_TestXFailTextColor=ff28dc28
+OutputPanes_TestXPassTextColor=ffdc2828
+OutputPanes_TestSkipTextColor=ff828282
+OutputPanes_TestWarnTextColor=ffc8c800
+OutputPanes_TestFatalTextColor=ffc82828
+OutputPanes_TestDebugTextColor=ff329696
+OutputPaneButtonFlashColor=error
+
+Debugger_LogWindow_LogInput=ff00acac
+Debugger_LogWindow_LogStatus=ff00875a
+Debugger_LogWindow_LogTime=ffbf0303
+
+Debugger_WatchItem_ValueNormal=text
+Debugger_WatchItem_ValueInvalid=textDisabled
+Debugger_WatchItem_ValueChanged=ffff6666
+
+Debugger_Breakpoint_TextMarkColor=ffff4040
+
+Timeline_TextColor=text
+Timeline_BackgroundColor2=ff444444
+Timeline_DividerColor=ff555555
+Timeline_HighlightColor=ff3099dc
+Timeline_PanelBackgroundColor=ff808080
+Timeline_PanelHeaderColor=alternateBackground
+Timeline_HandleColor=alternateBackground
+Timeline_RangeColor=selectedBackground
+
+VcsBase_FileStatusUnknown_TextColor=text
+VcsBase_FileAdded_TextColor=ff00ff00
+VcsBase_FileModified_TextColor=ff8ee0ff
+VcsBase_FileDeleted_TextColor=fffff6c6c
+VcsBase_FileRenamed_TextColor=ffffa500
+VcsBase_FileUnmerged_TextColor=ffff4040
+
+Bookmarks_TextMarkColor=ff8080ff
+
+CodeModel_Error_TextMarkColor=error
+CodeModel_Warning_TextMarkColor=warning
+
+QmlDesigner_BackgroundColor=qmlDesignerButtonColor
+QmlDesigner_HighlightColor=ff1d545c
+QmlDesigner_FormEditorSelectionColor=ff4ba2ff
+QmlDesigner_FormEditorForegroundColor=ffffffff
+QmlDesigner_BackgroundColorDarkAlternate=dawnGrey
+QmlDesigner_BackgroundColorDarker=ff262728
+QmlDesigner_BorderColor=splitter
+QmlDesigner_ButtonColor=ff595b5c
+QmlDesigner_TabDark=shadowBackground
+QmlDesigner_TabLight=text
+QmlDesigner_FormeditorBackgroundColor=qmlDesignerButtonColor
+QmlDesigner_AlternateBackgroundColor=qmlDesignerButtonColor
+QmlDesigner_ScrollBarHandleColor=ff595b5c
+
+PaletteBrightText=ffff3333
+
+TerminalForeground=ffffff
+TerminalSelection=3fd1d1d1
+TerminalFindMatch=7fffff00
+TerminalAnsi0=151515
+TerminalAnsi1=ac4142
+TerminalAnsi2=7e8e50
+TerminalAnsi3=e5b567
+TerminalAnsi4=6c99bb
+TerminalAnsi5=a320ac
+TerminalAnsi6=7dd6cf
+TerminalAnsi7=d0d0d0
+TerminalAnsi8=505050
+TerminalAnsi9=d05e5b
+TerminalAnsi10=a7b773
+TerminalAnsi11=ffd184
+TerminalAnsi12=94c8ea
+TerminalAnsi13=f257fb
+TerminalAnsi14=a1fcf7
+TerminalAnsi15=ffffff
+
+[Flags]
+ComboBoxDrawTextShadow=false
+DerivePaletteFromTheme=true
+DrawIndicatorBranch=true
+DrawSearchResultWidgetFrame=false
+DrawTargetSelectorBottom=false
+DrawToolBarHighlights=false
+DrawToolBarBorders=true
+FlatToolBars=true
+FlatSideBarIcons=true
+FlatProjectsMode=true
+FlatMenuBar=true
+ToolBarIconShadow=false
+WindowColorAsBase=false
+DarkUserInterface=true
+QDSTheme=false
diff --git a/share/qtcreator/themes/broccoli-light.creatortheme b/share/qtcreator/themes/broccoli-light.creatortheme
new file mode 100644
index 00000000000..a58c4a48395
--- /dev/null
+++ b/share/qtcreator/themes/broccoli-light.creatortheme
@@ -0,0 +1,389 @@
+[General]
+Includes=light.figmatokens, broccoli.tokenmapping
+ThemeName=Broccoli Light
+PreferredStyles=
+DefaultTextEditorColorScheme=broccoli-light.xml
+DefaultToolbarStyle=Relaxed
+
+[Palette]
+shadowBackground=PaletteDark
+text=PaletteWindowText
+textDisabled=PaletteTextDisabled
+selectedBackground=a8ffffff
+alternateBackground=PaletteAlternateBase
+stop_error=ffec7373
+splitter=ffbdbebf
+error=ffdf4f4f
+warning=ffecbc1c
+textColorLinkVisited=PaletteLinkVisited
+backgroundColorDisabled=PaletteWindowDisabled
+qmlDesignerButtonColor=fff8f8f8
+
+;DS Theme Palette START
+;greyscale
+fullWhite=ffffffff
+lightWhite=ffdfdfdf
+offWhite=ffdcdada
+slateGrey=ff8d8d8d
+concreteGrey=ffbbbbbb
+smokeGrey=ff8b8b8b
+shadowGrey=ff636363
+duskGrey=ff606060
+raincloudGrey=ff4d4d4d
+graniteGrey=ff343434
+ashGrey=ff434343
+midnightGrey=ff333333
+dawnGrey=ff2a2a2a
+coalGrey=ff282828
+offBlack=ff202020
+nearBlack=ff1b1b1b
+fullBlack=ff000000
+
+;special colors
+idleGreen=ff649a5d
+runningGreen=ff2eff68
+successGreen=ff2bcf32
+idleRed=ff6a4242
+recordingRed=ffcc3c34
+errorRed=ffaf2b2b
+warningOrange=ffca8113
+splitterBlue=ff64daff
+rgbBlue=ff64daff
+highlightBlue=ff57b9fc
+highlightHover=ff74CBFC
+;DS Theme Palette END
+
+[Colors]
+;DS controls theme START
+
+;NEW FOR QtDS 4
+;4.0
+DScontrolBackground_toolbarIdle=offWhite
+DScontrolBackground_toolbarHover=offWhite
+DScontrolBackground_topToolbarHover=concreteGrey
+DScontrolBackground_statusbarIdle=concreteGrey
+DSControlBackground_statusbarHover=lightWhite
+DScontrolOutline_topToolbarIdle=concreteGrey
+DScontrolOutline_topToolbarHover=lightWhite
+DSidleGreen=idleGreen
+DSrunningGreen=runningGreen
+DStoolbarBackground=offWhite
+DStoolbarIcon_blocked=shadowGrey
+DSthumbnailBackground_baseState=smokeGrey
+DStextColor=raincloudGrey
+DSstatusbarBackground=concreteGrey
+DSprimaryButton_hoverHighlight=highlightHover
+DSstateBackgroundColor_hover=concreteGrey
+DSstateControlBackgroundColor_globalHover=concreteGrey
+DSstateControlBackgroundColor_hover=smokeGrey
+DSpanelBackground=dawnGrey
+
+;4.3
+DSpopoutBackground=offWhite
+DSpopoutControlBackground_idle=offWhite
+DSpopoutControlBackground_hover=lightWhite
+DSpopoutControlBackground_globalHover=lightWhite
+DSpopoutControlBackground_interaction=highlightBlue
+DSpopoutControlBackground_disabled=offWhite
+DSpopoutPopupBackground=lightWhite
+
+DSpopoutControlBorder_idle=slateGrey
+DSpopoutControlBorder_hover=concreteGrey
+DSpopoutControlBorder_interaction=highlightBlue
+DSpopoutControlBorder_disabled=offWhite
+
+DSpopoutButtonBackground_idle=offWhite
+DSpopoutButtonBackground_hover=lightWhite
+DSpopoutButtonBackground_interaction=highlightBlue
+DSpopoutButtonBackground_disabled=offWhite
+
+DSpopoutButtonBorder_idle=smokeGrey
+DSpopoutButtonBorder_hover=shadowGrey
+DSpopoutButtonBorder_interaction=highlightBlue
+DSpopoutButtonBorder_disabled=offWhite
+
+;4.4
+DSconnectionCodeEditor=lightWhite
+DSconnectionEditorMicroToolbar=concreteGrey
+DSconnectionEditorButtonBackground_hover=lightWhite
+DSconnectionEditorButtonBorder_hover=duskGrey
+DSpillText=fullWhite
+DSpillTextSelected=fullBlack
+DspillTextEdit=fullBlack
+DSpillDefaultBackgroundIdle=shadowGrey
+DSpillDefaultBackgroundHover=smokeGrey
+DSpillOperatorBackgroundIdle=ff6b2a7b
+DSpillOperatorBackgroundHover=ff7e478b
+DSpillLiteralBackgroundIdle=ff447953
+DSpillLiteralBackgroundHover=ff61866B
+
+;END NEW FOR QtDS 4
+
+DSpanelBackground=ffeaeaea
+
+DSwelcomeScreenBackground=ffEAEAEA
+DSsubPanelBackground=ffEFEFEF
+DSthumbnailBackground=ffE8E8E8
+DSthumbnailLabelBackground=ffDDDDDD
+
+DSgreenLight=ff5cdc68
+DSamberLight=ffffbf00
+DSredLight=ffff0401
+
+DSinteraction=highlightBlue
+DSerrorColor=ffdf3a3a
+DSwarningColor=warning
+DSdisabledColor=ff8e8e8e
+
+DSinteractionHover=highlightHover
+
+DScontrolBackground=ffeaeaea
+DScontrolBackgroundInteraction=ffc9c9c9
+DScontrolBackgroundDisabled=ffeaeaea
+DScontrolBackgroundGlobalHover=ffdedddd
+DScontrolBackgroundHover=ffdedddd
+
+DScontrolOutline=ffcecccc
+DScontrolOutlineInteraction=ff2aafd3
+DScontrolOutlineDisabled=ff707070
+
+DStextColorDisabled=ff707070
+DStextSelectionColor=ff2aafd3
+DStextSelectedTextColor=ff000000
+
+DSplaceholderTextColor=ff262626
+DSplaceholderTextColorInteraction=ffababab
+
+DSiconColor=ff262626
+DSiconColorHover=ff191919
+DSiconColorInteraction=ffffffff
+DSiconColorDisabled=ff707070
+DSiconColorSelected=ff2aafd3
+
+DSlinkIndicatorColor=ff808080
+DSlinkIndicatorColorHover=ff1f1f1f
+DSlinkIndicatorColorInteraction=ff2aafd3
+DSlinkIndicatorColorDisabled=ff707070
+
+DSpopupBackground=ffd3d3d3
+DSpopupOverlayColor=99191919
+
+DSsliderActiveTrack=ff7c7b7b
+DSsliderActiveTrackHover=ff000000
+DSsliderActiveTrackFocus=ffaaaaaa
+DSsliderInactiveTrack=ffaaaaaa
+DSsliderInactiveTrackHover=ff505050
+DSsliderInactiveTrackFocus=ff606060
+DSsliderHandle=ff1f1f1f
+DSsliderHandleHover=ff606060
+DSsliderHandleFocus=ff0492c9
+DSsliderHandleInteraction=ff2aafd3
+
+DSscrollBarTrack=smokeGrey
+DSscrollBarHandle=shadowGrey
+DSscrollBarHandle_idle=slateGrey
+
+DSsectionHeadBackground=ffd8d8d8
+
+DSstateDefaultHighlight=ffffe400
+DSstateSeparatorColor=ffadadad
+DSstateBackgroundColor=ffe0e0e0
+DSstatePreviewOutline=ff363636
+
+DSstatePanelBackground=ffdadada
+DSstateHighlight=ff8d8d8d
+
+DSchangedStateText=ff99ccff
+
+DS3DAxisXColor=ffd00000
+DS3DAxisYColor=ff009900
+DS3DAxisZColor=ff5050ff
+
+DSactionBinding=ff2aafd3
+DSactionAlias=fff93a3a
+DSactionKeyframe=ffe0e01b
+DSactionJIT=ff2db543
+
+DStableHeaderBackground=ffff0000
+DStableHeaderText=ff00ff00
+
+DSdockContainerBackground=ff323232
+DSdockContainerSplitter=ff323232
+DSdockAreaBackground=ff262728
+
+DSdockWidgetBackground=ff00ff00
+DSdockWidgetSplitter=ff595959
+DSdockWidgetTitleBar=ffeaeaea
+
+DStitleBarText=ffdadada
+DStitleBarIcon=ff4f5052
+DStitleBarButtonHover=40ffffff
+DStitleBarButtonPress=60ffffff
+
+DStabContainerBackground=ffdadada
+DStabSplitter=ff595959
+
+DStabInactiveBackground=ff999999
+DStabInactiveText=ff262626
+DStabInactiveIcon=ffffffff
+DStabInactiveButtonHover=ff1f1f1f
+DStabInactiveButtonPress=ff1f1f1f
+
+DStabActiveBackground=ffdadada
+DStabActiveText=ff111111
+DStabActiveIcon=ff000000
+DStabActiveButtonHover=ffdadada
+DStabActiveButtonPress=ffdadada
+
+DStabFocusBackground=ff2aafd3
+DStabFocusText=ff111111
+DStabFocusIcon=ff000000
+DStabFocusButtonHover=ff2aafd3
+DStabFocusButtonPress=ff2aafd3
+
+DSnavigatorBranch=ff7c7b7b
+DSnavigatorBranchIndicator=ff7c7b7b
+DSnavigatorItemBackground=ffeaeaea
+DSnavigatorItemBackgroundHover=ffdedddd
+DSnavigatorItemBackgroundSelected=ffffffff
+DSnavigatorText=ff262626
+DSnavigatorTextHover=ff1f1f1f
+DSnavigatorTextSelected=ff2aafd3
+DSnavigatorIcon=ff1f1f1f
+DSnavigatorIconHover=ff7c7b7b
+DSnavigatorIconSelected=ff1f1f1f
+DSnavigatorAliasIconChecked=ffff0000
+DSnavigatorDropIndicatorBackground=ff2aafd3
+DSnavigatorDropIndicatorOutline=ff2aafd3
+
+DSheaderViewBackground=ffd8d8d8
+DStableViewAlternateBackground=ff00ff00
+
+DStoolTipBackground=ff111111
+DStoolTipOutline=ffdadada
+DStoolTipText=ffdadada
+
+DSUnimportedModuleColor=ffe33c2e
+
+DSBackgroundColorAlternate=ffeaeaea
+DSBackgroundColorNormal=ffd8d8d8
+
+;DS controls theme END
+
+DetailsWidgetBackgroundColor=28ffffff
+DockWidgetResizeHandleColor=splitter
+IconsCodeModelKeywordColor=ff777777
+IconsCodeModelClassColor=ffc0b550
+IconsCodeModelStructColor=ff53b053
+IconsCodeModelFunctionColor=ffd34373
+IconsCodeModelVariableColor=ff2bbbcc
+IconsCodeModelEnumColor=ffc0b550
+IconsCodeModelMacroColor=ff476ba0
+IconsCodeModelAttributeColor=ff316511
+IconsCodeModelUniformColor=ff994899
+IconsCodeModelVaryingColor=ffa08833
+IconsCodeModelOverlayBackgroundColor=70ffffff
+IconsCodeModelOverlayForegroundColor=ff232425
+InfoBarBackground=ffffffe1
+MiniProjectTargetSelectorBackgroundColor=shadowBackground
+MiniProjectTargetSelectorBorderColor=shadowBackground
+TextColorHighlightBackground=ffef0b
+
+OutputPanes_DebugTextColor=text
+OutputPanes_ErrorMessageTextColor=ffaa0000
+OutputPanes_MessageOutput=ff0000aa
+OutputPanes_NormalMessageTextColor=ff0000aa
+OutputPanes_StdErrTextColor=ffaa0000
+OutputPanes_StdOutTextColor=ff000000
+OutputPanes_WarningMessageTextColor=ff808000
+OutputPanes_TestPassTextColor=ff009900
+OutputPanes_TestFailTextColor=ffa00000
+OutputPanes_TestXFailTextColor=ff28f028
+OutputPanes_TestXPassTextColor=fff02828
+OutputPanes_TestSkipTextColor=ff787878
+OutputPanes_TestWarnTextColor=ffd0bb00
+OutputPanes_TestFatalTextColor=ff640000
+OutputPanes_TestDebugTextColor=ff329696
+OutputPaneButtonFlashColor=ffff0000
+
+Debugger_LogWindow_LogInput=ff00acac
+Debugger_LogWindow_LogStatus=ff00875a
+Debugger_LogWindow_LogTime=ffbf0303
+
+Debugger_WatchItem_ValueNormal=text
+Debugger_WatchItem_ValueInvalid=textDisabled
+Debugger_WatchItem_ValueChanged=ffbf0303
+
+Debugger_Breakpoint_TextMarkColor=ffff4040
+
+Timeline_TextColor=text
+Timeline_BackgroundColor2=fff6f6f6
+Timeline_DividerColor=ffd6d6d6
+Timeline_HighlightColor=ff3099dc
+Timeline_PanelBackgroundColor=ffd6d6d6
+Timeline_PanelHeaderColor=ff888888
+Timeline_HandleColor=ff888888
+Timeline_RangeColor=selectedBackground
+
+VcsBase_FileStatusUnknown_TextColor=ff000000
+VcsBase_FileAdded_TextColor=ff00aa00
+VcsBase_FileModified_TextColor=ff0000ee
+VcsBase_FileDeleted_TextColor=ff800000
+VcsBase_FileRenamed_TextColor=ffd77d00
+VcsBase_FileUnmerged_TextColor=ffee0000
+
+Bookmarks_TextMarkColor=ffa0a0ff
+
+CodeModel_Error_TextMarkColor=error
+CodeModel_Warning_TextMarkColor=warning
+
+QmlDesigner_BackgroundColor=qmlDesignerButtonColor
+QmlDesigner_HighlightColor=ff46a2da
+QmlDesigner_FormEditorSelectionColor=ff4ba2ff
+QmlDesigner_FormEditorForegroundColor=ffffffff
+QmlDesigner_BackgroundColorDarkAlternate=ffeaeaea
+QmlDesigner_BackgroundColorDarker=fff5f5f5
+QmlDesigner_BorderColor=splitter
+QmlDesigner_ButtonColor=ffcccccc
+QmlDesigner_TabDark=ff585858
+QmlDesigner_TabLight=ffd0d0d0
+QmlDesigner_FormeditorBackgroundColor=qmlDesignerButtonColor
+QmlDesigner_AlternateBackgroundColor=qmlDesignerButtonColor
+QmlDesigner_ScrollBarHandleColor=ffcccccc
+
+TerminalForeground=ff000000
+TerminalSelection=3f000000
+TerminalFindMatch=7fffff00
+TerminalAnsi0=000000
+TerminalAnsi1=8b1b10
+TerminalAnsi2=4aa32e
+TerminalAnsi3=9a9a2f
+TerminalAnsi4=0000ab
+TerminalAnsi5=a320ac
+TerminalAnsi6=49a3b0
+TerminalAnsi7=bfbfbf
+TerminalAnsi8=666666
+TerminalAnsi9=d22d1f
+TerminalAnsi10=62d63f
+TerminalAnsi11=dac911
+TerminalAnsi12=0000fe
+TerminalAnsi13=d22dde
+TerminalAnsi14=69e2e4
+TerminalAnsi15=e5e5e6
+
+[Flags]
+ComboBoxDrawTextShadow=false
+DerivePaletteFromTheme=true
+DrawIndicatorBranch=true
+DrawSearchResultWidgetFrame=false
+DrawTargetSelectorBottom=false
+DrawToolBarHighlights=false
+DrawToolBarBorders=true
+FlatToolBars=true
+FlatSideBarIcons=true
+FlatProjectsMode=false
+FlatMenuBar=false
+ToolBarIconShadow=false
+WindowColorAsBase=false
+DarkUserInterface=false
+QDSTheme=false
diff --git a/share/qtcreator/themes/broccoli.tokenmapping b/share/qtcreator/themes/broccoli.tokenmapping
new file mode 100644
index 00000000000..7de810fa5e4
--- /dev/null
+++ b/share/qtcreator/themes/broccoli.tokenmapping
@@ -0,0 +1,107 @@
+[Colors]
+
+BackgroundColorDark=Token_Background_Default
+BackgroundColorDisabled=Token_Background_Subtle
+BackgroundColorHover=Token_Foreground_Subtle
+BackgroundColorNormal=Token_Background_Default
+BackgroundColorSelected=Token_Foreground_Muted
+BadgeLabelBackgroundColorChecked=Token_Background_Default
+BadgeLabelBackgroundColorUnchecked=Token_Foreground_Muted
+BadgeLabelTextColorChecked=Token_Text_Default
+BadgeLabelTextColorUnchecked=Token_Text_Default
+ComboBoxTextColor=Token_Text_Muted
+EditorPlaceholderColor=Token_Background_Muted
+FancyTabBarSelectedBackgroundColor=Token_Background_Muted
+FancyTabWidgetDisabledSelectedTextColor=Token_Text_Subtle
+FancyTabWidgetDisabledUnselectedTextColor=Token_Text_Subtle
+FancyTabWidgetEnabledSelectedTextColor=Token_Text_Default
+FancyTabWidgetEnabledUnselectedTextColor=Token_Text_Muted
+FancyToolBarSeparatorColor=Token_Stroke_Subtle
+FancyToolButtonHighlightColor=Token_Accent_Default
+FancyToolButtonHoverColor=Token_Foreground_Subtle
+FancyToolButtonSelectedColor=Token_Foreground_Muted
+IconsBaseActiveColor=Token_Text_Default
+IconsBaseColor=Token_Text_Muted
+IconsBuildHammerHandleColor=Token_Text_Muted
+IconsBuildHammerHeadColor=Token_Text_Muted
+IconsDebugColor=Token_Text_Muted
+IconsDisabledColor=Token_Text_Subtle
+IconsErrorColor=Token_Notification_Danger
+IconsErrorToolBarColor=Token_Notification_Danger
+IconsInfoColor=Token_Notification_Neutral
+IconsInfoToolBarColor=Token_Notification_Neutral
+IconsInterruptColor=Token_Notification_Neutral
+IconsInterruptToolBarColor=Token_Notification_Neutral
+IconsNavigationArrowsColor=Token_Notification_Alert
+IconsRunColor=Token_Accent_Default
+IconsRunToolBarColor=Token_Accent_Default
+IconsStopColor=Token_Notification_Danger
+IconsStopToolBarColor=Token_Notification_Danger
+IconsWarningColor=Token_Notification_Alert
+IconsWarningToolBarColor=Token_Notification_Alert
+InfoBarText=Token_Text_Default
+MenuBarItemTextColorDisabled=Token_Text_Subtle
+MenuBarItemTextColorNormal=Token_Text_Default
+MenuItemTextColorDisabled=Token_Text_Subtle
+MenuItemTextColorNormal=Token_Text_Default
+MiniProjectTargetSelectorTextColor=Token_Text_Muted
+OutputPaneToggleButtonTextColorChecked=Token_Text_Muted
+OutputPaneToggleButtonTextColorUnchecked=Token_Text_Muted
+PaletteAlternateBase=Token_Background_Muted
+PaletteAlternateBaseDisabled=Token_Background_Subtle
+PaletteBase=Token_Background_Default
+PaletteBaseDisabled=Token_Background_Subtle
+PaletteBrightText=Token_Text_Default
+PaletteBrightTextDisabled=Token_Text_Subtle
+PaletteButton=Token_Background_Default
+PaletteButtonDisabled=Token_Background_Subtle
+PaletteButtonText=Token_Text_Default
+PaletteButtonTextDisabled=Token_Text_Subtle
+PaletteDark=Token_Background_Default
+PaletteDarkDisabled=Token_Background_Subtle
+PaletteHighlight=Token_Accent_Default
+PaletteHighlightDisabled=Token_Text_Subtle
+PaletteHighlightedText=Token_Text_Default
+PaletteHighlightedTextDisabled=Token_Text_Subtle
+PaletteLight=Token_Foreground_Default
+PaletteLightDisabled=Token_Foreground_Subtle
+PaletteLink=Token_Text_Accent
+PaletteLinkDisabled=Token_Text_Subtle
+PaletteLinkVisited=Token_Text_Accent
+PaletteLinkVisitedDisabled=Token_Text_Subtle
+PaletteMid=Token_Stroke_Muted
+PaletteMidlight=Token_Stroke_Muted
+PalettePlaceholderText=Token_Text_Muted
+PalettePlaceholderTextDisabled=Token_Text_Subtle
+PaletteShadow=Token_Background_Default
+PaletteText=Token_Text_Default
+PaletteTextDisabled=Token_Text_Subtle
+PaletteToolTipBase=Token_Background_Default
+PaletteToolTipBaseDisabled=Token_Background_Subtle
+PaletteToolTipText=Token_Text_Default
+PaletteToolTipTextDisabled=Token_Text_Subtle
+PaletteWindow=Token_Background_Default
+PaletteWindowDisabled=Token_Background_Subtle
+PaletteWindowText=Token_Text_Default
+PaletteWindowTextDisabled=Token_Text_Subtle
+PanelStatusBarBackgroundColor=Token_Background_Muted
+PanelTextColorDark=Token_Text_Default
+PanelTextColorLight=Token_Text_Default
+PanelTextColorMid=Token_Text_Muted
+ProgressBarBackgroundColor=Token_Background_Subtle
+ProgressBarColorError=Token_Notification_Danger
+ProgressBarColorFinished=Token_Notification_Success
+ProgressBarColorNormal=Token_Text_Subtle
+ProgressBarTitleColor=Token_Text_Default
+ProjectExplorer_TaskError_TextMarkColor=Token_Notification_Danger
+ProjectExplorer_TaskWarn_TextMarkColor=Token_Notification_Alert
+SplitterColor=Token_Stroke_Subtle
+TerminalBackground=Token_Background_Default
+TextColorDisabled=Token_Text_Subtle
+TextColorError=Token_Notification_Danger
+TextColorLink=Token_Text_Accent
+TextColorNormal=Token_Text_Default
+TextEditor_CurrentLine_ScrollBarColor=Token_Foreground_Muted
+TextEditor_SearchResult_ScrollBarColor=Token_Notification_Alert
+TextEditor_Selection_ScrollBarColor=Token_Foreground_Subtle
+Timeline_BackgroundColor1=Token_Background_Default
diff --git a/tests/manual/widgets/common/themes.qrc b/tests/manual/widgets/common/themes.qrc
index cf555709bcc..6fe0cf4d7cb 100644
--- a/tests/manual/widgets/common/themes.qrc
+++ b/tests/manual/widgets/common/themes.qrc
@@ -1,13 +1,16 @@
 <!DOCTYPE RCC><RCC version="1.0">
 <qresource prefix="/themes">
+    <file alias="broccoli-dark.creatortheme">../../../../share/qtcreator/themes/broccoli-dark.creatortheme</file>
+    <file alias="broccoli-light.creatortheme">../../../../share/qtcreator/themes/broccoli-light.creatortheme</file>
+    <file alias="broccoli.tokenmapping">../../../../share/qtcreator/themes/broccoli.tokenmapping</file>
     <file alias="dark.creatortheme">../../../../share/qtcreator/themes/dark.creatortheme</file>
+    <file alias="dark.figmatokens">../../../../share/qtcreator/themes/dark.figmatokens</file>
     <file alias="default.creatortheme">../../../../share/qtcreator/themes/default.creatortheme</file>
+    <file alias="design.creatortheme">../../../../share/qtcreator/themes/design.creatortheme</file>
     <file alias="flat-dark.creatortheme">../../../../share/qtcreator/themes/flat-dark.creatortheme</file>
     <file alias="flat-light.creatortheme">../../../../share/qtcreator/themes/flat-light.creatortheme</file>
     <file alias="flat.creatortheme">../../../../share/qtcreator/themes/flat.creatortheme</file>
-    <file alias="design.creatortheme">../../../../share/qtcreator/themes/design.creatortheme</file>
-    <file alias="dark.figmatokens">../../../../share/qtcreator/themes/dark.figmatokens</file>
-    <file alias="light.figmatokens">../../../../share/qtcreator/themes/light.figmatokens</file>
     <file alias="light-palette.inc">../../../../share/qtcreator/themes/light-palette.inc</file>
+    <file alias="light.figmatokens">../../../../share/qtcreator/themes/light.figmatokens</file>
 </qresource>
 </RCC>