DynamoDS
diff --git a/‎src/DynamoCoreWpf/Properties/Resources.Designer.cs
Copy file name to clipboard
+9Lines changed: 9 additions & 0 deletions b/‎src/DynamoCoreWpf/Properties/Resources.Designer.cs
Copy file name to clipboard
+9Lines changed: 9 additions & 0 deletions
diff --git a/‎src/DynamoCoreWpf/Properties/Resources.en-US.resx
Copy file name to clipboard
+3Lines changed: 3 additions & 0 deletions b/‎src/DynamoCoreWpf/Properties/Resources.en-US.resx
Copy file name to clipboard
+3Lines changed: 3 additions & 0 deletions
diff --git a/‎src/DynamoCoreWpf/ViewModels/Core/CustomColorPickerViewModel.cs
Copy file name to clipboard
+26-22Lines changed: 26 additions & 22 deletions b/‎src/DynamoCoreWpf/ViewModels/Core/CustomColorPickerViewModel.cs
Copy file name to clipboard
+26-22Lines changed: 26 additions & 22 deletions
@@ -3577,4 +3577,7 @@ In certain complex graphs or host program scenarios, Automatic mode may cause in
     <value>Python Editor</value>
     <comment>Preferences -&gt; ZoomScalling -&gt; Python Editor</comment>
   </data>
+  <data name="CustomColorsPopupTitle" xml:space="preserve">
+    <value>Custom</value>
+  </data>
 </root>
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
@@ -17,6 +16,10 @@ internal class CustomColorItem : ColorItem, INotifyPropertyChanged
         public event PropertyChangedEventHandler PropertyChanged;
 
         private bool isColorItemSelected = false;
+
+        /// <summary>
+        /// This property will decide if we show a blue square over the color selected in CustomColoPicker or not.
+        /// </summary>
         public bool IsColorItemSelected
         {
             get
@@ -50,26 +53,40 @@ protected void OnPropertyChanged([CallerMemberName] string name = null)
 
     internal class CustomColorPickerViewModel : NotificationObject
     {
-        private Color? colorPickerFinalSelectedColor;
         private ObservableCollection<CustomColorItem> basicColors;
         private ObservableCollection<CustomColorItem> customColors;
 
+        private bool isCustomColorSelectionEnabled = false;
+        private Color? colorPickerSelectedColor = null;
 
         /// <summary>
-        /// Color Selected in the ColorPicker
+        /// This property will decide if we should show the normal color selection controls or the custom colors selection controls in the Popup
         /// </summary>
-        public Color? ColorPickerFinalSelectedColor
+        public bool IsCustomColorSelectionEnabled
         {
             get
             {
-                return colorPickerFinalSelectedColor;
+                return isCustomColorSelectionEnabled;
             }
             set
             {
-                colorPickerFinalSelectedColor = value;
-                RaisePropertyChanged(nameof(ColorPickerFinalSelectedColor));
+                isCustomColorSelectionEnabled = value;
+                RaisePropertyChanged(nameof(IsCustomColorSelectionEnabled));
             }
-        }      
+        }
+
+        /// <summary>
+        /// This property will contain the current color selected in the CustomColorPicker
+        /// </summary>
+        public Color? ColorPickerSelectedColor
+        {
+            get { return colorPickerSelectedColor; }
+            set
+            {
+                colorPickerSelectedColor = value;
+                RaisePropertyChanged(nameof(ColorPickerSelectedColor));
+            }
+        }
 
         /// <summary>
         /// List of Basic Colors that will be displayed in the CustomColorPicker
@@ -108,8 +125,7 @@ public CustomColorPickerViewModel()
             BasicColors = new ObservableCollection<CustomColorItem>();
             BasicColors = CreateBasicColorsCollection();
 
-            CustomColors = new ObservableCollection<CustomColorItem>();
-            CustomColors = CreateCustomColorsCollection();
+            CustomColors = new ObservableCollection<CustomColorItem>(); ;
         }
 
         private static ObservableCollection<CustomColorItem> CreateBasicColorsCollection()
@@ -211,17 +227,5 @@ private static ObservableCollection<CustomColorItem> CreateBasicColorsCollection
 
             return observableCollection;
         }
-
-        /// <summary>
-        /// Creates de default List of Custom Colors (this will be modified by the user
-        /// </summary>
-        /// <returns></returns>
-        private static ObservableCollection<CustomColorItem> CreateCustomColorsCollection()
-        {
-            ObservableCollection<CustomColorItem> observableCollection = new ObservableCollection<CustomColorItem>();
-            var colorItem = Color.FromRgb(0, 255, 0);
-            observableCollection.Add(new CustomColorItem(colorItem, string.Format("#{0},{1},{2}", 0, 255, 0)));
-            return observableCollection;
-        }
     }
 }