From 967975252341bdfa4fb49e3ef27c3572e408ce7e Mon Sep 17 00:00:00 2001
From: Dan <46821332+nsadeveloper789@users.noreply.github.com>
Date: Wed, 2 Nov 2022 13:32:32 -0400
Subject: [PATCH] GP-1981 Listing and Decompiler dark colors; palette updates

---
 .../Base/data/base.listing.theme.properties   | 49 +++++++++++++++++++
 .../Features/Base/data/base.theme.properties  |  7 ++-
 .../data/decompiler.theme.properties          | 20 ++++----
 .../data/docking.palette.theme.properties     | 29 +++++++++--
 .../Docking/data/docking.theme.properties     | 15 +++---
 5 files changed, 97 insertions(+), 23 deletions(-)

diff --git a/Ghidra/Features/Base/data/base.listing.theme.properties b/Ghidra/Features/Base/data/base.listing.theme.properties
index a5f34d42e5..aa2a699135 100644
--- a/Ghidra/Features/Base/data/base.listing.theme.properties
+++ b/Ghidra/Features/Base/data/base.listing.theme.properties
@@ -95,3 +95,52 @@ color.bg.listing.header.active.field = rgb(244, 221, 183)
 color.fg.listing.header.active.field = black
 
 
+
+color.fg.listing.address = color.fg
+color.fg.listing.ref.bad = color.palette.red
+color.fg.listing.bytes = color.palette.blue
+color.fg.listing.constant = color.palette.green
+color.fg.listing.label.unreferenced = color.fg
+color.fg.listing.entrypoint = color.palette.magenta
+color.fg.listing.comment.auto = color.fg
+color.fg.listing.comment.eol = color.palette.blue
+color.fg.listing.comment.repeatable = color.palette.orange
+color.fg.listing.comment.ref.repeatable = color.palette.darkcyan
+color.fg.listing.comment.plate = gray
+color.fg.listing.comment.post = color.palette.blue
+color.fg.listing.comment.pre = color.palette.indigo
+color.fg.listing.ref.ext.resolved = color.palette.teal
+color.fg.listing.fieldname = color.fg
+color.fg.listing.function.callfixup = color.palette.magenta
+color.fg.listing.function.name = color.palette.blue
+color.fg.listing.function.param = color.fg
+color.fg.listing.function.tag = color.palette.violetred
+color.fg.listing.function.param.auto = gray
+color.fg.listing.function.return.type = color.fg
+color.fg.listing.function.param.custom = color.palette.indigo
+color.fg.listing.function.param.dynamic = color.palette.teal
+color.fg.listing.label.local = color.palette.green
+color.fg.listing.label.non.primary = color.palette.olive
+color.fg.listing.label.primary = color.palette.cyan
+color.fg.listing.mnemonic.override = color.palette.pink
+color.fg.listing.mnemonic = color.palette.cyan
+color.fg.listing.mnemonic.unimplemented = color.palette.cyan
+
+
+color.fg.listing.flow.arrow.inactive = lightGray
+color.fg.listing.flow.arrow.active = color.fg
+color.fg.listing.flow.arrow.selected = limeGreen
+color.fg.listing.separator = color.fg
+color.fg.listing.variable = color.palette.purple
+color.fg.listing.version.tracking = color.palette.purple
+color.fg.listing.xref = color.palette.darkgreen
+color.fg.listing.xref.offcut = gray
+color.fg.listing.xref.read = color.palette.blue
+color.fg.listing.xref.write = color.palette.orange
+color.fg.listing.xref.other = color.fg
+color.fg.listing.register = color.palette.olive
+color.fg.listing.underline = cornflowerBlue 
+color.fg.listing.pcode.label = color.palette.blue
+color.fg.listing.pcode.space = color.palette.blue
+color.fg.listing.pcode.varnode = color.palette.blue
+color.fg.listing.pcode.userop = color.palette.blue
diff --git a/Ghidra/Features/Base/data/base.theme.properties b/Ghidra/Features/Base/data/base.theme.properties
index ea463db94d..8f02f867d8 100644
--- a/Ghidra/Features/Base/data/base.theme.properties
+++ b/Ghidra/Features/Base/data/base.theme.properties
@@ -196,8 +196,11 @@ color.fg.table.ghidratable.suggestion = darkGray
 color.bg.search.highlight = rgb(189,183,107)
 color.bg.search.current.line.highlight = gold
 
-color.fg.listing.highlighter.scoped.read = rgb(100,100, 0)
-color.fg.listing.highlighter.scoped.write = forestGreen
+// TODO: These should probably be "bg" colors
+// TODO: I'd be nice if we did have control of the "fg" colors, too
+color.fg.listing.highlighter.default = color.palette.bg.blindingyellow
+color.fg.listing.highlighter.scoped.read = color.palette.bg.blindingorange
+color.fg.listing.highlighter.scoped.write = color.palette.bg.blindinggreen
 
 color.bg.analysis.options.not.default.enablement = #D1D19E
 color.bg.analysis.options.not.default.enablement.selected = rgb(177, 212, 236)
diff --git a/Ghidra/Features/Decompiler/data/decompiler.theme.properties b/Ghidra/Features/Decompiler/data/decompiler.theme.properties
index a3d6f1f17c..d25ca6ec0b 100644
--- a/Ghidra/Features/Decompiler/data/decompiler.theme.properties
+++ b/Ghidra/Features/Decompiler/data/decompiler.theme.properties
@@ -40,17 +40,19 @@ icon.decompiler.action.provider.clone = icon.provider.clone
 icon.decompiler.action.export = page_edit.png
 
 font.decompiler = font.monospaced
+
 [Dark Defaults]
 
-color.fg.decompiler.keyword = peru
-color.fg.decompiler.function.name = cadetBlue
-color.fg.decompiler.comment = lightSlateGray
-color.fg.decompiler.error = crimson
-color.fg.decompiler.variable = #999900  // close to oliveDrab
-color.fg.decompiler.constant = forestGreen
-color.fg.decompiler.type = blue
-color.fg.decompiler.parameter = darkMagenta
-color.fg.decompiler.global = darkCyan
+color.fg.decompiler.keyword = color.palette.cyan
+color.fg.decompiler.function.name = color.palette.blue
+color.fg.decompiler.comment = color.palette.indigo
+color.fg.decompiler.error = color.palette.red
+color.fg.decompiler.variable = color.palette.olive
+color.fg.decompiler.constant = color.palette.green
+color.fg.decompiler.type = color.palette.cyan
+color.fg.decompiler.parameter = color.palette.violetred
+color.fg.decompiler.global = color.palette.teal
+color.fg.decompiler.special = color.palette.red
 
 
 color.bg.decompiler.middle.mouse = rgb(55,59,65)
diff --git a/Ghidra/Framework/Docking/data/docking.palette.theme.properties b/Ghidra/Framework/Docking/data/docking.palette.theme.properties
index f645b4f5c7..06fa3048d3 100644
--- a/Ghidra/Framework/Docking/data/docking.palette.theme.properties
+++ b/Ghidra/Framework/Docking/data/docking.palette.theme.properties
@@ -57,7 +57,28 @@ color.palette.white = white
 [Dark Defaults]
 
 color.palette.black = lightgray
-color.palette.blue = deepskyblue
-color.palette.cyan = #00CCCC // less harsh
-color.palette.yellow = rgb(191, 191, 64) // olive
-color.palette.magenta = plum
+
+color.palette.blue = #80a0c0
+color.palette.indigo = #c070c0
+color.palette.green = #70c070
+color.palette.darkgreen = #70a070
+color.palette.magenta = #ff80ff
+color.palette.pink = #ff80a0
+color.palette.cyan = #80c0c0
+color.palette.darkcyan = #406060
+color.palette.red = #ff8080
+color.palette.teal = #80c0c0
+color.palette.purple = #c080c0
+color.palette.yellow = #ffff80
+color.palette.olive = #c0c080
+color.palette.orange = #ffa070
+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.blindingyellow = #ffff00
+color.palette.bg.blindinggreen = #00ff00
+color.palette.bg.blindingorange = #ff8000
diff --git a/Ghidra/Framework/Docking/data/docking.theme.properties b/Ghidra/Framework/Docking/data/docking.theme.properties
index 43e61430b3..4d6b89c958 100644
--- a/Ghidra/Framework/Docking/data/docking.theme.properties
+++ b/Ghidra/Framework/Docking/data/docking.theme.properties
@@ -186,7 +186,7 @@ font.input.hint = monospaced-PLAIN-10
 
 [Dark Defaults]
 
-color.bg = #46494B // color used by flatlaf dark theme
+color.bg = #1c1d1e
 color.fg = lightgray
 color.fg.error = indianRed
 color.fg.disabled = gray
@@ -204,8 +204,8 @@ color.fg.help.selector.code.path = #5BA5E3
 
 color.bg.splashscreen = black
 
-color.bg.header.active = #788CBD 
-color.bg.header.inactive = dimGray
+color.bg.header.active = #4c87c8
+color.bg.header.inactive = #466a92
 color.fg.header.active = lightGray
 color.fg.header.inactive = black
 color.header.drag.cursor = lightGray
@@ -215,7 +215,7 @@ color.fg.dialog.status.error = color.fg.error
 color.fg.dialog.status.warning = orange
 color.fg.dialog.status.normal = lightBlue
 
-color.bg.currentline = rgb(60,60,70) // dark gray
+color.bg.currentline = rgb(40,40,56) // dark bluish gray
 
 color.cursor.focused = indianRed
 color.cursor.unfocussed = darkGray
@@ -225,10 +225,10 @@ color.bg.textfield.hint.invalid = maroon
 color.bg.filterfield = color.bg.filtered 
 color.fg.filterfield = darkSlateGray 
 
-color.bg.selection = teal
-color.bg.highlight = olive
+color.bg.selection = color.palette.bg.green
+color.bg.highlight = color.palette.bg.yellow
 
-color.bg.fieldpanel.selection.and.highlight = darkGreen
+color.bg.fieldpanel.selection.and.highlight = color.palette.bg.yellowgreen
 
 color.bg.table.row.alt = rgb(45,47,65)
 color.fg.table.uneditable.selected = lemonchiffon
@@ -241,4 +241,3 @@ color.bg.tableheader.gradient.end.primary = darkBlue
 						
 // docking buttons
 color.fg.button = darkGray
-