diff --git a/README.md b/README.md
index b30f046..e1e770a 100644
--- a/README.md
+++ b/README.md
@@ -56,7 +56,7 @@ color-scheme                                               | screenshot
 **neon** *Inspired by forum user BobZ*      | ![Neon coloured theme inspired by forum user BobZ](https://raw.githubusercontent.com/pointhi/kicad-color-schemes/master/neon/eeschema.png)
 **nord** *Designed by @0xdec* | ![based on the nordtheme color palette](https://raw.githubusercontent.com/pointhi/kicad-color-schemes/master/nord/eeschema.png)
 **monokai** *Inspired by forum user kickofighto*    | ![Dark theme based on monokai](https://raw.githubusercontent.com/pointhi/kicad-color-schemes/master/monokai/eeschema.png)
-**eagle** *Designed by DX-MON, Inspired by EagleCAD*       | ![Dark theme based on Eagle](https://raw.githubusercontent.com/pointhi/kicad-color-schemes/master/eagle/eeschema.png)
+**eagle-dark** *Designed by DX-MON, Inspired by EagleCAD*       | ![Dark theme based on Eagle](https://raw.githubusercontent.com/pointhi/kicad-color-schemes/master/eagle-dark/eeschema.png)
 **wlight** *Designed by wykys, Inspired by Altium*       | ![Light theme designed for export to PDF](wlight/eeschema.png)
 
 ## pcbnew
@@ -67,7 +67,7 @@ color-scheme                                               | screenshot
 **behave-dark** *https://atom.io/themes/behave-theme*      | ![Dark theme based on behave](https://raw.githubusercontent.com/pointhi/kicad-color-schemes/master/behave-dark/pcbnew.png)
 **blue-green-dark**     | ![Dark theme using blue and green](https://raw.githubusercontent.com/pointhi/kicad-color-schemes/master/blue-green-dark/pcbnew.png)
 **nord** *Designed by @0xdec* | ![based on the nordtheme color palette](https://raw.githubusercontent.com/pointhi/kicad-color-schemes/master/nord/pcbnew.png)
-**eagle** *Designed by DX-MON, Inspired by EagleCAD*       | ![Loosely based on Eagle's dark theme](https://raw.githubusercontent.com/pointhi/kicad-color-schemes/master/eagle/pcbnew.png)
+**eagle-dark** *Designed by DX-MON, Inspired by EagleCAD*       | ![Loosely based on Eagle's dark theme](https://raw.githubusercontent.com/pointhi/kicad-color-schemes/master/eagle-dark/pcbnew.png)
 
 ## footprint editor
 color-scheme                                               | screenshot
@@ -77,4 +77,4 @@ color-scheme                                               | screenshot
 **behave-dark** *https://atom.io/themes/behave-theme*      | ![Dark theme based on behave](https://raw.githubusercontent.com/pointhi/kicad-color-schemes/master/behave-dark/footprint_editor.png)
 **blue-green-dark**                                        | ![Dark theme using blue and green](https://raw.githubusercontent.com/pointhi/kicad-color-schemes/master/blue-green-dark/footprint_editor.png)
 **nord** *Designed by @0xdec* | ![based on the nordtheme color palette](https://raw.githubusercontent.com/pointhi/kicad-color-schemes/master/nord/footprint_editor.png)
-**eagle** *Designed by DX-MON, Inspired by EagleCAD*       | ![Loosely based on Eagle's dark theme](https://raw.githubusercontent.com/pointhi/kicad-color-schemes/master/eagle/footprint_editor.png)
+**eagle-dark** *Designed by DX-MON, Inspired by EagleCAD*       | ![Loosely based on Eagle's dark theme](https://raw.githubusercontent.com/pointhi/kicad-color-schemes/master/eagle-dark/footprint_editor.png)
diff --git a/eagle-dark/com.github.pointhi.kicad-color-schemes.eagle-dark_v1.0_pcm.zip b/eagle-dark/com.github.pointhi.kicad-color-schemes.eagle-dark_v1.0_pcm.zip
new file mode 100644
index 0000000..dae855f
Binary files /dev/null and b/eagle-dark/com.github.pointhi.kicad-color-schemes.eagle-dark_v1.0_pcm.zip differ
diff --git a/eagle/eagle.json b/eagle-dark/eagle-dark.json
similarity index 60%
rename from eagle/eagle.json
rename to eagle-dark/eagle-dark.json
index 9659f63..dd8ee82 100644
--- a/eagle/eagle.json
+++ b/eagle-dark/eagle-dark.json
@@ -45,6 +45,9 @@
       "in9": "rgb(194, 194, 194)"
     },
     "cursor": "rgb(255, 255, 255)",
+    "drc_error": "rgba(215, 91, 107, 0.800)",
+    "drc_exclusion": "rgba(255, 255, 255, 0.800)",
+    "drc_warning": "rgba(255, 208, 66, 0.800)",
     "dwgs_user": "rgb(192, 192, 192)",
     "eco1_user": "rgb(0, 132, 0)",
     "eco2_user": "rgb(194, 194, 0)",
@@ -59,92 +62,42 @@
     "footprint_text_front": "rgb(194, 194, 194)",
     "footprint_text_invisible": "rgb(132, 132, 132)",
     "grid": "rgb(60, 60, 60)",
+    "grid_axes": "rgb(194, 194, 194)",
+    "margin": "rgb(255, 38, 226)",
     "no_connect": "rgb(0, 0, 132)",
     "pad_back": "rgba(50, 50, 200, 0.700)",
     "pad_front": "rgba(192, 0, 0, 0.700)",
+    "pad_plated_hole": "rgb(194, 194, 0)",
     "pad_through_hole": "rgba(50, 200, 50, 0.700)",
     "plated_hole": "rgb(194, 194, 0)",
     "ratsnest": "rgb(255, 255, 255)",
+    "user_1": "rgb(194, 194, 194)",
+    "user_2": "rgb(89, 148, 220)",
+    "user_3": "rgb(180, 219, 210)",
+    "user_4": "rgb(216, 200, 82)",
+    "user_5": "rgb(194, 194, 194)",
+    "user_6": "rgb(89, 148, 220)",
+    "user_7": "rgb(180, 219, 210)",
+    "user_8": "rgb(216, 200, 82)",
+    "user_9": "rgb(232, 178, 167)",
     "via_blind_buried": "rgb(132, 132, 0)",
+    "via_hole": "rgba(128, 102, 0, 0.800)",
     "via_micro": "rgb(0, 132, 132)",
     "via_through": "rgb(194, 194, 194)",
     "worksheet": "rgb(192, 0, 0)"
   },
-  "fpedit": {
-    "anchor": "rgb(0, 0, 132)",
-    "aux_items": "rgb(255, 255, 255)",
-    "b_adhes": "rgba(64, 64, 192, 0.600)",
-    "b_crtyd": "rgb(132, 132, 132)",
-    "b_fab": "rgb(170, 170, 224)",
-    "b_mask": "rgba(170, 170, 224, 0.700)",
-    "b_paste": "rgba(128, 128, 192, 0.750)",
-    "b_silks": "rgba(170, 170, 224, 0.800)",
-    "background": "rgb(33, 33, 33)",
-    "cmts_user": "rgb(160, 160, 0)",
-    "copper": {
-      "b": "rgba(50, 50, 200, 0.700)",
-      "f": "rgba(192, 0, 0, 0.700)",
-      "in1": "rgb(194, 194, 0)",
-      "in10": "rgb(132, 0, 132)",
-      "in11": "rgb(132, 0, 0)",
-      "in12": "rgb(132, 132, 0)",
-      "in13": "rgb(194, 194, 194)",
-      "in14": "rgb(0, 0, 132)",
-      "in15": "rgb(0, 132, 0)",
-      "in16": "rgb(132, 0, 0)",
-      "in17": "rgb(194, 194, 0)",
-      "in18": "rgb(194, 0, 194)",
-      "in19": "rgb(194, 0, 0)",
-      "in2": "rgb(194, 0, 194)",
-      "in20": "rgb(0, 132, 132)",
-      "in21": "rgb(0, 132, 0)",
-      "in22": "rgb(0, 0, 132)",
-      "in23": "rgb(132, 132, 132)",
-      "in24": "rgb(132, 0, 132)",
-      "in25": "rgb(194, 194, 194)",
-      "in26": "rgb(132, 0, 132)",
-      "in27": "rgb(132, 0, 0)",
-      "in28": "rgb(132, 132, 0)",
-      "in29": "rgb(194, 194, 194)",
-      "in3": "rgb(194, 0, 0)",
-      "in30": "rgb(0, 0, 132)",
-      "in4": "rgb(0, 132, 132)",
-      "in5": "rgb(0, 132, 0)",
-      "in6": "rgb(0, 0, 132)",
-      "in7": "rgb(132, 132, 132)",
-      "in8": "rgb(132, 0, 132)",
-      "in9": "rgb(194, 194, 194)"
-    },
-    "cursor": "rgb(255, 255, 255)",
-    "dwgs_user": "rgb(192, 192, 192)",
-    "eco1_user": "rgb(0, 132, 0)",
-    "eco2_user": "rgb(194, 194, 0)",
-    "edge_cuts": "rgba(160, 160, 160, 0.800)",
-    "f_adhes": "rgba(192, 64, 64, 0.600)",
-    "f_crtyd": "rgb(194, 194, 194)",
-    "f_fab": "rgb(224, 170, 170)",
-    "f_mask": "rgba(224, 170, 170, 0.700)",
-    "f_paste": "rgba(192, 128, 128, 0.750)",
-    "f_silks": "rgba(224, 170, 170, 0.800)",
-    "footprint_text_back": "rgb(0, 0, 132)",
-    "footprint_text_front": "rgb(194, 194, 194)",
-    "footprint_text_invisible": "rgb(132, 132, 132)",
-    "grid": "rgb(60, 60, 60)",
-    "pad_back": "rgba(50, 50, 200, 0.700)",
-    "pad_front": "rgba(224, 0, 0, 0.700)",
-    "pad_through_hole": "rgba(50, 200, 50, 0.700)",
-    "plated_hole": "rgb(194, 194, 0)",
-    "worksheet": "rgb(72, 0, 0)"
-  },
   "meta": {
-    "filename": "eagle",
-    "name": "eagle",
-    "version": 0
+    "filename": "eagle-dark",
+    "name": "Eagle Dark",
+    "version": 1
   },
   "schematic": {
+    "anchor": "rgb(0, 0, 255)",
+    "aux_items": "rgb(0, 0, 0)",
     "background": "rgb(33, 33, 33)",
     "brightened": "rgb(204, 204, 204)",
     "bus": "rgb(0, 96, 192)",
+    "bus_junction": "rgb(0, 96, 192)",
     "component_body": "rgb(44, 44, 44)",
     "component_outline": "rgb(192, 0, 0)",
     "cursor": "rgb(224, 224, 224)",
@@ -152,6 +105,7 @@
     "erc_warning": "rgba(192, 140, 0, 0.800)",
     "fields": "rgb(128, 0, 160)",
     "grid": "rgb(60, 60, 60)",
+    "grid_axes": "rgb(60, 60, 60)",
     "hidden": "rgb(194, 194, 194)",
     "junction": "rgb(0, 160, 0)",
     "label_global": "rgb(0, 160, 224)",
@@ -160,11 +114,15 @@
     "net_name": "rgb(224, 224, 224)",
     "no_connect": "rgb(97, 43, 224)",
     "note": "rgb(192, 192, 0)",
+    "override_item_colors": false,
     "pin": "rgb(192, 0, 0)",
     "pin_name": "rgb(192, 192, 192)",
     "pin_number": "rgb(192, 0, 0)",
     "reference": "rgb(192, 192, 192)",
+    "shadow": "rgba(102, 179, 255, 0.800)",
     "sheet": "rgb(128, 0, 160)",
+    "sheet_background": "rgba(255, 255, 255, 0.000)",
+    "sheet_fields": "rgb(160, 160, 0)",
     "sheet_filename": "rgb(160, 160, 0)",
     "sheet_label": "rgb(160, 160, 0)",
     "sheet_name": "rgb(0, 160, 204)",
@@ -172,4 +130,4 @@
     "wire": "rgb(0, 160, 0)",
     "worksheet": "rgb(192, 0, 0)"
   }
-}
\ No newline at end of file
+}
diff --git a/eagle/eeschema b/eagle-dark/eeschema
similarity index 100%
rename from eagle/eeschema
rename to eagle-dark/eeschema
diff --git a/eagle/eeschema.png b/eagle-dark/eeschema.png
similarity index 100%
rename from eagle/eeschema.png
rename to eagle-dark/eeschema.png
diff --git a/eagle/footprint_editor b/eagle-dark/footprint_editor
similarity index 100%
rename from eagle/footprint_editor
rename to eagle-dark/footprint_editor
diff --git a/eagle/footprint_editor.png b/eagle-dark/footprint_editor.png
similarity index 100%
rename from eagle/footprint_editor.png
rename to eagle-dark/footprint_editor.png
diff --git a/eagle-dark/icon.png b/eagle-dark/icon.png
new file mode 100644
index 0000000..21303c6
Binary files /dev/null and b/eagle-dark/icon.png differ
diff --git a/eagle/metadata.json b/eagle-dark/metadata.json
similarity index 87%
rename from eagle/metadata.json
rename to eagle-dark/metadata.json
index 89bed55..8380e81 100644
--- a/eagle/metadata.json
+++ b/eagle-dark/metadata.json
@@ -1,9 +1,9 @@
 {
     "$schema": "https://go.kicad.org/pcm/schemas/v1",
-    "name": "Eagle inspired Theme",
+    "name": "Eagle Dark Theme",
     "description": "Eagle CAD inspired color theme",
     "description_full": "Eagle CAD inspired color theme",
-    "identifier": "com.github.pointhi.kicad-color-schemes.eagle",
+    "identifier": "com.github.pointhi.kicad-color-schemes.eagle-dark",
     "type": "colortheme",
     "author": {
         "name": "Rachel Mant",
diff --git a/eagle/pcbnew b/eagle-dark/pcbnew
similarity index 100%
rename from eagle/pcbnew
rename to eagle-dark/pcbnew
diff --git a/eagle/pcbnew.png b/eagle-dark/pcbnew.png
similarity index 100%
rename from eagle/pcbnew.png
rename to eagle-dark/pcbnew.png
diff --git a/eagle/pl_editor b/eagle-dark/pl_editor
similarity index 100%
rename from eagle/pl_editor
rename to eagle-dark/pl_editor
diff --git a/eagle/com.github.pointhi.kicad-color-schemes.eagle_v1.0_pcm.zip b/eagle/com.github.pointhi.kicad-color-schemes.eagle_v1.0_pcm.zip
deleted file mode 100644
index bad29eb..0000000
Binary files a/eagle/com.github.pointhi.kicad-color-schemes.eagle_v1.0_pcm.zip and /dev/null differ
diff --git a/eagle/icon.png b/eagle/icon.png
deleted file mode 100644
index e8943d4..0000000
Binary files a/eagle/icon.png and /dev/null differ