chore: support dark theme

main/plugins/org.talend.commons.runtime/src/org/talend/commons/runtime/service/ITalendThemeService.java

@@ -0,0 +1,43 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2022 Talend Inc. - www.talend.com
+//
+// This source code is available under agreement available at
+// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
+//
+// You should have received a copy of the agreement
+// along with this program; if not, write to Talend SA
+// 9 rue Pages 92150 Suresnes, France
+//
+// ============================================================================
+package org.talend.commons.runtime.service;
+
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.FrameworkUtil;
+import org.osgi.framework.ServiceReference;
+import org.talend.commons.exception.ExceptionHandler;
+
+/**
+ * DOC cmeng  class global comment. Detailled comment
+ */
+public interface ITalendThemeService {
+
+    Object getGlobalThemeColor(String cssProp);
+
+    String getGlobalThemeProp(String key);
+
+    static ITalendThemeService get() {
+        try {
+            BundleContext bc = FrameworkUtil.getBundle(ITalendThemeService.class).getBundleContext();
+            ServiceReference<ITalendThemeService> serviceReference = bc.getServiceReference(ITalendThemeService.class);
+            if (serviceReference == null) {
+                return null;
+            }
+            return bc.getService(serviceReference);
+        } catch (Exception e) {
+            ExceptionHandler.process(e);
+        }
+        return null;
+    }
+
+}

main/plugins/org.talend.core.repository/META-INF/MANIFEST.MF

@@ -15,7 +15,6 @@ Require-Bundle: org.eclipse.ui,
  org.talend.libraries.apache,
  org.eclipse.osgi.services,
  org.eclipse.ui.navigator,
- org.eclipse.e4.ui.css.swt.theme,
  org.talend.libraries.jackson
 Export-Package: org.talend.core.repository,
  org.talend.core.repository.constants,

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/ui/view/RepositoryLabelProvider.java

@@ -15,10 +15,6 @@ package org.talend.core.repository.ui.view;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.e4.ui.css.swt.theme.ITheme;
-import org.eclipse.e4.ui.css.swt.theme.IThemeEngine;
-import org.eclipse.e4.ui.css.swt.theme.IThemeManager;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.resource.JFaceResources;
 import org.eclipse.jface.viewers.IColorProvider;
@@ -27,13 +23,9 @@ import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceReference;
 import org.talend.commons.runtime.model.repository.ECDCStatus;
 import org.talend.commons.runtime.model.repository.ERepositoryStatus;
+import org.talend.commons.runtime.service.ITalendThemeService;
 import org.talend.commons.ui.runtime.image.ECoreImage;
 import org.talend.commons.ui.runtime.image.EImage;
 import org.talend.commons.ui.runtime.image.IImage;
@@ -58,7 +50,6 @@ import org.talend.core.model.repository.IRepositoryViewObject;
 import org.talend.core.model.repository.RepositoryContentManager;
 import org.talend.core.model.repository.RepositoryNodeProviderRegistryReader;
 import org.talend.core.model.repository.RepositoryViewObject;
-import org.talend.core.repository.CoreRepositoryPlugin;
 import org.talend.core.repository.model.ProxyRepositoryFactory;
 import org.talend.core.repository.model.repositoryObject.MetadataTableRepositoryObject;
 import org.talend.core.runtime.CoreRuntimePlugin;
@@ -97,12 +88,12 @@ public class RepositoryLabelProvider extends LabelProvider implements IColorProv
 
     private static final Color MERGED_REFERENCED_ITEMS_COLOR = new Color(null, 120, 120, 120);
 
-    private static final Color WHITE = new Color(null, 255, 255, 255);
-
     private IRepositoryView view;
 
     private static boolean refreshProperty = true;
 
+    private static ITalendThemeService themeServ;
+
     public RepositoryLabelProvider(IRepositoryView view) {
         super();
         this.view = view;
@@ -112,6 +103,61 @@ public class RepositoryLabelProvider extends LabelProvider implements IColorProv
         return view;
     }
 
+    private static ITalendThemeService getThemeServ() {
+        if (themeServ == null) {
+            themeServ = ITalendThemeService.get();
+        }
+        return themeServ;
+    }
+
+    private Color getColor(String prop) {
+        ITalendThemeService theme = getThemeServ();
+        if (theme != null) {
+            return (Color) theme.getGlobalThemeColor(prop);
+        }
+        return null;
+    }
+
+    private Color getStableSecondaryEntryColor() {
+        Color color = getColor("REPO_STABLE_SECONDARY_ENTRY_COLOR");
+        if (color == null) {
+            color = STABLE_SECONDARY_ENTRY_COLOR;
+        }
+        return color;
+    }
+
+    private Color getStablePrimaryEntryColor() {
+        Color color = getColor("REPO_STABLE_PRIMARY_ENTRY_COLOR");
+        if (color == null) {
+            color = STABLE_PRIMARY_ENTRY_COLOR;
+        }
+        return color;
+    }
+
+    private Color getInactiveEntryColor() {
+        Color color = getColor("REPO_INACTIVE_ENTRY_COLOR");
+        if (color == null) {
+            color = INACTIVE_ENTRY_COLOR;
+        }
+        return color;
+    }
+
+    private Color getLockedEntryColor() {
+        Color color = getColor("REPO_LOCKED_ENTRY");
+        if (color == null) {
+            color = LOCKED_ENTRY;
+        }
+        return color;
+    }
+
+    private Color getMergedReferencedItemsColor() {
+        Color color = getColor("REPO_MERGED_REFERENCED_ITEMS_COLOR");
+        if (color == null) {
+            color = MERGED_REFERENCED_ITEMS_COLOR;
+        }
+        return color;
+    }
+
     public String getText(IRepositoryViewObject object) {
         StringBuffer string = new StringBuffer();
         string.append(object.getLabel());
@@ -492,40 +538,25 @@ public class RepositoryLabelProvider extends LabelProvider implements IColorProv
     @Override
     public Color getForeground(Object element) {
         RepositoryNode node = (RepositoryNode) element;
-        try {
-            Bundle bundle = Platform.getBundle(CoreRepositoryPlugin.PLUGIN_ID);
-            BundleContext context = bundle.getBundleContext();
-            ServiceReference ref = context.getServiceReference(IThemeManager.class.getName());
-            IThemeManager manager = (IThemeManager) context.getService(ref);
-            IThemeEngine engine = manager
-                    .getEngineForDisplay(PlatformUI.getWorkbench().getActiveWorkbenchWindow() == null ? Display.getCurrent()
-                            : PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell().getDisplay());
-            ITheme curTheme = engine.getActiveTheme();
-            if (curTheme.getId().contains("dark")) {
-                return null;
-            }
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
         switch (node.getType()) {
         case REFERENCED_PROJECT:
-            return STABLE_PRIMARY_ENTRY_COLOR;
+            return getStablePrimaryEntryColor();
         case STABLE_SYSTEM_FOLDER:
             if (node.getLabel().equals(ERepositoryObjectType.SNIPPETS.toString())) {
-                return INACTIVE_ENTRY_COLOR;
+                return getInactiveEntryColor();
             }
             if (node.getContentType() == ERepositoryObjectType.METADATA) {
-                return STABLE_PRIMARY_ENTRY_COLOR;
+                return getStablePrimaryEntryColor();
             }
         case SYSTEM_FOLDER:
             if (node.getContentType() == ERepositoryObjectType.PROCESS) {
-                return STABLE_PRIMARY_ENTRY_COLOR;
+                return getStablePrimaryEntryColor();
             }
-            return STABLE_SECONDARY_ENTRY_COLOR;
+            return getStableSecondaryEntryColor();
         default:
             ERepositoryStatus repositoryStatus = node.getObject().getRepositoryStatus();
             if (repositoryStatus == ERepositoryStatus.LOCK_BY_OTHER) {
-                return LOCKED_ENTRY;
+                return getLockedEntryColor();
             } else {
                 if (PluginChecker.isRefProjectLoaded()) {
                     IReferencedProjectService service = (IReferencedProjectService) GlobalServiceRegister.getDefault()
@@ -537,7 +568,7 @@ public class RepositoryLabelProvider extends LabelProvider implements IColorProv
                                     .getCurrentProject().getEmfProject();
                             String projectLabel = object.getProjectLabel();
                             if (!mainProject.getLabel().equals(projectLabel)) {
-                                return MERGED_REFERENCED_ITEMS_COLOR;
+                                return getMergedReferencedItemsColor();
                             }
                         }
                     }

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/properties/tab/TalendTabbedPropertyTitle.java

@@ -34,6 +34,7 @@ import org.eclipse.swt.widgets.ToolBar;
 import org.eclipse.swt.widgets.ToolItem;
 import org.eclipse.ui.forms.IFormColors;
 import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
+import org.talend.commons.runtime.service.ITalendThemeService;
 import org.talend.commons.ui.runtime.image.EImage;
 import org.talend.commons.ui.runtime.image.ImageProvider;
 import org.talend.core.GlobalServiceRegister;
@@ -73,6 +74,8 @@ public class TalendTabbedPropertyTitle extends Composite implements ITalendTabbe
 
     private TalendTabbedPropertyColorHelper colorHelper;
 
+    private static ITalendThemeService theme;
+
     /**
      * Constructor for TabbedPropertyTitle.
      *
@@ -173,10 +176,10 @@ public class TalendTabbedPropertyTitle extends Composite implements ITalendTabbe
         helpComp.setVisible(false);
 
         if (colorHelper.getTitleBackground() == null) {
-            label.setBackground(new Color[] { factory.getColors().getColor(IFormColors.H_GRADIENT_END),
-                    factory.getColors().getColor(IFormColors.H_GRADIENT_START) }, new int[] { 100 }, true);
-            titleLabelComp.setBackground(factory.getColors().getColor(IFormColors.H_GRADIENT_START));
-            helpComp.setBackground(factory.getColors().getColor(IFormColors.H_GRADIENT_START));
+            label.setBackground(new Color[] { getStartColor(),
+                    getEndColor() }, new int[] { 100 }, true);
+            titleLabelComp.setBackground(getEndColor());
+            helpComp.setBackground(getEndColor());
         } else {
             label.setBackground(colorHelper.getTitleBackground());
             titleLabelComp.setBackground(colorHelper.getTitleBackground());
@@ -184,23 +187,54 @@ public class TalendTabbedPropertyTitle extends Composite implements ITalendTabbe
         }
     }
 
+    private static ITalendThemeService getTheme() {
+        if (theme == null) {
+            theme = ITalendThemeService.get();
+        }
+        return theme;
+    }
+
+    private Color getColor(String prop) {
+        ITalendThemeService themeServ = getTheme();
+        if (themeServ == null) {
+            return null;
+        }
+        return (Color) themeServ.getGlobalThemeColor(prop);
+    }
+
+    private Color getStartColor() {
+        Color color = getColor("TAB_START_COLOR");
+        if (color == null) {
+            color = factory.getColors().getColor(IFormColors.H_GRADIENT_END);
+        }
+        return color;
+    }
+
+    private Color getEndColor() {
+        Color color = getColor("TAB_END_COLOR");
+        if (color == null) {
+            color = factory.getColors().getColor(IFormColors.H_GRADIENT_START);
+        }
+        return color;
+    }
+
     /**
      * @param e
      */
     protected void drawTitleBackground(PaintEvent e) {
         Rectangle bounds = getClientArea();
         if (colorHelper.getTitleBackground() == null) {
-            label.setBackground(new Color[] { factory.getColors().getColor(IFormColors.H_GRADIENT_END),
-                    factory.getColors().getColor(IFormColors.H_GRADIENT_START) }, new int[] { 100 }, true);
-            titleLabelComp.setBackground(factory.getColors().getColor(IFormColors.H_GRADIENT_START));
-            helpComp.setBackground(factory.getColors().getColor(IFormColors.H_GRADIENT_START));
+            label.setBackground(new Color[] { getStartColor(),
+                    getEndColor() }, new int[] { 100 }, true);
+            titleLabelComp.setBackground(getEndColor());
+            helpComp.setBackground(getEndColor());
         } else {
             label.setBackground(colorHelper.getTitleBackground());
             titleLabelComp.setBackground(colorHelper.getTitleBackground());
             helpComp.setBackground(colorHelper.getTitleBackground());
         }
-        Color bg = factory.getColors().getColor(IFormColors.H_GRADIENT_END);
-        Color gbg = factory.getColors().getColor(IFormColors.H_GRADIENT_START);
+        Color bg = getStartColor();
+        Color gbg = getEndColor();
         GC gc = e.gc;
         gc.setForeground(bg);
         gc.setBackground(gbg);

main/plugins/org.talend.themes.core/.classpath

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>

main/plugins/org.talend.themes.core/META-INF/MANIFEST.MF

@@ -19,6 +19,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.e4.ui.model.workbench,
  org.eclipse.e4.ui.css.swt.theme,
  org.eclipse.osgi.services
+Service-Component: OSGI-INF/core.xml
 Bundle-ActivationPolicy: lazy
 Export-Package: org.talend.themes.core.elements.constants,
  org.talend.themes.core.elements.interfaces,

main/plugins/org.talend.themes.core/OSGI-INF/core.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<component name="TalendThemeService">
+  <implementation class="org.talend.themes.core.TalendThemeService"/>
+  <service>
+    <provide interface="org.talend.commons.runtime.service.ITalendThemeService"/>
+  </service>
+</component>

main/plugins/org.talend.themes.core/build.properties

@@ -3,4 +3,5 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
-               build.properties
+               build.properties,\
+               OSGI-INF/

main/plugins/org.talend.themes.core/src/org/talend/themes/core/TalendThemeService.java

@@ -0,0 +1,91 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2022 Talend Inc. - www.talend.com
+//
+// This source code is available under agreement available at
+// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
+//
+// You should have received a copy of the agreement
+// along with this program; if not, write to Talend SA
+// 9 rue Pages 92150 Suresnes, France
+//
+// ============================================================================
+package org.talend.themes.core;
+
+import org.eclipse.e4.ui.css.core.engine.CSSEngine;
+import org.eclipse.e4.ui.css.swt.dom.WidgetElement;
+import org.eclipse.e4.ui.css.swt.theme.IThemeEngine;
+import org.eclipse.e4.ui.css.swt.theme.IThemeManager;
+import org.eclipse.jface.resource.ColorRegistry;
+import org.eclipse.jface.resource.JFaceResources;
+import org.eclipse.swt.graphics.RGB;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+import org.talend.commons.exception.ExceptionHandler;
+import org.talend.commons.runtime.service.ITalendThemeService;
+import org.w3c.dom.css.CSSStyleDeclaration;
+import org.w3c.dom.css.CSSValue;
+
+/**
+ * DOC cmeng class global comment. Detailled comment
+ */
+public class TalendThemeService implements ITalendThemeService {
+
+    private IThemeEngine themeEngine;
+
+    @Override
+    public Object getGlobalThemeColor(String cssProp) {
+        Shell shell = Display.getDefault().getActiveShell();
+        CSSValue cssValue = getCssValue(shell, cssProp);
+        if (cssValue == null) {
+            return null;
+        }
+        String key = cssValue.getCssText();
+        ColorRegistry colorRegistry = JFaceResources.getColorRegistry();
+        if (!colorRegistry.hasValueFor(key)) {
+            CSSEngine cssEngin = WidgetElement.getEngine(shell);
+            try {
+                RGB rgb = (RGB) cssEngin.convert(cssValue, RGB.class, Display.getDefault());
+                colorRegistry.put(key, rgb);
+            } catch (Exception e) {
+                ExceptionHandler.process(e);
+            }
+        }
+        return colorRegistry.get(key);
+    }
+
+    @Override
+    public String getGlobalThemeProp(String key) {
+        Shell shell = Display.getDefault().getActiveShell();
+        CSSValue cssValue = getCssValue(shell, key);
+        if (cssValue == null) {
+            return null;
+        }
+        return cssValue.getCssText();
+    }
+
+    private IThemeEngine getThemeEngine() {
+        if (themeEngine == null) {
+            BundleContext context = TalendThemesCorePlugin.getDefault().getBundle().getBundleContext();
+            ServiceReference ref = context.getServiceReference(IThemeManager.class.getName());
+            IThemeManager mgr = (IThemeManager) context.getService(ref);
+            themeEngine = mgr.getEngineForDisplay(Display.getDefault());
+        }
+        return themeEngine;
+    }
+
+    private CSSValue getCssValue(Object element, String property) {
+        IThemeEngine engine = getThemeEngine();
+        if (engine == null) {
+            return null;
+        }
+        CSSStyleDeclaration style = engine.getStyle(element);
+        if (style == null) {
+            return null;
+        }
+        return style.getPropertyCSSValue(property);
+    }
+
+}

main/plugins/org.talend.themes.css.talend/META-INF/MANIFEST.MF

@@ -10,4 +10,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.e4.ui.css.swt,
  org.eclipse.e4.ui.css.swt.theme
 Bundle-ActivationPolicy: lazy
+Bundle-Localization: plugin
 Bundle-Vendor: .Talend SA.
+Eclipse-BundleShape: dir
+Automatic-Module-Name: org.talend.themes.css.talend

main/plugins/org.talend.themes.css.talend/build.properties

@@ -3,4 +3,5 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                themes/,\
-               plugin.xml
+               plugin.xml,\
+               plugin.properties

main/plugins/org.talend.themes.css.talend/plugin.properties

@@ -0,0 +1,32 @@
+theme.default=Talend default theme
+theme.dark=Talend experimental dark theme
+
+#New theme element definitions
+DARK_BACKGROUND=Dark Background Color
+DARK_FOREGROUND=Dark Foreground Color
+INACTIVE_UNSELECTED_TABS_COLOR_START=Inactive, unselected part color begin
+INACTIVE_UNSELECTED_TABS_COLOR_START=Inactive, unselected part color begin
+INACTIVE_UNSELECTED_TABS_COLOR_END=Inactive, unselected part color end
+INACTIVE_TAB_TEXT_COLOR=Inactive part text color
+INACTIVE_TAB_OUTER_KEYLINE_COLOR=Inactive part outer keyline color
+INACTIVE_TAB_INNER_KEYLINE_COLOR=Inactive part inner keyline color
+INACTIVE_TAB_OUTLINE_COLOR=Inactive part outline color
+ACTIVE_UNSELECTED_TABS_COLOR_START=Active, unselected part color begin
+ACTIVE_UNSELECTED_TABS_COLOR_END=Active, unselected part color end
+ACTIVE_TAB_TEXT_COLOR=Active part text color
+ACTIVE_TAB_OUTER_KEYLINE_COLOR=Active part outer keyline color
+ACTIVE_TAB_INNER_KEYLINE_COLOR=Active part inner keyline color
+ACTIVE_TAB_OUTLINE_COLOR=Active part outline color
+INACTIVE_TAB_BG_START=Inactive, selected part background begin
+INACTIVE_TAB_BG_END=Inactive, selected part background end
+INACTIVE_TAB_UNSELECTED_TEXT_COLOR=Inactive, unselected part foreground
+INACTIVE_TAB_SELECTED_TEXT_COLOR=Inactive, selected part foreground
+ACTIVE_TAB_BG_START=Active, selected part background begin
+ACTIVE_TAB_BG_END=Active, selected part background end
+ACTIVE_TAB_UNSELECTED_TEXT_COLOR=Active, unselected part foreground
+ACTIVE_TAB_SELECTED_TEXT_COLOR=Active, selected part foreground
+ACTIVE_NOFOCUS_TAB_TEXT_COLOR=Active (no focus), selected part text color
+ACTIVE_NOFOCUS_TAB_BG_START=Active (no focus), selected part background begin
+ACTIVE_NOFOCUS_TAB_BG_END=Active (no focus), selected part background end
+ACTIVE_NOFOCUS_TAB_SELECTED_TEXT_COLOR=Active (no focus), selected part foreground
+LINK_COLOR=Link color

main/plugins/org.talend.themes.css.talend/plugin.xml

@@ -7,27 +7,39 @@
        <theme
              basestylesheeturi="themes/default/css/default.css"
              id="org.talend.themes.css.talend.default"
-             label="Talend default theme">
+             label="%theme.default">
              <!-- please see: TalendThemeConstants.TALEND_DEFAULT_THEME_ID -->
        </theme>
        <theme
-	        basestylesheeturi="themes/dark/css/e4-dark_linux.css"
-	        id="org.talend.themes.css.talend.dark"
-	        label="Talend experimental dark theme"
+	        basestylesheeturi="themes/dark/e4-dark_linux.css"
+	        id="org.eclipse.e4.ui.css.theme.e4_dark"
+	        label="%theme.dark"
 	        os="linux">
 	    </theme>
 	    <theme
-	        basestylesheeturi="themes/dark/css/e4-dark_win.css"
-	        id="org.talend.themes.css.talend.dark"
-	        label="Talend experimental dark theme"
+	        basestylesheeturi="themes/dark/e4-dark_win.css"
+	        id="org.eclipse.e4.ui.css.theme.e4_dark"
+	        label="%theme.dark"
 	        os="win32">
 	    </theme>
 	    <theme
-	        basestylesheeturi="themes/dark/css/e4-dark_mac.css"
-	        id="org.talend.themes.css.talend.dark"
-	        label="Talend experimental dark theme"
+	        basestylesheeturi="themes/dark/e4-dark_mac.css"
+	        id="org.eclipse.e4.ui.css.theme.e4_dark"
+	        label="%theme.dark"
 	        os="macosx">
 	    </theme>
+	    <theme
+            basestylesheeturi="themes/dark/e4-dark_mac1013.css"
+            id="org.eclipse.e4.ui.css.theme.e4_dark"
+            label="%theme.dark"
+            os="macosx"
+            os_version="10.11,10.12,10.13">
+        </theme>
+        <stylesheet
+            uri="themes/dark/dark/e4-dark_preferencestyle.css">
+            <themeid
+                refid="org.eclipse.e4.ui.css.theme.e4_dark"></themeid>
+        </stylesheet>
     </extension>
 
 </plugin>

main/plugins/org.talend.themes.css.talend/themes/dark/dark/e4-dark_globalstyle.css

@@ -25,7 +25,39 @@
 
 /* ############################## Global Styles ############################## */
 
-Shell,
+Shell {
+    background-color:'#org-eclipse-ui-workbench-DARK_BACKGROUND'; 
+    color:'#org-eclipse-ui-workbench-DARK_FOREGROUND'; 
+    REPO_STABLE_SECONDARY_ENTRY_COLOR: #afafaf;
+    REPO_STABLE_PRIMARY_ENTRY_COLOR: #ffffff;
+    REPO_INACTIVE_ENTRY_COLOR: #8a8a8a;
+    REPO_LOCKED_ENTRY: #6b0000;
+    REPO_MERGED_REFERENCED_ITEMS_COLOR: #afafaf;
+    TAB_START_COLOR: #1b3c4f;
+    TAB_END_COLOR: #565656;
+    DESIGNER_COLOR_A: #000000;
+    DESIGNER_COLOR_B: #4f4f4f;
+    DESIGNER_COLOR_ALPHA: 95;
+}
+
+.TalendTabbedPropertyList{
+    background-color: black;
+    border-visible: true;
+    color:black;
+    _t-widget-normal-shadow-color:black;
+    _t-widget-dark-shadow-color:black;
+    _t-list-background-color: #ffffff;
+    _t-widget-vertical-line-color: #E3E3E3;
+}
+
+.TalendTabbedPropertyTitle{
+    border-visible: false;
+    _t-title-foreground-color:black;
+    _t-title-background-color:black;
+    _t-title-bottom-foreground-keyline1-color:black;
+    _t-title-bottom-foreground-keyline2-color:black;
+}
+
 Composite, ScrolledComposite, ExpandableComposite, Canvas, TabFolder, CLabel, Label,
 CoolBar, Sash, Group, RefactoringLocationControl, ChangeParametersControl, Link, FilteredTree,
 ProxyEntriesComposite, NonProxyHostsComposite, DelayedFilterCheckboxTree,
@@ -262,18 +294,13 @@ PageSiteComposite > PropertyTable:disabled {
  */
 Label#org-eclipse-ui-splash-progressText {
 	background-color: inherit; /* transparent */
-	color: #9c9696; /* see property startupForegroundColor in the product */ 
+	color: #9c9696; /* see property startupForegroundColor in the product */
 }
 
 Label#org-eclipse-ui-buildid-text {
 	background-color: inherit; /* transparent */
 }
 
-/*Cindy */
-Label {
-	color: white; /* see property startupForegroundColor in the product */ 
-}
-
 ProgressIndicator#org-eclipse-ui-splash-progressIndicator {
 	background-color: #e1e1e1;
 }
@@ -318,10 +345,6 @@ TabbedPropertyList {
     tPalette-mouseOver-background-color3:#3c8ad2;				/* */
     tPalette-expanded-background-color: black;
 /*   	tPalette-expanded-background-color:#0069d9;					/* background color when level is selected */
-
-
-
-    
     tPalette-collapse-topBorder-forground-lineColor1:'#org-eclipse-ui-workbench-DARK_BACKGROUND';   /* top border  */
     tPalette-collapse-topBorder-forground-lineColor2: #2F2F2F;     /* top border  */
     tPalette-collapse-expanded-forground-lineColor: #2F2F2F;     	/* bottom border  */
@@ -329,20 +352,7 @@ TabbedPropertyList {
     tPalette-scroll-pane-list-border:0 0 0 0;
     tPalette-scroll-pane-border:0 0 0 0;
     tPalette-color-increment:10;   								/* color increment in palette depth  */
-    
     tPalette-x-offset:17;
     tPalette-entryEditPart-entry-color-inheritFromParent:true;
-    
     tPalette-searchButton-background-color:'#org-eclipse-ui-workbench-DARK_BACKGROUND';
-    tPalette-searchButton-image: url('./default/pics/studio_6.0-repo-search.png');
-}
-
-/* Repository tree */
-.TalendRepositoryLabel {
-	STABLE_SECONDARY_ENTRY_COLOR: #646464;
-	STABLE_PRIMARY_ENTRY_COLOR: #000000;
-	INACTIVE_ENTRY_COLOR: #C8C8C8;
-	LOCKED_ENTRY: #C80000;
-	MERGED_REFERENCED_ITEMS_COLOR: #787878;
-	
 }

main/plugins/org.talend.themes.css.talend/themes/dark/dark/e4-dark_ide_colorextensions.css

@@ -52,161 +52,161 @@ ThemesExtension { color-definition:
 ColorDefinition#org-eclipse-ui-workbench-DARK_BACKGROUND {
 	color: #515658;
 	category: '#org-eclipse-ui-presentation-default';
-	label: url('platform:/plugin/org.eclipse.ui.themes?message=DARK_BACKGROUND');
+	label: url('platform:/plugin/org.talend.themes.css.talend?message=DARK_BACKGROUND');
 }
 
 ColorDefinition#org-eclipse-ui-workbench-DARK_FOREGROUND {
 	color: #eeeeee;
 	category: '#org-eclipse-ui-presentation-default';
-	label: url('platform:/plugin/org.eclipse.ui.themes?message=DARK_FOREGROUND');
+	label: url('platform:/plugin/org.talend.themes.css.talend?message=DARK_FOREGROUND');
 }
 
 ColorDefinition#org-eclipse-ui-workbench-INACTIVE_UNSELECTED_TABS_COLOR_START {
 	color: #515658;
 	category: '#org-eclipse-ui-presentation-default';
-	label: url('platform:/plugin/org.eclipse.ui.themes?message=INACTIVE_UNSELECTED_TABS_COLOR_START');
+	label: url('platform:/plugin/org.talend.themes.css.talend?message=INACTIVE_UNSELECTED_TABS_COLOR_START');
 }
 
 ColorDefinition#org-eclipse-ui-workbench-INACTIVE_UNSELECTED_TABS_COLOR_END {
 	color: #464649;
 	category: '#org-eclipse-ui-presentation-default';
-	label: url('platform:/plugin/org.eclipse.ui.themes?message=INACTIVE_UNSELECTED_TABS_COLOR_END');
+	label: url('platform:/plugin/org.talend.themes.css.talend?message=INACTIVE_UNSELECTED_TABS_COLOR_END');
 }
 
 ColorDefinition#org-eclipse-ui-workbench-INACTIVE_TAB_BG_START {
     color: #3B4042;
     category: '#org-eclipse-ui-presentation-default';
-    label: url('platform:/plugin/org.eclipse.ui.themes?message=INACTIVE_TAB_BG_START');
+    label: url('platform:/plugin/org.talend.themes.css.talend?message=INACTIVE_TAB_BG_START');
 }
 
 ColorDefinition#org-eclipse-ui-workbench-INACTIVE_TAB_BG_END {
     color: #313538;
     category: '#org-eclipse-ui-presentation-default';
-    label: url('platform:/plugin/org.eclipse.ui.themes?message=INACTIVE_TAB_BG_END');
+    label: url('platform:/plugin/org.talend.themes.css.talend?message=INACTIVE_TAB_BG_END');
 }
 
 ColorDefinition#org-eclipse-ui-workbench-INACTIVE_TAB_OUTER_KEYLINE_COLOR {
 	color: #515658;
 	category: '#org-eclipse-ui-presentation-default';
-	label: url('platform:/plugin/org.eclipse.ui.themes?message=INACTIVE_TAB_OUTER_KEYLINE_COLOR');
+	label: url('platform:/plugin/org.talend.themes.css.talend?message=INACTIVE_TAB_OUTER_KEYLINE_COLOR');
 }
 
 ColorDefinition#org-eclipse-ui-workbench-INACTIVE_TAB_INNER_KEYLINE_COLOR {
 	color: #515658;
 	category: '#org-eclipse-ui-presentation-default';
-	label: url('platform:/plugin/org.eclipse.ui.themes?message=INACTIVE_TAB_INNER_KEYLINE_COLOR');
+	label: url('platform:/plugin/org.talend.themes.css.talend?message=INACTIVE_TAB_INNER_KEYLINE_COLOR');
 }
 
 ColorDefinition#org-eclipse-ui-workbench-INACTIVE_TAB_OUTLINE_COLOR {
 	color: #3B4042;
 	category: '#org-eclipse-ui-presentation-default';
-	label: url('platform:/plugin/org.eclipse.ui.themes?message=INACTIVE_TAB_OUTLINE_COLOR');
+	label: url('platform:/plugin/org.talend.themes.css.talend?message=INACTIVE_TAB_OUTLINE_COLOR');
 }
 
 ColorDefinition#org-eclipse-ui-workbench-INACTIVE_TAB_TEXT_COLOR {
     color: #BBBBBB;
     category: '#org-eclipse-ui-presentation-default';
-    label: url('platform:/plugin/org.eclipse.ui.themes?message=INACTIVE_TAB_TEXT_COLOR');
+    label: url('platform:/plugin/org.talend.themes.css.talend?message=INACTIVE_TAB_TEXT_COLOR');
 }
 
 ColorDefinition#org-eclipse-ui-workbench-INACTIVE_TAB_UNSELECTED_TEXT_COLOR {
     color: #BBBBBB;
     category: '#org-eclipse-ui-presentation-default';
-    label: url('platform:/plugin/org.eclipse.ui.themes?message=INACTIVE_TAB_UNSELECTED_TEXT_COLOR');
+    label: url('platform:/plugin/org.talend.themes.css.talend?message=INACTIVE_TAB_UNSELECTED_TEXT_COLOR');
 }
 
 ColorDefinition#org-eclipse-ui-workbench-INACTIVE_TAB_SELECTED_TEXT_COLOR {
     color: #FFFFFF;
     category: '#org-eclipse-ui-presentation-default';
-    label: url('platform:/plugin/org.eclipse.ui.themes?message=INACTIVE_TAB_SELECTED_TEXT_COLOR');
+    label: url('platform:/plugin/org.talend.themes.css.talend?message=INACTIVE_TAB_SELECTED_TEXT_COLOR');
 }
 
 ColorDefinition#org-eclipse-ui-workbench-ACTIVE_UNSELECTED_TABS_COLOR_START {
 	color: #494A4D;
 	category: '#org-eclipse-ui-presentation-default';
-	label: url('platform:/plugin/org.eclipse.ui.themes?message=ACTIVE_UNSELECTED_TABS_COLOR_START');
+	label: url('platform:/plugin/org.talend.themes.css.talend?message=ACTIVE_UNSELECTED_TABS_COLOR_START');
 }
 
 ColorDefinition#org-eclipse-ui-workbench-ACTIVE_UNSELECTED_TABS_COLOR_END {
 	color: #404043;
 	category: '#org-eclipse-ui-presentation-default';
-	label: url('platform:/plugin/org.eclipse.ui.themes?message=ACTIVE_UNSELECTED_TABS_COLOR_END');
+	label: url('platform:/plugin/org.talend.themes.css.talend?message=ACTIVE_UNSELECTED_TABS_COLOR_END');
 }
 
 ColorDefinition#org-eclipse-ui-workbench-ACTIVE_TAB_BG_START {
     color: #2B2C2D;
     category: '#org-eclipse-ui-presentation-default';
-    label: url('platform:/plugin/org.eclipse.ui.themes?message=ACTIVE_TAB_BG_START');
+    label: url('platform:/plugin/org.talend.themes.css.talend?message=ACTIVE_TAB_BG_START');
 }
 
 ColorDefinition#org-eclipse-ui-workbench-ACTIVE_TAB_BG_END {
     color: #292929;
     category: '#org-eclipse-ui-presentation-default';
-    label: url('platform:/plugin/org.eclipse.ui.themes?message=ACTIVE_TAB_BG_END');
+    label: url('platform:/plugin/org.talend.themes.css.talend?message=ACTIVE_TAB_BG_END');
 }
 
 ColorDefinition#org-eclipse-ui-workbench-ACTIVE_TAB_OUTER_KEYLINE_COLOR {
 	color: #4B4C4F;
 	category: '#org-eclipse-ui-presentation-default';
-	label: url('platform:/plugin/org.eclipse.ui.themes?message=ACTIVE_TAB_OUTER_KEYLINE_COLOR');
+	label: url('platform:/plugin/org.talend.themes.css.talend?message=ACTIVE_TAB_OUTER_KEYLINE_COLOR');
 }
 
 ColorDefinition#org-eclipse-ui-workbench-ACTIVE_TAB_INNER_KEYLINE_COLOR {
 	color: #4B4C4F;
 	category: '#org-eclipse-ui-presentation-default';
-	label: url('platform:/plugin/org.eclipse.ui.themes?message=ACTIVE_TAB_INNER_KEYLINE_COLOR');
+	label: url('platform:/plugin/org.talend.themes.css.talend?message=ACTIVE_TAB_INNER_KEYLINE_COLOR');
 }
 
 ColorDefinition#org-eclipse-ui-workbench-ACTIVE_TAB_OUTLINE_COLOR {
 	color: #4B4C4F;
 	category: '#org-eclipse-ui-presentation-default';
-	label: url('platform:/plugin/org.eclipse.ui.themes?message=ACTIVE_TAB_OUTLINE_COLOR');
+	label: url('platform:/plugin/org.talend.themes.css.talend?message=ACTIVE_TAB_OUTLINE_COLOR');
 }
 
 ColorDefinition#org-eclipse-ui-workbench-ACTIVE_TAB_TEXT_COLOR {
     color: #DDDDDD;
     category: '#org-eclipse-ui-presentation-default';
-    label: url('platform:/plugin/org.eclipse.ui.themes?message=ACTIVE_TAB_TEXT_COLOR');
+    label: url('platform:/plugin/org.talend.themes.css.talend?message=ACTIVE_TAB_TEXT_COLOR');
 }
 
 ColorDefinition#org-eclipse-ui-workbench-ACTIVE_TAB_UNSELECTED_TEXT_COLOR {
     color: #DDDDDD;
     category: '#org-eclipse-ui-presentation-default';
-    label: url('platform:/plugin/org.eclipse.ui.themes?message=ACTIVE_TAB_UNSELECTED_TEXT_COLOR');
+    label: url('platform:/plugin/org.talend.themes.css.talend?message=ACTIVE_TAB_UNSELECTED_TEXT_COLOR');
 }
 
 ColorDefinition#org-eclipse-ui-workbench-ACTIVE_TAB_SELECTED_TEXT_COLOR {
     color: #f7f8f8;
     category: '#org-eclipse-ui-presentation-default';
-    label: url('platform:/plugin/org.eclipse.ui.themes?message=ACTIVE_TAB_SELECTED_TEXT_COLOR');
+    label: url('platform:/plugin/org.talend.themes.css.talend?message=ACTIVE_TAB_SELECTED_TEXT_COLOR');
 }
 
 ColorDefinition#org-eclipse-ui-workbench-ACTIVE_NOFOCUS_TAB_BG_START {
     color: #2B2C2D;
     category: '#org-eclipse-ui-presentation-default';
-    label: url('platform:/plugin/org.eclipse.ui.themes?message=ACTIVE_NOFOCUS_TAB_BG_START');
+    label: url('platform:/plugin/org.talend.themes.css.talend?message=ACTIVE_NOFOCUS_TAB_BG_START');
 }
 
 ColorDefinition#org-eclipse-ui-workbench-ACTIVE_NOFOCUS_TAB_BG_END {
     color: #292929;
     category: '#org-eclipse-ui-presentation-default';
-    label: url('platform:/plugin/org.eclipse.ui.themes?message=ACTIVE_NOFOCUS_TAB_BG_END');
+    label: url('platform:/plugin/org.talend.themes.css.talend?message=ACTIVE_NOFOCUS_TAB_BG_END');
 }
 
 ColorDefinition#org-eclipse-ui-workbench-ACTIVE_NOFOCUS_TAB_TEXT_COLOR {
     color: #CCCCCC;
     category: '#org-eclipse-ui-presentation-default';
-    label: url('platform:/plugin/org.eclipse.ui.themes?message=ACTIVE_NOFOCUS_TAB_TEXT_COLOR');
+    label: url('platform:/plugin/org.talend.themes.css.talend?message=ACTIVE_NOFOCUS_TAB_TEXT_COLOR');
 }
 
 ColorDefinition#org-eclipse-ui-workbench-ACTIVE_NOFOCUS_TAB_SELECTED_TEXT_COLOR {
     color: #CCCCCC;
     category: '#org-eclipse-ui-presentation-default';
-    label: url('platform:/plugin/org.eclipse.ui.themes?message=ACTIVE_NOFOCUS_TAB_SELECTED_TEXT_COLOR');
+    label: url('platform:/plugin/org.talend.themes.css.talend?message=ACTIVE_NOFOCUS_TAB_SELECTED_TEXT_COLOR');
 }
 
 ColorDefinition#org-eclipse-ui-workbench-LINK_COLOR {
     color: #6FC5EE;
     category: '#org-eclipse-ui-presentation-default';
-    label: url('platform:/plugin/org.eclipse.ui.themes?message=LINK_COLOR');
+    label: url('platform:/plugin/org.talend.themes.css.talend?message=LINK_COLOR');
 }

main/plugins/org.talend.themes.css.talend/themes/dark/dark/e4-dark_preferencestyle.css

@@ -17,7 +17,7 @@
 /* ############################## Eclipse UI properties ############################## */
 
 
-IEclipsePreferences#org-eclipse-ui-editors:org-eclipse-ui-themes { /* pseudo attribute added to allow contributions without replacing this node, see Bug 466075 */
+IEclipsePreferences#org-eclipse-ui-editors:org-talend-themes-css-talend { /* pseudo attribute added to allow contributions without replacing this node, see Bug 466075 */
 	preferences:
 		'AbstractTextEditor.Color.Background.SystemDefault=false'
 		'AbstractTextEditor.Color.SelectionForeground.SystemDefault=false'
@@ -52,7 +52,7 @@ IEclipsePreferences#org-eclipse-ui-editors:org-eclipse-ui-themes { /* pseudo att
 		'writeOccurrenceIndicationColor=27,98,145'
 }
 
-IEclipsePreferences#org-eclipse-ui-workbench:org-eclipse-ui-themes { /* pseudo attribute added to allow contributions without replacing this node, see Bug 466075 */
+IEclipsePreferences#org-eclipse-ui-workbench:org-talend-themes-css-talend { /* pseudo attribute added to allow contributions without replacing this node, see Bug 466075 */
 	preferences:
 		'ACTIVE_HYPERLINK_COLOR=138,201,242'
 		'CONFLICTING_COLOR=240,15,66'

main/plugins/org.talend.themes.css.talend/themes/dark/dark/e4-dark_tabstyle.css

@@ -24,8 +24,6 @@
     font-family: '#org-eclipse-ui-workbench-TAB_TEXT_FONT';
     swt-tab-renderer: url('bundleclass://org.eclipse.e4.ui.workbench.renderers.swt/org.eclipse.e4.ui.workbench.renderers.swt.CTabRendering');
     swt-shadow-visible: false;
-    jtab-hover-color : #a8bf10;
-    jtab-hover-tabs-background: none;
 }
 
 CTabFolder {
@@ -38,20 +36,15 @@ CTabFolder {
     swt-selected-tab-fill: '#org-eclipse-ui-workbench-ACTIVE_TAB_BG_END'; /* title background for selected tab */
     swt-shadow-visible: false;
     swt-unselected-hot-tab-color-background: #161616; /* Bug 465711 */
-    swt-unselected-hot-tab-color: #a8bf10;
     swt-selected-tab-highlight: none;
-    
 }
 
 CTabFolder[style~='SWT.DOWN'][style~='SWT.BOTTOM'] {
     /* Set the styles for the bottom inner tabs (Bug 430051): */
     swt-tab-renderer: url('bundleclass://org.eclipse.e4.ui.workbench.renderers.swt/org.eclipse.e4.ui.workbench.renderers.swt.CTabRendering');
     swt-unselected-hot-tab-color-background: #161616; /* Bug 465711 */
-    swt-unselected-hot-tab-color: #a8bf10;
     swt-selected-tab-highlight: #316c9b;
     swt-selected-highlight-top: false;
-    jtab-hover-color : #a8bf10;
-    jtab-hover-tabs-background: none;
 }
 
 

main/plugins/org.talend.themes.css.talend/themes/dark/e4-dark_linux.css

@@ -13,12 +13,12 @@
  *     Lars Vogel - initial API and implementation
  *******************************************************************************/
 
-@import url("common/e4_globalstyle.css");
-@import url("common/e4-dark_ide_colorextensions.css");
-@import url("common/e4-dark_globalstyle.css"); /* Remove this to have ONLY the main IDE shell dark */
-@import url("common/e4-dark_partstyle.css");
-@import url("common/e4-dark_tabstyle.css");
-@import url("common/e4-dark-drag-styling.css");
+@import url("platform:/plugin/org.talend.themes.css.talend/themes/dark/common/e4_globalstyle.css");
+@import url("platform:/plugin/org.talend.themes.css.talend/themes/dark/dark/e4-dark_ide_colorextensions.css");
+@import url("platform:/plugin/org.talend.themes.css.talend/themes/dark/dark/e4-dark_globalstyle.css"); /* Remove this to have ONLY the main IDE shell dark */
+@import url("platform:/plugin/org.talend.themes.css.talend/themes/dark/dark/e4-dark_partstyle.css");
+@import url("platform:/plugin/org.talend.themes.css.talend/themes/dark/dark/e4-dark_tabstyle.css");
+@import url("platform:/plugin/org.talend.themes.css.talend/themes/dark/dark/e4-dark-drag-styling.css");
 
 CTabFolder Canvas {
     background-color: #2F2F2F;

main/plugins/org.talend.themes.css.talend/themes/dark/e4-dark_mac.css

@@ -12,12 +12,12 @@
  *     Andrea Guarinoni <andrea.guarinoni.dev@outlook.com> - initial API and implementation
  *******************************************************************************/
 
-@import url("common/e4_globalstyle.css");
-@import url("common/e4-dark_ide_colorextensions.css");
-@import url("common/e4-dark_globalstyle.css"); /* Remove this to have ONLY the main IDE shell dark */
-@import url("common/e4-dark_partstyle.css");
-@import url("common/e4-dark_tabstyle.css");
-@import url("common/e4-dark-drag-styling.css");
+@import url("platform:/plugin/org.talend.themes.css.talend/themes/dark/common/e4_globalstyle.css");
+@import url("platform:/plugin/org.talend.themes.css.talend/themes/dark/dark/e4-dark_ide_colorextensions.css");
+@import url("platform:/plugin/org.talend.themes.css.talend/themes/dark/dark/e4-dark_globalstyle.css"); /* Remove this to have ONLY the main IDE shell dark */
+@import url("platform:/plugin/org.talend.themes.css.talend/themes/dark/dark/e4-dark_partstyle.css");
+@import url("platform:/plugin/org.talend.themes.css.talend/themes/dark/dark/e4-dark_tabstyle.css");
+@import url("platform:/plugin/org.talend.themes.css.talend/themes/dark/dark/e4-dark-drag-styling.css");
 
 .MPartStack.active CTabFolder Canvas {
     background-color: #262626;
@@ -52,3 +52,4 @@ Button  {
     background-color: unset;
     color: unset;
 }
+

main/plugins/org.talend.themes.css.talend/themes/dark/e4-dark_mac1013.css

@@ -0,0 +1,80 @@
+/*******************************************************************************
+ * Copyright (c) 2010, 2014 Andrea Guarinoni and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     Andrea Guarinoni <andrea.guarinoni.dev@outlook.com> - initial API and implementation
+ *******************************************************************************/
+
+@import url("platform:/plugin/org.talend.themes.css.talend/themes/dark/common/e4_globalstyle.css");
+@import url("platform:/plugin/org.talend.themes.css.talend/themes/dark/dark/e4-dark_ide_colorextensions.css");
+@import url("platform:/plugin/org.talend.themes.css.talend/themes/dark/dark/e4-dark_globalstyle.css"); /* Remove this to have ONLY the main IDE shell dark */
+@import url("platform:/plugin/org.talend.themes.css.talend/themes/dark/dark/e4-dark_partstyle.css");
+@import url("platform:/plugin/org.talend.themes.css.talend/themes/dark/dark/e4-dark_tabstyle.css");
+@import url("platform:/plugin/org.talend.themes.css.talend/themes/dark/dark/e4-dark-drag-styling.css");
+
+CTabFolder Canvas {
+    background-color: #2F2F2F;
+    color: #CCC;
+}
+
+.MPartStack.active CTabFolder Canvas {
+    background-color: #262626;
+    color: #CCC;
+}
+
+/* #################### Bottom Status Bar ######################## */
+
+StatusLine,
+ImageBasedFrame,
+#org-eclipse-ui-StatusLine,
+#org-eclipse-ui-StatusLine CLabel,
+#org-eclipse-ui-ProgressBar,
+#org-eclipse-ui-ProgressBar Canvas {
+     color:'#org-eclipse-ui-workbench-DARK_FOREGROUND'; 
+}
+
+
+/* ###################### Global Styles ########################## */
+
+TabFolder {
+    /* background-color is not applied to the whole button,
+       but text color is changed, so it appear light on light */
+    background-color: '#org-eclipse-ui-workbench-DARK_BACKGROUND'; 
+    color: #222;
+}
+
+Button {
+    /* background-color is not applied to the whole button,
+       but text color is changed, so it appear light on light */
+    background-color: #2F2F2F;
+    color: #CCCCCC;
+}
+Button[style~='SWT.CHECK'] {
+    /* currently, Button object isn't consistent (eg. also a checkbox is seen as Button) */
+    /* so, css rules applied to Button have to be overridden for non-Button matches */
+    background-color: '#org-eclipse-ui-workbench-DARK_BACKGROUND'; 
+    color: #ddd;
+}
+Button[style~='SWT.RADIO'] {
+    /* currently, Button object isn't consistent (eg. also a checkbox is seen as Button) */
+    /* so, css rules applied to Button have to be overridden for non-Button matches */
+    background-color: '#org-eclipse-ui-workbench-DARK_BACKGROUND'; 
+    color: #ddd;
+}
+
+Combo {
+    background-color: #949DA5; 
+    color: #222;  /* background of drop-drown list is hard-coded to white */
+}
+Combo:selected {
+    background-color: #41464A;
+    color: #FFF;
+}
+

main/plugins/org.talend.themes.css.talend/themes/dark/e4-dark_win.css

@@ -1,26 +1,9 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2015 Andrea Guarinoni and others.
- *
- * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     Andrea Guarinoni <andrea.guarinoni.dev@outlook.com> - initial API and implementation
- *     Lars Vogel <Lars.Vogel@vogella.com> - initial API and implementation
- *     Stefan Winkler <stefan@winklerweb.net> - Bug 431845
- *     Fabio Zadrozny <fabiofz@gmail.com> - Bug 434201, 434309, 430278
- *******************************************************************************/
-
-@import url("common/e4_globalstyle.css");
-@import url("common/e4-dark_ide_colorextensions.css");
-@import url("common/e4-dark_globalstyle.css"); /* Remove this to have ONLY the main IDE shell dark */
-@import url("common/e4-dark_partstyle.css");
-@import url("common/e4-dark_tabstyle.css");
-@import url("common/e4-dark-drag-styling.css");
+@import url("platform:/plugin/org.talend.themes.css.talend/themes/dark/common/e4_globalstyle.css");
+@import url("platform:/plugin/org.talend.themes.css.talend/themes/dark/dark/e4-dark_ide_colorextensions.css");
+@import url("platform:/plugin/org.talend.themes.css.talend/themes/dark/dark/e4-dark_globalstyle.css"); /* Remove this to have ONLY the main IDE shell dark */
+@import url("platform:/plugin/org.talend.themes.css.talend/themes/dark/dark/e4-dark_partstyle.css");
+@import url("platform:/plugin/org.talend.themes.css.talend/themes/dark/dark/e4-dark_tabstyle.css");
+@import url("platform:/plugin/org.talend.themes.css.talend/themes/dark/dark/e4-dark-drag-styling.css");
 
 CTabFolder Canvas {
     background-color: #2F2F2F;

main/plugins/org.talend.themes.css.talend/themes/default/css/default.css

@@ -9,6 +9,14 @@
     font-family: '#org-eclipse-ui-workbench-TAB_TEXT_FONT';
 }
 
+Shell {
+    REPO_STABLE_SECONDARY_ENTRY_COLOR: #646464;
+    REPO_STABLE_PRIMARY_ENTRY_COLOR: #000000;
+    REPO_INACTIVE_ENTRY_COLOR: #c8c8c8;
+    REPO_LOCKED_ENTRY: #c80000;
+    REPO_MERGED_REFERENCED_ITEMS_COLOR: #787878;
+}
+
 /**************************************************
  * Global Color Setting
  **************************************************/
@@ -648,7 +656,10 @@ CTabFolder.org-talend-rcp-abstractMultiPageEditor-footer CTabItem:selected {
 .TalendStagingView StyledText {
     background-color: COLOR-LIST-BACKGROUND;
 }
-
+Table {
+    background-color: #ff0000;
+swt-header-color: #00ff00;
+}
 /**************************************************
  * Palette
  **************************************************/