diff --git a/Ghidra/Debug/Debugger/data/debugger.theme.properties b/Ghidra/Debug/Debugger/data/debugger.theme.properties
index 63729a015e..1107522053 100644
--- a/Ghidra/Debug/Debugger/data/debugger.theme.properties
+++ b/Ghidra/Debug/Debugger/data/debugger.theme.properties
@@ -1,9 +1,6 @@
 [Defaults]
 
-color.bg.debugger.diff.marker = moccasin
-
-color.bg.debugger.listing.blended = color.bg
-color.bg.debugger.memory.state = color.bg
+color.bg.debugger.diff.marker = color.bg.programdiff.highlight
 
 color.debugger.plugin.plugin.memview.arrow = red
 color.debugger.plugin.memview.box = blue
@@ -22,33 +19,37 @@ color.debugger.plugin.memview.box.type.perfinfo = lightgray
 color.debugger.plugin.memview.box.type.read.memory = darkgray
 color.debugger.plugin.memview.box.type.write.memory = blue
 color.debugger.plugin.memview.box.type.breakpoint = red
- 
 
 color.bg.debugger.plugin.objects.default = color.bg
 color.fg.debugger.plugin.objects.default = color.fg
 color.fg.debugger.plugin.objects.invisible = lightgray
 color.fg.debugger.plugin.objects.invalidated = lightgray
 color.fg.debugger.plugin.objects.modified = red
-color.fg.debugger.plugin.objects.subscribed = black
+color.fg.debugger.plugin.objects.subscribed = color.fg
 color.fg.debugger.plugin.objects.error = color.fg.error
 color.fg.debugger.plugin.objects.intrinsic = blue
 color.fg.debugger.plugin.objects.target = magenta
 color.fg.debugger.plugin.objects.accessor = lightgray
 color.fg.debugger.plugin.objects.link = green
- 
+
 color.bg.debugger.plugin.resources.stale = lightgray
 color.bg.debugger.plugin.resources.error = lightpink
 
-color.debugger.plugin.resources.register.marker = lightcoral
-color.debugger.plugin.resources.register.stale = gray
-color.debugger.plugin.resources.register.stale.selected = lightgray  
-color.debugger.plugin.resources.register.changed = red
-color.debugger.plugin.resources.register.changed.selected = lightcoral
+color.fg.debugger.value.stale = gray
+color.fg.debugger.value.stale.selected = lightgray
+color.fg.debugger.value.changed = red
+color.fg.debugger.value.changed.selected = lightcoral
 
-color.debugger.plugin.resources.watch.stale = gray
-color.debugger.plugin.resources.watch.stale.selected = lightgray
-color.debugger.plugin.resources.watch.changed = red
-color.debugger.plugin.resources.watch.changed.selected = lightcoral
+color.debugger.plugin.resources.register.marker = #c0e0c0
+color.debugger.plugin.resources.register.stale = color.fg.debugger.value.stale
+color.debugger.plugin.resources.register.stale.selected = color.fg.debugger.value.stale.selected
+color.debugger.plugin.resources.register.changed = color.fg.debugger.value.changed
+color.debugger.plugin.resources.register.changed.selected = color.fg.debugger.value.changed.selected
+
+color.debugger.plugin.resources.watch.stale = color.fg.debugger.value.stale
+color.debugger.plugin.resources.watch.stale.selected = color.fg.debugger.value.stale.selected
+color.debugger.plugin.resources.watch.changed = color.fg.debugger.value.changed
+color.debugger.plugin.resources.watch.changed.selected = color.fg.debugger.value.changed.selected
 
 color.debugger.plugin.resources.value.changed = red
 color.debugger.plugin.resources.value.changed.selected = lightcoral
@@ -60,6 +61,7 @@ color.debugger.plugin.resources.breakpoint.marker.disabled = color.debugger.plug
 color.debugger.plugin.resources.breakpoint.marker.enabled.ineffective = silver
 color.debugger.plugin.resources.breakpoint.marker.disabled.ineffective = color.debugger.plugin.resources.breakpoint.marker.enabled.ineffective
 
+
 icon.debugger.object.populated = object-populated.png
 icon.debugger.object.unpopulated = object-unpopulated.png
 
@@ -190,10 +192,66 @@ icon.debugger.select.registers = select-registers.png
 icon.debugger.enable.edits = editbytes.gif
 icon.debugger.disassemble = editbytes.gif // TODO this icon was missing 'disassemble.png'
 
- 
 
 [Dark Defaults]
 
+color.bg.debugger.diff.marker = color.bg.programdiff.highlight
 
+color.debugger.plugin.plugin.memview.arrow = red
+color.debugger.plugin.memview.box = blue
+color.debugger.plugin.memview.box.type.instructions = rgb(128, 000, 000)
+color.debugger.plugin.memview.box.type.process = rgb(200, 200, 255)
+color.debugger.plugin.memview.box.type.thread = rgb(200, 255, 255)
+color.debugger.plugin.memview.box.type.module = lime
+color.debugger.plugin.memview.box.type.region = yellow
+color.debugger.plugin.memview.box.type.image = magenta
+color.debugger.plugin.memview.box.type.virtual.alloc = lightgray
+color.debugger.plugin.memview.box.type.heap.create = blue
+color.debugger.plugin.memview.box.type.heap.alloc = rgb(000, 100, 050)
+color.debugger.plugin.memview.box.type.pool = rgb(100, 000, 150)
+color.debugger.plugin.memview.box.type.stack = cyan
+color.debugger.plugin.memview.box.type.perfinfo = lightgray
+color.debugger.plugin.memview.box.type.read.memory = darkgray
+color.debugger.plugin.memview.box.type.write.memory = blue
+color.debugger.plugin.memview.box.type.breakpoint = red
 
+color.bg.debugger.plugin.objects.default = color.bg
+color.fg.debugger.plugin.objects.default = color.fg
+color.fg.debugger.plugin.objects.invisible = lightgray
+color.fg.debugger.plugin.objects.invalidated = lightgray
+color.fg.debugger.plugin.objects.modified = color.palette.red
+color.fg.debugger.plugin.objects.subscribed = color.fg
+color.fg.debugger.plugin.objects.error = color.fg.error
+color.fg.debugger.plugin.objects.intrinsic = color.palette.blue
+color.fg.debugger.plugin.objects.target = color.palette.magenta
+color.fg.debugger.plugin.objects.accessor = lightgray
+color.fg.debugger.plugin.objects.link = color.palette.green
 
+color.bg.debugger.plugin.resources.stale = color.palette.bg.gray
+color.bg.debugger.plugin.resources.error = color.palette.darkred
+
+color.fg.debugger.value.stale = gray
+color.fg.debugger.value.stale.selected = gray
+color.fg.debugger.value.changed = color.palette.red
+color.fg.debugger.value.changed.selected = color.palette.red
+
+color.debugger.plugin.resources.register.marker = color.palette.bg.cyan
+color.debugger.plugin.resources.register.stale = color.fg.debugger.value.stale
+color.debugger.plugin.resources.register.stale.selected = color.fg.debugger.value.stale.selected
+color.debugger.plugin.resources.register.changed = color.fg.debugger.value.changed
+color.debugger.plugin.resources.register.changed.selected = color.fg.debugger.value.changed.selected
+
+color.debugger.plugin.resources.watch.stale = color.fg.debugger.value.stale
+color.debugger.plugin.resources.watch.stale.selected = color.fg.debugger.value.stale.selected
+color.debugger.plugin.resources.watch.changed = color.fg.debugger.value.changed
+color.debugger.plugin.resources.watch.changed.selected = color.fg.debugger.value.changed.selected
+
+color.debugger.plugin.resources.value.changed = color.fg.debugger.value.changed
+color.debugger.plugin.resources.value.changed.selected = color.fg.debugger.value.changed.selected
+
+color.debugger.plugin.resources.pcode.counter = color.debugger.plugin.resources.register.marker
+
+color.debugger.plugin.resources.breakpoint.marker.enabled = color.palette.bg.blue
+color.debugger.plugin.resources.breakpoint.marker.disabled = color.palette.bg.blue
+color.debugger.plugin.resources.breakpoint.marker.enabled.ineffective = color.palette.bg.gray
+color.debugger.plugin.resources.breakpoint.marker.disabled.ineffective = color.palette.bg.gray
diff --git a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/listing/MemoryStateListingBackgroundColorModel.java b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/listing/MemoryStateListingBackgroundColorModel.java
index dc302c8ce9..e16bdd7d67 100644
--- a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/listing/MemoryStateListingBackgroundColorModel.java
+++ b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/listing/MemoryStateListingBackgroundColorModel.java
@@ -35,7 +35,7 @@ import ghidra.trace.model.program.TraceProgramView;
 import ghidra.util.ColorUtils;
 
 public class MemoryStateListingBackgroundColorModel implements ListingBackgroundColorModel {
-	private Color defaultBackgroundColor = new GColor("color.bg.debugger.memory.state");
+	private Color defaultBackgroundColor = new GColor("color.bg");
 
 	private AddressIndexMap addressIndexMap;
 	private TraceProgramView view;
diff --git a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/listing/MultiBlendedListingBackgroundColorModel.java b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/listing/MultiBlendedListingBackgroundColorModel.java
index 4e4c101a41..934cfa2ba6 100644
--- a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/listing/MultiBlendedListingBackgroundColorModel.java
+++ b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/listing/MultiBlendedListingBackgroundColorModel.java
@@ -27,7 +27,7 @@ import ghidra.app.util.viewer.listingpanel.ListingPanel;
 import ghidra.util.ColorUtils.ColorBlender;
 
 public class MultiBlendedListingBackgroundColorModel implements ListingBackgroundColorModel {
-	private static final Color BG_COLOR_EMPTY = new GColor("color.bg.debugger.listing.blended");
+	private static final Color BG_COLOR_EMPTY = new GColor("color.bg");
 
 	private final List<BackgroundColorModel> models = new ArrayList<>();
 
diff --git a/Ghidra/Framework/Docking/data/docking.palette.theme.properties b/Ghidra/Framework/Docking/data/docking.palette.theme.properties
index 06fa3048d3..27a02195f5 100644
--- a/Ghidra/Framework/Docking/data/docking.palette.theme.properties
+++ b/Ghidra/Framework/Docking/data/docking.palette.theme.properties
@@ -77,7 +77,10 @@ color.palette.violetred = #ff7090
 color.palette.bg.yellow = #404028
 color.palette.bg.yellowgreen = #344028
 color.palette.bg.green = #284028
-color.palette.bg.bluegrey = #282838
+color.palette.bg.cyan = #284040
+color.palette.bg.blue = #282860
+color.palette.bg.bluegray = #282838
+color.palette.bg.gray = #383838
 
 color.palette.bg.blindingyellow = #ffff00
 color.palette.bg.blindinggreen = #00ff00