diff --git a/build/shared/lib/themes/antimony.txt b/build/shared/lib/themes/antimony.txt
index f67b766ae..46f832261 100644
--- a/build/shared/lib/themes/antimony.txt
+++ b/build/shared/lib/themes/antimony.txt
@@ -52,13 +52,13 @@ toolbar.button.debug.selected.stroke = none
 
 ## EditorStatus - status message bar directly below the editor ##
 
-status.notice.fgcolor = #000E19
+status.notice.fgcolor = #B4E0EB
 status.notice.bgcolor = #305C6A
-status.error.fgcolor = #000000
+status.error.fgcolor = #004ECF
 status.error.bgcolor = #FFFFF2
 status.warning.bgcolor = #727774
-status.warning.fgcolor = #FFFFF2
-status.url.fgcolor = #cccccc
+status.warning.fgcolor = #002649
+status.url.fgcolor = #000000
 status.font = processing.sans,plain,13
 # For the clipboard icon, needs to be a little larger on macOS
 status.emoji.font = Dialog,plain,22
@@ -100,7 +100,7 @@ footer.updates.indicator.text.color = #E1FFFF
 console.color = #040C0E
 console.output.color = #757A76
 # text color for errors printed in the console
-console.error.color = #C1C7C0
+console.error.color = #00E2FF
 
 
 ## PdeTextAreaDefaults - default colors for the editor ##
@@ -127,7 +127,7 @@ editor.eolmarkers.color = #999999
 
 # bracket/brace highlighting
 editor.brackethighlight = true
-editor.brackethighlight.color = #006699
+editor.brackethighlight.color = #CD94E9
 
 # colors for the custom scroll bar
 editor.scrollbar.thumb.enabled.color = #2F4F59
@@ -153,8 +153,8 @@ editor.warning.underline.color = #727774
 ## MarkerColumn - shows ticks adjacent the scroll bar ##
 
 # lines next to the scrollbar showing where errors are located
-editor.column.error.color = #ff5355
-editor.column.warning.color = #fed456
+editor.column.error.color = #FFFFF2
+editor.column.warning.color = #727774
 
 
 ## ErrorTable - the list of errors in the second tab found in the console area ##
@@ -175,11 +175,11 @@ errors.indicator.warning.color = #ef8115
 
 ## ManagerTabs - tabs in the Contribution Manager ##
 
-manager.tab.selected.color = #000C17
-manager.tab.unselected.color = #00141C
+manager.tab.selected.color = #FFFFF2
+manager.tab.unselected.color = #727774
 manager.tab.text.font = processing.sans,bold,14
-manager.tab.text.selected.color = #909089
-manager.tab.text.unselected.color = #47595E
+manager.tab.text.selected.color = #000000
+manager.tab.text.unselected.color = #000C17
 manager.tab.gradient.top = #001F29
 manager.tab.gradient.bottom = #001F29
 
@@ -200,26 +200,26 @@ tree.font = processing.sans,plain,12
 # For an explanation of these tags, see Token.java:
 # processing/app/src/processing/app/syntax/Token.java
 
-editor.token.function1.style = #006699,plain
-editor.token.function2.style = #006699,plain
-editor.token.function3.style = #669900,plain
-editor.token.function4.style = #006699,bold
+editor.token.function1.style = #CD94E9,plain
+editor.token.function2.style = #CD94E9,plain
+editor.token.function3.style = #00B07D,plain
+editor.token.function4.style = #CD94E9,bold
 
-editor.token.keyword1.style = #33997e,plain
-editor.token.keyword2.style = #33997e,plain
-editor.token.keyword3.style = #669900,plain
-editor.token.keyword4.style = #d94a7a,plain
-editor.token.keyword5.style = #e2661a,plain
-editor.token.keyword6.style = #33997e,plain
+editor.token.keyword1.style = #B714BB,plain
+editor.token.keyword2.style = #B714BB,plain
+editor.token.keyword3.style = #00B07D,plain
+editor.token.keyword4.style = #D13A78,plain
+editor.token.keyword5.style = #FF4000,plain
+editor.token.keyword6.style = #B714BB,plain
 
-editor.token.literal1.style = #7D4793,plain
-editor.token.literal2.style = #718a62,plain
+editor.token.literal1.style = #008DAD,plain
+editor.token.literal2.style = #0071F0,plain
 
-editor.token.operator.style = #006699,plain
+editor.token.operator.style = #CD94E9,plain
 
-editor.token.label.style = #666666,bold
+editor.token.label.style = #5E5E59,bold
 
-editor.token.comment1.style = #666666,plain
-editor.token.comment2.style = #666666,plain
+editor.token.comment1.style = #5E5E59,plain
+editor.token.comment2.style = #5E5E59,plain
 
-editor.token.invalid.style = #666666,bold
+editor.token.invalid.style = #5E5E59,bold
diff --git a/build/shared/lib/themes/bauxite.txt b/build/shared/lib/themes/bauxite.txt
index 063f75486..66cfce834 100644
--- a/build/shared/lib/themes/bauxite.txt
+++ b/build/shared/lib/themes/bauxite.txt
@@ -52,13 +52,13 @@ toolbar.button.debug.selected.stroke = none
 
 ## EditorStatus - status message bar directly below the editor ##
 
-status.notice.fgcolor = #11151D
+status.notice.fgcolor = #D9DFE6
 status.notice.bgcolor = #6E747E
-status.error.fgcolor = #000000
+status.error.fgcolor = #800000
 status.error.bgcolor = #FFFFF2
 status.warning.bgcolor = #F8951D
-status.warning.fgcolor = #FFFFF2
-status.url.fgcolor = #cccccc
+status.warning.fgcolor = #5D0000
+status.url.fgcolor = #000000
 status.font = processing.sans,plain,13
 # For the clipboard icon, needs to be a little larger on macOS
 status.emoji.font = Dialog,plain,22
@@ -100,7 +100,7 @@ footer.updates.indicator.text.color = #FAFEFF
 console.color = #18191A
 console.output.color = #7F817E
 # text color for errors printed in the console
-console.error.color = #FFAD3C
+console.error.color = #FF8400
 
 
 ## PdeTextAreaDefaults - default colors for the editor ##
@@ -127,7 +127,7 @@ editor.eolmarkers.color = #999999
 
 # bracket/brace highlighting
 editor.brackethighlight = true
-editor.brackethighlight.color = #006699
+editor.brackethighlight.color = #EA90A5
 
 # colors for the custom scroll bar
 editor.scrollbar.thumb.enabled.color = #686C73
@@ -153,8 +153,8 @@ editor.warning.underline.color = #F8951D
 ## MarkerColumn - shows ticks adjacent the scroll bar ##
 
 # lines next to the scrollbar showing where errors are located
-editor.column.error.color = #ff5355
-editor.column.warning.color = #fed456
+editor.column.error.color = #FFFFF2
+editor.column.warning.color = #F8951D
 
 
 ## ErrorTable - the list of errors in the second tab found in the console area ##
@@ -175,11 +175,11 @@ errors.indicator.warning.color = #ef8115
 
 ## ManagerTabs - tabs in the Contribution Manager ##
 
-manager.tab.selected.color = #0D1018
-manager.tab.unselected.color = #22252C
+manager.tab.selected.color = #FFFFF2
+manager.tab.unselected.color = #F8951D
 manager.tab.text.font = processing.sans,bold,14
-manager.tab.text.selected.color = #FFA11D
-manager.tab.text.unselected.color = #717477
+manager.tab.text.selected.color = #000000
+manager.tab.text.unselected.color = #0D1018
 manager.tab.gradient.top = #3E4249
 manager.tab.gradient.bottom = #3E4249
 
@@ -200,26 +200,26 @@ tree.font = processing.sans,plain,12
 # For an explanation of these tags, see Token.java:
 # processing/app/src/processing/app/syntax/Token.java
 
-editor.token.function1.style = #006699,plain
-editor.token.function2.style = #006699,plain
-editor.token.function3.style = #669900,plain
-editor.token.function4.style = #006699,bold
+editor.token.function1.style = #EA90A5,plain
+editor.token.function2.style = #EA90A5,plain
+editor.token.function3.style = #00B5F6,plain
+editor.token.function4.style = #EA90A5,bold
 
-editor.token.keyword1.style = #33997e,plain
-editor.token.keyword2.style = #33997e,plain
-editor.token.keyword3.style = #669900,plain
-editor.token.keyword4.style = #d94a7a,plain
-editor.token.keyword5.style = #e2661a,plain
-editor.token.keyword6.style = #33997e,plain
+editor.token.keyword1.style = #D50059,plain
+editor.token.keyword2.style = #D50059,plain
+editor.token.keyword3.style = #00B5F6,plain
+editor.token.keyword4.style = #DE3500,plain
+editor.token.keyword5.style = #F89300,plain
+editor.token.keyword6.style = #D50059,plain
 
-editor.token.literal1.style = #7D4793,plain
-editor.token.literal2.style = #718a62,plain
+editor.token.literal1.style = #0083CB,plain
+editor.token.literal2.style = #1A2CEF,plain
 
-editor.token.operator.style = #006699,plain
+editor.token.operator.style = #EA90A5,plain
 
-editor.token.label.style = #666666,bold
+editor.token.label.style = #5E5E59,bold
 
-editor.token.comment1.style = #666666,plain
-editor.token.comment2.style = #666666,plain
+editor.token.comment1.style = #5E5E59,plain
+editor.token.comment2.style = #5E5E59,plain
 
-editor.token.invalid.style = #666666,bold
+editor.token.invalid.style = #5E5E59,bold
diff --git a/build/shared/lib/themes/beryl.txt b/build/shared/lib/themes/beryl.txt
index f9328649a..d965b6804 100644
--- a/build/shared/lib/themes/beryl.txt
+++ b/build/shared/lib/themes/beryl.txt
@@ -52,13 +52,13 @@ toolbar.button.debug.selected.stroke = none
 
 ## EditorStatus - status message bar directly below the editor ##
 
-status.notice.fgcolor = #19FBCA
+status.notice.fgcolor = #00FBC2
 status.notice.bgcolor = #00724B
-status.error.fgcolor = #FFFFF2
+status.error.fgcolor = #00F9FF
 status.error.bgcolor = #000000
 status.warning.bgcolor = #004A59
-status.warning.fgcolor = #FFFFF2
-status.url.fgcolor = #cccccc
+status.warning.fgcolor = #00EEFF
+status.url.fgcolor = #FFFFF2
 status.font = processing.sans,plain,13
 # For the clipboard icon, needs to be a little larger on macOS
 status.emoji.font = Dialog,plain,22
@@ -100,7 +100,7 @@ footer.updates.indicator.text.color = #001E00
 console.color = #1F312A
 console.output.color = #7D9285
 # text color for errors printed in the console
-console.error.color = #8AD0DE
+console.error.color = #00EAFF
 
 
 ## PdeTextAreaDefaults - default colors for the editor ##
@@ -127,7 +127,7 @@ editor.eolmarkers.color = #999999
 
 # bracket/brace highlighting
 editor.brackethighlight = true
-editor.brackethighlight.color = #006699
+editor.brackethighlight.color = #006696
 
 # colors for the custom scroll bar
 editor.scrollbar.thumb.enabled.color = #007755
@@ -153,8 +153,8 @@ editor.warning.underline.color = #004A59
 ## MarkerColumn - shows ticks adjacent the scroll bar ##
 
 # lines next to the scrollbar showing where errors are located
-editor.column.error.color = #ff5355
-editor.column.warning.color = #fed456
+editor.column.error.color = #000000
+editor.column.warning.color = #004A59
 
 
 ## ErrorTable - the list of errors in the second tab found in the console area ##
@@ -175,11 +175,11 @@ errors.indicator.warning.color = #ef8115
 
 ## ManagerTabs - tabs in the Contribution Manager ##
 
-manager.tab.selected.color = #71F5CD
-manager.tab.unselected.color = #44CDA8
+manager.tab.selected.color = #000000
+manager.tab.unselected.color = #004A59
 manager.tab.text.font = processing.sans,bold,14
-manager.tab.text.selected.color = #133941
-manager.tab.text.unselected.color = #006951
+manager.tab.text.selected.color = #FFFFF2
+manager.tab.text.unselected.color = #71F5CD
 manager.tab.gradient.top = #009D76
 manager.tab.gradient.bottom = #009D76
 
@@ -200,26 +200,26 @@ tree.font = processing.sans,plain,12
 # For an explanation of these tags, see Token.java:
 # processing/app/src/processing/app/syntax/Token.java
 
-editor.token.function1.style = #006699,plain
-editor.token.function2.style = #006699,plain
-editor.token.function3.style = #669900,plain
-editor.token.function4.style = #006699,bold
+editor.token.function1.style = #006696,plain
+editor.token.function2.style = #006696,plain
+editor.token.function3.style = #6D9800,plain
+editor.token.function4.style = #006696,bold
 
-editor.token.keyword1.style = #33997e,plain
-editor.token.keyword2.style = #33997e,plain
-editor.token.keyword3.style = #669900,plain
-editor.token.keyword4.style = #d94a7a,plain
-editor.token.keyword5.style = #e2661a,plain
-editor.token.keyword6.style = #33997e,plain
+editor.token.keyword1.style = #309879,plain
+editor.token.keyword2.style = #309879,plain
+editor.token.keyword3.style = #6D9800,plain
+editor.token.keyword4.style = #DB4D6E,plain
+editor.token.keyword5.style = #E76700,plain
+editor.token.keyword6.style = #309879,plain
 
-editor.token.literal1.style = #7D4793,plain
-editor.token.literal2.style = #718a62,plain
+editor.token.literal1.style = #738A5B,plain
+editor.token.literal2.style = #75488D,plain
 
-editor.token.operator.style = #006699,plain
+editor.token.operator.style = #006696,plain
 
-editor.token.label.style = #666666,bold
+editor.token.label.style = #656560,bold
 
-editor.token.comment1.style = #666666,plain
-editor.token.comment2.style = #666666,plain
+editor.token.comment1.style = #656560,plain
+editor.token.comment2.style = #656560,plain
 
-editor.token.invalid.style = #666666,bold
+editor.token.invalid.style = #656560,bold
diff --git a/build/shared/lib/themes/calcite.txt b/build/shared/lib/themes/calcite.txt
index 3a339008c..a1e1a2ad7 100644
--- a/build/shared/lib/themes/calcite.txt
+++ b/build/shared/lib/themes/calcite.txt
@@ -21,15 +21,15 @@ toolbar.button.disabled.field = #000009
 toolbar.button.disabled.glyph = #E4E8E4
 toolbar.button.disabled.stroke = none
 toolbar.button.enabled.field = #FFFFF2
-toolbar.button.enabled.glyph = #3F94DF
+toolbar.button.enabled.glyph = #0096F5
 toolbar.button.enabled.stroke = none
-toolbar.button.pressed.field = #3F94DF
+toolbar.button.pressed.field = #0096F5
 toolbar.button.pressed.glyph = #FFFFF2
 toolbar.button.pressed.stroke = #FFFFF2
 toolbar.button.rollover.field = #FFFFF2
-toolbar.button.rollover.glyph = #003EB0
+toolbar.button.rollover.glyph = #002743
 toolbar.button.rollover.stroke = none
-toolbar.button.selected.field = #001A42
+toolbar.button.selected.field = #00163D
 toolbar.button.selected.glyph = #FFFFF2
 toolbar.button.selected.stroke = none
 
@@ -52,13 +52,13 @@ toolbar.button.debug.selected.stroke = none
 
 ## EditorStatus - status message bar directly below the editor ##
 
-status.notice.fgcolor = #ECF0ED
+status.notice.fgcolor = #191D22
 status.notice.bgcolor = #878B8D
-status.error.fgcolor = #FFFFF2
+status.error.fgcolor = #00D2FF
 status.error.bgcolor = #000000
-status.warning.bgcolor = #0055B6
-status.warning.fgcolor = #FFFFF2
-status.url.fgcolor = #cccccc
+status.warning.bgcolor = #003B62
+status.warning.fgcolor = #7BD6FF
+status.url.fgcolor = #FFFFF2
 status.font = processing.sans,plain,13
 # For the clipboard icon, needs to be a little larger on macOS
 status.emoji.font = Dialog,plain,22
@@ -68,7 +68,7 @@ status.emoji.font.macosx = Dialog,plain,22
 ## EditorHeader - the tab area above the editor ##
 
 header.text.font = processing.sans,bold,14
-header.text.selected.color = #004393
+header.text.selected.color = #112F4B
 header.text.unselected.color = #888B89
 header.tab.arrow.color = #888B89
 header.tab.selected.color = #EDF0EB
@@ -100,7 +100,7 @@ footer.updates.indicator.text.color = #000009
 console.color = #434442
 console.output.color = #9A9B95
 # text color for errors printed in the console
-console.error.color = #32CDFF
+console.error.color = #00C5FF
 
 
 ## PdeTextAreaDefaults - default colors for the editor ##
@@ -127,7 +127,7 @@ editor.eolmarkers.color = #999999
 
 # bracket/brace highlighting
 editor.brackethighlight = true
-editor.brackethighlight.color = #006699
+editor.brackethighlight.color = #006696
 
 # colors for the custom scroll bar
 editor.scrollbar.thumb.enabled.color = #929695
@@ -147,14 +147,14 @@ editor.gutter.linehighlight.color = #929695
 # squiggly line underneath errors in the editor
 editor.error.underline.color = #000000
 # squiggly line underneath warnings
-editor.warning.underline.color = #0055B6
+editor.warning.underline.color = #003B62
 
 
 ## MarkerColumn - shows ticks adjacent the scroll bar ##
 
 # lines next to the scrollbar showing where errors are located
-editor.column.error.color = #ff5355
-editor.column.warning.color = #fed456
+editor.column.error.color = #000000
+editor.column.warning.color = #003B62
 
 
 ## ErrorTable - the list of errors in the second tab found in the console area ##
@@ -175,11 +175,11 @@ errors.indicator.warning.color = #ef8115
 
 ## ManagerTabs - tabs in the Contribution Manager ##
 
-manager.tab.selected.color = #EDF0EB
-manager.tab.unselected.color = #DFE2DD
+manager.tab.selected.color = #000000
+manager.tab.unselected.color = #003B62
 manager.tab.text.font = processing.sans,bold,14
-manager.tab.text.selected.color = #004393
-manager.tab.text.unselected.color = #888B89
+manager.tab.text.selected.color = #FFFFF2
+manager.tab.text.unselected.color = #EDF0EB
 manager.tab.gradient.top = #CBCECC
 manager.tab.gradient.bottom = #CBCECC
 
@@ -200,26 +200,26 @@ tree.font = processing.sans,plain,12
 # For an explanation of these tags, see Token.java:
 # processing/app/src/processing/app/syntax/Token.java
 
-editor.token.function1.style = #006699,plain
-editor.token.function2.style = #006699,plain
-editor.token.function3.style = #669900,plain
-editor.token.function4.style = #006699,bold
+editor.token.function1.style = #006696,plain
+editor.token.function2.style = #006696,plain
+editor.token.function3.style = #6D9800,plain
+editor.token.function4.style = #006696,bold
 
-editor.token.keyword1.style = #33997e,plain
-editor.token.keyword2.style = #33997e,plain
-editor.token.keyword3.style = #669900,plain
-editor.token.keyword4.style = #d94a7a,plain
-editor.token.keyword5.style = #e2661a,plain
-editor.token.keyword6.style = #33997e,plain
+editor.token.keyword1.style = #309879,plain
+editor.token.keyword2.style = #309879,plain
+editor.token.keyword3.style = #6D9800,plain
+editor.token.keyword4.style = #DB4D6E,plain
+editor.token.keyword5.style = #E76700,plain
+editor.token.keyword6.style = #309879,plain
 
-editor.token.literal1.style = #7D4793,plain
-editor.token.literal2.style = #718a62,plain
+editor.token.literal1.style = #738A5B,plain
+editor.token.literal2.style = #75488D,plain
 
-editor.token.operator.style = #006699,plain
+editor.token.operator.style = #006696,plain
 
-editor.token.label.style = #666666,bold
+editor.token.label.style = #656560,bold
 
-editor.token.comment1.style = #666666,plain
-editor.token.comment2.style = #666666,plain
+editor.token.comment1.style = #656560,plain
+editor.token.comment2.style = #656560,plain
 
-editor.token.invalid.style = #666666,bold
+editor.token.invalid.style = #656560,bold
diff --git a/build/shared/lib/themes/feldspar.txt b/build/shared/lib/themes/feldspar.txt
index b7032b7a8..13cbd1c82 100644
--- a/build/shared/lib/themes/feldspar.txt
+++ b/build/shared/lib/themes/feldspar.txt
@@ -21,15 +21,15 @@ toolbar.button.disabled.field = #270000
 toolbar.button.disabled.glyph = #FFDCA5
 toolbar.button.disabled.stroke = none
 toolbar.button.enabled.field = #FFFFF2
-toolbar.button.enabled.glyph = #D47900
+toolbar.button.enabled.glyph = #E27100
 toolbar.button.enabled.stroke = none
-toolbar.button.pressed.field = #D47900
+toolbar.button.pressed.field = #E27100
 toolbar.button.pressed.glyph = #FFFFF2
 toolbar.button.pressed.stroke = #FFFFF2
 toolbar.button.rollover.field = #FFFFF2
-toolbar.button.rollover.glyph = #6C0000
+toolbar.button.rollover.glyph = #411300
 toolbar.button.rollover.stroke = none
-toolbar.button.selected.field = #320300
+toolbar.button.selected.field = #310000
 toolbar.button.selected.glyph = #FFFFF2
 toolbar.button.selected.stroke = none
 
@@ -52,13 +52,13 @@ toolbar.button.debug.selected.stroke = none
 
 ## EditorStatus - status message bar directly below the editor ##
 
-status.notice.fgcolor = #FFD9A3
+status.notice.fgcolor = #FFD190
 status.notice.bgcolor = #976026
-status.error.fgcolor = #FFFFF2
+status.error.fgcolor = #FF9300
 status.error.bgcolor = #000000
-status.warning.bgcolor = #800D00
-status.warning.fgcolor = #FFFFF2
-status.url.fgcolor = #cccccc
+status.warning.bgcolor = #5A1C00
+status.warning.fgcolor = #FFB300
+status.url.fgcolor = #FFFFF2
 status.font = processing.sans,plain,13
 # For the clipboard icon, needs to be a little larger on macOS
 status.emoji.font = Dialog,plain,22
@@ -68,7 +68,7 @@ status.emoji.font.macosx = Dialog,plain,22
 ## EditorHeader - the tab area above the editor ##
 
 header.text.font = processing.sans,bold,14
-header.text.selected.color = #710000
+header.text.selected.color = #530F00
 header.text.unselected.color = #83674B
 header.tab.arrow.color = #83674B
 header.tab.selected.color = #FFDCB2
@@ -100,7 +100,7 @@ footer.updates.indicator.text.color = #270000
 console.color = #3B352E
 console.output.color = #989186
 # text color for errors printed in the console
-console.error.color = #FFA100
+console.error.color = #FF8500
 
 
 ## PdeTextAreaDefaults - default colors for the editor ##
@@ -127,7 +127,7 @@ editor.eolmarkers.color = #999999
 
 # bracket/brace highlighting
 editor.brackethighlight = true
-editor.brackethighlight.color = #006699
+editor.brackethighlight.color = #006696
 
 # colors for the custom scroll bar
 editor.scrollbar.thumb.enabled.color = #9C6C3E
@@ -147,14 +147,14 @@ editor.gutter.linehighlight.color = #9C6C3E
 # squiggly line underneath errors in the editor
 editor.error.underline.color = #000000
 # squiggly line underneath warnings
-editor.warning.underline.color = #800D00
+editor.warning.underline.color = #5A1C00
 
 
 ## MarkerColumn - shows ticks adjacent the scroll bar ##
 
 # lines next to the scrollbar showing where errors are located
-editor.column.error.color = #ff5355
-editor.column.warning.color = #fed456
+editor.column.error.color = #000000
+editor.column.warning.color = #5A1C00
 
 
 ## ErrorTable - the list of errors in the second tab found in the console area ##
@@ -175,11 +175,11 @@ errors.indicator.warning.color = #ef8115
 
 ## ManagerTabs - tabs in the Contribution Manager ##
 
-manager.tab.selected.color = #FFDCB2
-manager.tab.unselected.color = #EAC098
+manager.tab.selected.color = #000000
+manager.tab.unselected.color = #5A1C00
 manager.tab.text.font = processing.sans,bold,14
-manager.tab.text.selected.color = #710000
-manager.tab.text.unselected.color = #83674B
+manager.tab.text.selected.color = #FFFFF2
+manager.tab.text.unselected.color = #FFDCB2
 manager.tab.gradient.top = #CC9866
 manager.tab.gradient.bottom = #CC9866
 
@@ -200,26 +200,26 @@ tree.font = processing.sans,plain,12
 # For an explanation of these tags, see Token.java:
 # processing/app/src/processing/app/syntax/Token.java
 
-editor.token.function1.style = #006699,plain
-editor.token.function2.style = #006699,plain
-editor.token.function3.style = #669900,plain
-editor.token.function4.style = #006699,bold
+editor.token.function1.style = #006696,plain
+editor.token.function2.style = #006696,plain
+editor.token.function3.style = #6D9800,plain
+editor.token.function4.style = #006696,bold
 
-editor.token.keyword1.style = #33997e,plain
-editor.token.keyword2.style = #33997e,plain
-editor.token.keyword3.style = #669900,plain
-editor.token.keyword4.style = #d94a7a,plain
-editor.token.keyword5.style = #e2661a,plain
-editor.token.keyword6.style = #33997e,plain
+editor.token.keyword1.style = #309879,plain
+editor.token.keyword2.style = #309879,plain
+editor.token.keyword3.style = #6D9800,plain
+editor.token.keyword4.style = #DB4D6E,plain
+editor.token.keyword5.style = #E76700,plain
+editor.token.keyword6.style = #309879,plain
 
-editor.token.literal1.style = #7D4793,plain
-editor.token.literal2.style = #718a62,plain
+editor.token.literal1.style = #738A5B,plain
+editor.token.literal2.style = #75488D,plain
 
-editor.token.operator.style = #006699,plain
+editor.token.operator.style = #006696,plain
 
-editor.token.label.style = #666666,bold
+editor.token.label.style = #656560,bold
 
-editor.token.comment1.style = #666666,plain
-editor.token.comment2.style = #666666,plain
+editor.token.comment1.style = #656560,plain
+editor.token.comment2.style = #656560,plain
 
-editor.token.invalid.style = #666666,bold
+editor.token.invalid.style = #656560,bold
diff --git a/build/shared/lib/themes/fluorite.txt b/build/shared/lib/themes/fluorite.txt
index 381d83935..46b81f1b6 100644
--- a/build/shared/lib/themes/fluorite.txt
+++ b/build/shared/lib/themes/fluorite.txt
@@ -52,13 +52,13 @@ toolbar.button.debug.selected.stroke = none
 
 ## EditorStatus - status message bar directly below the editor ##
 
-status.notice.fgcolor = #160036
+status.notice.fgcolor = #F7C9FF
 status.notice.bgcolor = #714B9C
-status.error.fgcolor = #000000
+status.error.fgcolor = #2C00CE
 status.error.bgcolor = #FFFFF2
 status.warning.bgcolor = #A49EA1
-status.warning.fgcolor = #FFFFF2
-status.url.fgcolor = #cccccc
+status.warning.fgcolor = #2E0D53
+status.url.fgcolor = #000000
 status.font = processing.sans,plain,13
 # For the clipboard icon, needs to be a little larger on macOS
 status.emoji.font = Dialog,plain,22
@@ -100,7 +100,7 @@ footer.updates.indicator.text.color = #FFEFFF
 console.color = #140E17
 console.output.color = #7F797E
 # text color for errors printed in the console
-console.error.color = #CAC4C6
+console.error.color = #F071FF
 
 
 ## PdeTextAreaDefaults - default colors for the editor ##
@@ -127,7 +127,7 @@ editor.eolmarkers.color = #999999
 
 # bracket/brace highlighting
 editor.brackethighlight = true
-editor.brackethighlight.color = #006699
+editor.brackethighlight.color = #F18F88
 
 # colors for the custom scroll bar
 editor.scrollbar.thumb.enabled.color = #644684
@@ -153,8 +153,8 @@ editor.warning.underline.color = #A49EA1
 ## MarkerColumn - shows ticks adjacent the scroll bar ##
 
 # lines next to the scrollbar showing where errors are located
-editor.column.error.color = #ff5355
-editor.column.warning.color = #fed456
+editor.column.error.color = #FFFFF2
+editor.column.warning.color = #A49EA1
 
 
 ## ErrorTable - the list of errors in the second tab found in the console area ##
@@ -175,11 +175,11 @@ errors.indicator.warning.color = #ef8115
 
 ## ManagerTabs - tabs in the Contribution Manager ##
 
-manager.tab.selected.color = #17002B
-manager.tab.unselected.color = #1F0D36
+manager.tab.selected.color = #FFFFF2
+manager.tab.unselected.color = #A49EA1
 manager.tab.text.font = processing.sans,bold,14
-manager.tab.text.selected.color = #B0B0A7
-manager.tab.text.unselected.color = #69567A
+manager.tab.text.selected.color = #000000
+manager.tab.text.unselected.color = #17002B
 manager.tab.gradient.top = #301751
 manager.tab.gradient.bottom = #301751
 
@@ -200,26 +200,26 @@ tree.font = processing.sans,plain,12
 # For an explanation of these tags, see Token.java:
 # processing/app/src/processing/app/syntax/Token.java
 
-editor.token.function1.style = #006699,plain
-editor.token.function2.style = #006699,plain
-editor.token.function3.style = #669900,plain
-editor.token.function4.style = #006699,bold
+editor.token.function1.style = #F18F88,plain
+editor.token.function2.style = #F18F88,plain
+editor.token.function3.style = #00B2FF,plain
+editor.token.function4.style = #F18F88,bold
 
-editor.token.keyword1.style = #33997e,plain
-editor.token.keyword2.style = #33997e,plain
-editor.token.keyword3.style = #669900,plain
-editor.token.keyword4.style = #d94a7a,plain
-editor.token.keyword5.style = #e2661a,plain
-editor.token.keyword6.style = #33997e,plain
+editor.token.keyword1.style = #DD0000,plain
+editor.token.keyword2.style = #DD0000,plain
+editor.token.keyword3.style = #00B2FF,plain
+editor.token.keyword4.style = #C75300,plain
+editor.token.keyword5.style = #00CB00,plain
+editor.token.keyword6.style = #DD0000,plain
 
-editor.token.literal1.style = #7D4793,plain
-editor.token.literal2.style = #718a62,plain
+editor.token.literal1.style = #7E65CA,plain
+editor.token.literal2.style = #AB00B7,plain
 
-editor.token.operator.style = #006699,plain
+editor.token.operator.style = #F18F88,plain
 
-editor.token.label.style = #666666,bold
+editor.token.label.style = #5E5E59,bold
 
-editor.token.comment1.style = #666666,plain
-editor.token.comment2.style = #666666,plain
+editor.token.comment1.style = #5E5E59,plain
+editor.token.comment2.style = #5E5E59,plain
 
-editor.token.invalid.style = #666666,bold
+editor.token.invalid.style = #5E5E59,bold
diff --git a/build/shared/lib/themes/gabbro.txt b/build/shared/lib/themes/gabbro.txt
index 172e56d20..94e770a18 100644
--- a/build/shared/lib/themes/gabbro.txt
+++ b/build/shared/lib/themes/gabbro.txt
@@ -52,13 +52,13 @@ toolbar.button.debug.selected.stroke = none
 
 ## EditorStatus - status message bar directly below the editor ##
 
-status.notice.fgcolor = #D7E7BC
+status.notice.fgcolor = #CFE3B1
 status.notice.bgcolor = #566841
-status.error.fgcolor = #FFFFF2
+status.error.fgcolor = #00E600
 status.error.bgcolor = #000000
 status.warning.bgcolor = #194200
-status.warning.fgcolor = #FFFFF2
-status.url.fgcolor = #cccccc
+status.warning.fgcolor = #98E54B
+status.url.fgcolor = #FFFFF2
 status.font = processing.sans,plain,13
 # For the clipboard icon, needs to be a little larger on macOS
 status.emoji.font = Dialog,plain,22
@@ -100,7 +100,7 @@ footer.updates.indicator.text.color = #000700
 console.color = #31322D
 console.output.color = #8F9087
 # text color for errors printed in the console
-console.error.color = #A8D27A
+console.error.color = #00D800
 
 
 ## PdeTextAreaDefaults - default colors for the editor ##
@@ -127,7 +127,7 @@ editor.eolmarkers.color = #999999
 
 # bracket/brace highlighting
 editor.brackethighlight = true
-editor.brackethighlight.color = #006699
+editor.brackethighlight.color = #006696
 
 # colors for the custom scroll bar
 editor.scrollbar.thumb.enabled.color = #606F4D
@@ -153,8 +153,8 @@ editor.warning.underline.color = #194200
 ## MarkerColumn - shows ticks adjacent the scroll bar ##
 
 # lines next to the scrollbar showing where errors are located
-editor.column.error.color = #ff5355
-editor.column.warning.color = #fed456
+editor.column.error.color = #000000
+editor.column.warning.color = #194200
 
 
 ## ErrorTable - the list of errors in the second tab found in the console area ##
@@ -175,11 +175,11 @@ errors.indicator.warning.color = #ef8115
 
 ## ManagerTabs - tabs in the Contribution Manager ##
 
-manager.tab.selected.color = #DBE6C5
-manager.tab.unselected.color = #B9C4A5
+manager.tab.selected.color = #000000
+manager.tab.unselected.color = #194200
 manager.tab.text.font = processing.sans,bold,14
-manager.tab.text.selected.color = #063700
-manager.tab.text.unselected.color = #5E6551
+manager.tab.text.selected.color = #FFFFF2
+manager.tab.text.unselected.color = #DBE6C5
 manager.tab.gradient.top = #869570
 manager.tab.gradient.bottom = #869570
 
@@ -200,26 +200,26 @@ tree.font = processing.sans,plain,12
 # For an explanation of these tags, see Token.java:
 # processing/app/src/processing/app/syntax/Token.java
 
-editor.token.function1.style = #006699,plain
-editor.token.function2.style = #006699,plain
-editor.token.function3.style = #669900,plain
-editor.token.function4.style = #006699,bold
+editor.token.function1.style = #006696,plain
+editor.token.function2.style = #006696,plain
+editor.token.function3.style = #6D9800,plain
+editor.token.function4.style = #006696,bold
 
-editor.token.keyword1.style = #33997e,plain
-editor.token.keyword2.style = #33997e,plain
-editor.token.keyword3.style = #669900,plain
-editor.token.keyword4.style = #d94a7a,plain
-editor.token.keyword5.style = #e2661a,plain
-editor.token.keyword6.style = #33997e,plain
+editor.token.keyword1.style = #309879,plain
+editor.token.keyword2.style = #309879,plain
+editor.token.keyword3.style = #6D9800,plain
+editor.token.keyword4.style = #DB4D6E,plain
+editor.token.keyword5.style = #E76700,plain
+editor.token.keyword6.style = #309879,plain
 
-editor.token.literal1.style = #7D4793,plain
-editor.token.literal2.style = #718a62,plain
+editor.token.literal1.style = #738A5B,plain
+editor.token.literal2.style = #75488D,plain
 
-editor.token.operator.style = #006699,plain
+editor.token.operator.style = #006696,plain
 
-editor.token.label.style = #666666,bold
+editor.token.label.style = #656560,bold
 
-editor.token.comment1.style = #666666,plain
-editor.token.comment2.style = #666666,plain
+editor.token.comment1.style = #656560,plain
+editor.token.comment2.style = #656560,plain
 
-editor.token.invalid.style = #666666,bold
+editor.token.invalid.style = #656560,bold
diff --git a/build/shared/lib/themes/galena.txt b/build/shared/lib/themes/galena.txt
index dce658633..9e7f70fa7 100644
--- a/build/shared/lib/themes/galena.txt
+++ b/build/shared/lib/themes/galena.txt
@@ -52,13 +52,13 @@ toolbar.button.debug.selected.stroke = none
 
 ## EditorStatus - status message bar directly below the editor ##
 
-status.notice.fgcolor = #D6DAD7
+status.notice.fgcolor = #D5DAD9
 status.notice.bgcolor = #4E5256
-status.error.fgcolor = #FFFFF2
+status.error.fgcolor = #00D2FF
 status.error.bgcolor = #000000
 status.warning.bgcolor = #434649
-status.warning.fgcolor = #FFFFF2
-status.url.fgcolor = #cccccc
+status.warning.fgcolor = #ACDAFF
+status.url.fgcolor = #FFFFF2
 status.font = processing.sans,plain,13
 # For the clipboard icon, needs to be a little larger on macOS
 status.emoji.font = Dialog,plain,22
@@ -100,7 +100,7 @@ footer.updates.indicator.text.color = #000009
 console.color = #292928
 console.output.color = #8A8B86
 # text color for errors printed in the console
-console.error.color = #C2C6C4
+console.error.color = #00C5FF
 
 
 ## PdeTextAreaDefaults - default colors for the editor ##
@@ -127,7 +127,7 @@ editor.eolmarkers.color = #999999
 
 # bracket/brace highlighting
 editor.brackethighlight = true
-editor.brackethighlight.color = #006699
+editor.brackethighlight.color = #006696
 
 # colors for the custom scroll bar
 editor.scrollbar.thumb.enabled.color = #56595B
@@ -153,8 +153,8 @@ editor.warning.underline.color = #434649
 ## MarkerColumn - shows ticks adjacent the scroll bar ##
 
 # lines next to the scrollbar showing where errors are located
-editor.column.error.color = #ff5355
-editor.column.warning.color = #fed456
+editor.column.error.color = #000000
+editor.column.warning.color = #434649
 
 
 ## ErrorTable - the list of errors in the second tab found in the console area ##
@@ -175,11 +175,11 @@ errors.indicator.warning.color = #ef8115
 
 ## ManagerTabs - tabs in the Contribution Manager ##
 
-manager.tab.selected.color = #D7DAD5
-manager.tab.unselected.color = #B0B3B0
+manager.tab.selected.color = #000000
+manager.tab.unselected.color = #434649
 manager.tab.text.font = processing.sans,bold,14
-manager.tab.text.selected.color = #393935
-manager.tab.text.unselected.color = #4F5252
+manager.tab.text.selected.color = #FFFFF2
+manager.tab.text.unselected.color = #D7DAD5
 manager.tab.gradient.top = #76797A
 manager.tab.gradient.bottom = #76797A
 
@@ -200,26 +200,26 @@ tree.font = processing.sans,plain,12
 # For an explanation of these tags, see Token.java:
 # processing/app/src/processing/app/syntax/Token.java
 
-editor.token.function1.style = #006699,plain
-editor.token.function2.style = #006699,plain
-editor.token.function3.style = #669900,plain
-editor.token.function4.style = #006699,bold
+editor.token.function1.style = #006696,plain
+editor.token.function2.style = #006696,plain
+editor.token.function3.style = #6D9800,plain
+editor.token.function4.style = #006696,bold
 
-editor.token.keyword1.style = #33997e,plain
-editor.token.keyword2.style = #33997e,plain
-editor.token.keyword3.style = #669900,plain
-editor.token.keyword4.style = #d94a7a,plain
-editor.token.keyword5.style = #e2661a,plain
-editor.token.keyword6.style = #33997e,plain
+editor.token.keyword1.style = #309879,plain
+editor.token.keyword2.style = #309879,plain
+editor.token.keyword3.style = #6D9800,plain
+editor.token.keyword4.style = #DB4D6E,plain
+editor.token.keyword5.style = #E76700,plain
+editor.token.keyword6.style = #309879,plain
 
-editor.token.literal1.style = #7D4793,plain
-editor.token.literal2.style = #718a62,plain
+editor.token.literal1.style = #738A5B,plain
+editor.token.literal2.style = #75488D,plain
 
-editor.token.operator.style = #006699,plain
+editor.token.operator.style = #006696,plain
 
-editor.token.label.style = #666666,bold
+editor.token.label.style = #656560,bold
 
-editor.token.comment1.style = #666666,plain
-editor.token.comment2.style = #666666,plain
+editor.token.comment1.style = #656560,plain
+editor.token.comment2.style = #656560,plain
 
-editor.token.invalid.style = #666666,bold
+editor.token.invalid.style = #656560,bold
diff --git a/build/shared/lib/themes/garnet.txt b/build/shared/lib/themes/garnet.txt
index e17cafa8e..001612429 100644
--- a/build/shared/lib/themes/garnet.txt
+++ b/build/shared/lib/themes/garnet.txt
@@ -20,17 +20,17 @@ mode.outline.color = #E07671
 toolbar.button.disabled.field = #FFDFD3
 toolbar.button.disabled.glyph = #FFC8BD
 toolbar.button.disabled.stroke = none
-toolbar.button.enabled.field = #FF5568
+toolbar.button.enabled.field = #FF9290
 toolbar.button.enabled.glyph = #88001C
 toolbar.button.enabled.stroke = none
 toolbar.button.pressed.field = #600000
-toolbar.button.pressed.glyph = #FF9496
-toolbar.button.pressed.stroke = #FF9496
-toolbar.button.rollover.field = #FF9496
+toolbar.button.pressed.glyph = #FFA5A5
+toolbar.button.pressed.stroke = #FFA5A5
+toolbar.button.rollover.field = #FFA5A5
 toolbar.button.rollover.glyph = #88001C
 toolbar.button.rollover.stroke = none
 toolbar.button.selected.field = #FFFFF2
-toolbar.button.selected.glyph = #F50000
+toolbar.button.selected.glyph = #D40011
 toolbar.button.selected.stroke = none
 
 toolbar.button.debug.disabled.field = #000009
@@ -52,13 +52,13 @@ toolbar.button.debug.selected.stroke = none
 
 ## EditorStatus - status message bar directly below the editor ##
 
-status.notice.fgcolor = #460000
+status.notice.fgcolor = #550000
 status.notice.bgcolor = #D05052
-status.error.fgcolor = #000000
+status.error.fgcolor = #A40000
 status.error.bgcolor = #FFFFF2
-status.warning.bgcolor = #FF5568
-status.warning.fgcolor = #FFFFF2
-status.url.fgcolor = #cccccc
+status.warning.bgcolor = #FF9290
+status.warning.fgcolor = #7A0000
+status.url.fgcolor = #000000
 status.font = processing.sans,plain,13
 # For the clipboard icon, needs to be a little larger on macOS
 status.emoji.font = Dialog,plain,22
@@ -68,7 +68,7 @@ status.emoji.font.macosx = Dialog,plain,22
 ## EditorHeader - the tab area above the editor ##
 
 header.text.font = processing.sans,bold,14
-header.text.selected.color = #FF6275
+header.text.selected.color = #FF9998
 header.text.unselected.color = #A86B65
 header.tab.arrow.color = #A86B65
 header.tab.selected.color = #370000
@@ -100,7 +100,7 @@ footer.updates.indicator.text.color = #FFDFD3
 console.color = #261A18
 console.output.color = #8F8079
 # text color for errors printed in the console
-console.error.color = #FF707D
+console.error.color = #FF2D63
 
 
 ## PdeTextAreaDefaults - default colors for the editor ##
@@ -127,7 +127,7 @@ editor.eolmarkers.color = #999999
 
 # bracket/brace highlighting
 editor.brackethighlight = true
-editor.brackethighlight.color = #006699
+editor.brackethighlight.color = #E391B9
 
 # colors for the custom scroll bar
 editor.scrollbar.thumb.enabled.color = #B95452
@@ -147,14 +147,14 @@ editor.gutter.linehighlight.color = #B95452
 # squiggly line underneath errors in the editor
 editor.error.underline.color = #FFFFF2
 # squiggly line underneath warnings
-editor.warning.underline.color = #FF5568
+editor.warning.underline.color = #FF9290
 
 
 ## MarkerColumn - shows ticks adjacent the scroll bar ##
 
 # lines next to the scrollbar showing where errors are located
-editor.column.error.color = #ff5355
-editor.column.warning.color = #fed456
+editor.column.error.color = #FFFFF2
+editor.column.warning.color = #FF9290
 
 
 ## ErrorTable - the list of errors in the second tab found in the console area ##
@@ -175,11 +175,11 @@ errors.indicator.warning.color = #ef8115
 
 ## ManagerTabs - tabs in the Contribution Manager ##
 
-manager.tab.selected.color = #370000
-manager.tab.unselected.color = #521015
+manager.tab.selected.color = #FFFFF2
+manager.tab.unselected.color = #FF9290
 manager.tab.text.font = processing.sans,bold,14
-manager.tab.text.selected.color = #FF6275
-manager.tab.text.unselected.color = #A86B65
+manager.tab.text.selected.color = #000000
+manager.tab.text.unselected.color = #370000
 manager.tab.gradient.top = #88272C
 manager.tab.gradient.bottom = #88272C
 
@@ -200,26 +200,26 @@ tree.font = processing.sans,plain,12
 # For an explanation of these tags, see Token.java:
 # processing/app/src/processing/app/syntax/Token.java
 
-editor.token.function1.style = #006699,plain
-editor.token.function2.style = #006699,plain
-editor.token.function3.style = #669900,plain
-editor.token.function4.style = #006699,bold
+editor.token.function1.style = #E391B9,plain
+editor.token.function2.style = #E391B9,plain
+editor.token.function3.style = #8E6FFF,plain
+editor.token.function4.style = #E391B9,bold
 
-editor.token.keyword1.style = #33997e,plain
-editor.token.keyword2.style = #33997e,plain
-editor.token.keyword3.style = #669900,plain
-editor.token.keyword4.style = #d94a7a,plain
-editor.token.keyword5.style = #e2661a,plain
-editor.token.keyword6.style = #33997e,plain
+editor.token.keyword1.style = #B714BB,plain
+editor.token.keyword2.style = #B714BB,plain
+editor.token.keyword3.style = #8E6FFF,plain
+editor.token.keyword4.style = #0094E2,plain
+editor.token.keyword5.style = #00D0DB,plain
+editor.token.keyword6.style = #B714BB,plain
 
-editor.token.literal1.style = #7D4793,plain
-editor.token.literal2.style = #718a62,plain
+editor.token.literal1.style = #C94C4E,plain
+editor.token.literal2.style = #D20000,plain
 
-editor.token.operator.style = #006699,plain
+editor.token.operator.style = #E391B9,plain
 
-editor.token.label.style = #666666,bold
+editor.token.label.style = #5E5E59,bold
 
-editor.token.comment1.style = #666666,plain
-editor.token.comment2.style = #666666,plain
+editor.token.comment1.style = #5E5E59,plain
+editor.token.comment2.style = #5E5E59,plain
 
-editor.token.invalid.style = #666666,bold
+editor.token.invalid.style = #5E5E59,bold
diff --git a/build/shared/lib/themes/jasper.txt b/build/shared/lib/themes/jasper.txt
index 245089a7d..2579914cb 100644
--- a/build/shared/lib/themes/jasper.txt
+++ b/build/shared/lib/themes/jasper.txt
@@ -21,15 +21,15 @@ toolbar.button.disabled.field = #460000
 toolbar.button.disabled.glyph = #FFB793
 toolbar.button.disabled.stroke = none
 toolbar.button.enabled.field = #FFFFF2
-toolbar.button.enabled.glyph = #FF5338
+toolbar.button.enabled.glyph = #E96750
 toolbar.button.enabled.stroke = none
-toolbar.button.pressed.field = #FF5338
+toolbar.button.pressed.field = #E96750
 toolbar.button.pressed.glyph = #FFFFF2
 toolbar.button.pressed.stroke = #FFFFF2
 toolbar.button.rollover.field = #FFFFF2
-toolbar.button.rollover.glyph = #8E0000
+toolbar.button.rollover.glyph = #740000
 toolbar.button.rollover.stroke = none
-toolbar.button.selected.field = #380000
+toolbar.button.selected.field = #350000
 toolbar.button.selected.glyph = #FFFFF2
 toolbar.button.selected.stroke = none
 
@@ -52,13 +52,13 @@ toolbar.button.debug.selected.stroke = none
 
 ## EditorStatus - status message bar directly below the editor ##
 
-status.notice.fgcolor = #FFA986
+status.notice.fgcolor = #FF9871
 status.notice.bgcolor = #B70000
-status.error.fgcolor = #FFFFF2
+status.error.fgcolor = #FF451C
 status.error.bgcolor = #000000
-status.warning.bgcolor = #9C0000
-status.warning.fgcolor = #FFFFF2
-status.url.fgcolor = #cccccc
+status.warning.bgcolor = #780000
+status.warning.fgcolor = #FFA282
+status.url.fgcolor = #FFFFF2
 status.font = processing.sans,plain,13
 # For the clipboard icon, needs to be a little larger on macOS
 status.emoji.font = Dialog,plain,22
@@ -68,7 +68,7 @@ status.emoji.font.macosx = Dialog,plain,22
 ## EditorHeader - the tab area above the editor ##
 
 header.text.font = processing.sans,bold,14
-header.text.selected.color = #910000
+header.text.selected.color = #720000
 header.text.unselected.color = #893828
 header.tab.arrow.color = #893828
 header.tab.selected.color = #FFB89A
@@ -100,7 +100,7 @@ footer.updates.indicator.text.color = #460000
 console.color = #372520
 console.output.color = #9C867B
 # text color for errors printed in the console
-console.error.color = #FF5E38
+console.error.color = #FF2800
 
 
 ## PdeTextAreaDefaults - default colors for the editor ##
@@ -127,7 +127,7 @@ editor.eolmarkers.color = #999999
 
 # bracket/brace highlighting
 editor.brackethighlight = true
-editor.brackethighlight.color = #006699
+editor.brackethighlight.color = #006696
 
 # colors for the custom scroll bar
 editor.scrollbar.thumb.enabled.color = #B01800
@@ -147,14 +147,14 @@ editor.gutter.linehighlight.color = #B01800
 # squiggly line underneath errors in the editor
 editor.error.underline.color = #000000
 # squiggly line underneath warnings
-editor.warning.underline.color = #9C0000
+editor.warning.underline.color = #780000
 
 
 ## MarkerColumn - shows ticks adjacent the scroll bar ##
 
 # lines next to the scrollbar showing where errors are located
-editor.column.error.color = #ff5355
-editor.column.warning.color = #fed456
+editor.column.error.color = #000000
+editor.column.warning.color = #780000
 
 
 ## ErrorTable - the list of errors in the second tab found in the console area ##
@@ -175,11 +175,11 @@ errors.indicator.warning.color = #ef8115
 
 ## ManagerTabs - tabs in the Contribution Manager ##
 
-manager.tab.selected.color = #FFB89A
-manager.tab.unselected.color = #FF9176
+manager.tab.selected.color = #000000
+manager.tab.unselected.color = #780000
 manager.tab.text.font = processing.sans,bold,14
-manager.tab.text.selected.color = #910000
-manager.tab.text.unselected.color = #893828
+manager.tab.text.selected.color = #FFFFF2
+manager.tab.text.unselected.color = #FFB89A
 manager.tab.gradient.top = #D8432A
 manager.tab.gradient.bottom = #D8432A
 
@@ -200,26 +200,26 @@ tree.font = processing.sans,plain,12
 # For an explanation of these tags, see Token.java:
 # processing/app/src/processing/app/syntax/Token.java
 
-editor.token.function1.style = #006699,plain
-editor.token.function2.style = #006699,plain
-editor.token.function3.style = #669900,plain
-editor.token.function4.style = #006699,bold
+editor.token.function1.style = #006696,plain
+editor.token.function2.style = #006696,plain
+editor.token.function3.style = #6D9800,plain
+editor.token.function4.style = #006696,bold
 
-editor.token.keyword1.style = #33997e,plain
-editor.token.keyword2.style = #33997e,plain
-editor.token.keyword3.style = #669900,plain
-editor.token.keyword4.style = #d94a7a,plain
-editor.token.keyword5.style = #e2661a,plain
-editor.token.keyword6.style = #33997e,plain
+editor.token.keyword1.style = #309879,plain
+editor.token.keyword2.style = #309879,plain
+editor.token.keyword3.style = #6D9800,plain
+editor.token.keyword4.style = #DB4D6E,plain
+editor.token.keyword5.style = #E76700,plain
+editor.token.keyword6.style = #309879,plain
 
-editor.token.literal1.style = #7D4793,plain
-editor.token.literal2.style = #718a62,plain
+editor.token.literal1.style = #738A5B,plain
+editor.token.literal2.style = #75488D,plain
 
-editor.token.operator.style = #006699,plain
+editor.token.operator.style = #006696,plain
 
-editor.token.label.style = #666666,bold
+editor.token.label.style = #656560,bold
 
-editor.token.comment1.style = #666666,plain
-editor.token.comment2.style = #666666,plain
+editor.token.comment1.style = #656560,plain
+editor.token.comment2.style = #656560,plain
 
-editor.token.invalid.style = #666666,bold
+editor.token.invalid.style = #656560,bold
diff --git a/build/shared/lib/themes/kyanite.txt b/build/shared/lib/themes/kyanite.txt
index ed7839002..dd8de0661 100644
--- a/build/shared/lib/themes/kyanite.txt
+++ b/build/shared/lib/themes/kyanite.txt
@@ -21,15 +21,15 @@ toolbar.button.disabled.field = #00072B
 toolbar.button.disabled.glyph = #BAEDFF
 toolbar.button.disabled.stroke = none
 toolbar.button.enabled.field = #FFFFF2
-toolbar.button.enabled.glyph = #009BEE
+toolbar.button.enabled.glyph = #009FFF
 toolbar.button.enabled.stroke = none
-toolbar.button.pressed.field = #009BEE
+toolbar.button.pressed.field = #009FFF
 toolbar.button.pressed.glyph = #FFFFF2
 toolbar.button.pressed.stroke = #FFFFF2
 toolbar.button.rollover.field = #FFFFF2
-toolbar.button.rollover.glyph = #003BB1
+toolbar.button.rollover.glyph = #002551
 toolbar.button.rollover.stroke = none
-toolbar.button.selected.field = #00193D
+toolbar.button.selected.field = #001439
 toolbar.button.selected.glyph = #FFFFF2
 toolbar.button.selected.stroke = none
 
@@ -52,13 +52,13 @@ toolbar.button.debug.selected.stroke = none
 
 ## EditorStatus - status message bar directly below the editor ##
 
-status.notice.fgcolor = #B7EAFF
+status.notice.fgcolor = #9EE3FF
 status.notice.bgcolor = #016E9F
-status.error.fgcolor = #FFFFF2
+status.error.fgcolor = #00DDFF
 status.error.bgcolor = #000000
-status.warning.bgcolor = #004BB5
-status.warning.fgcolor = #FFFFF2
-status.url.fgcolor = #cccccc
+status.warning.bgcolor = #003674
+status.warning.fgcolor = #00DDFF
+status.url.fgcolor = #FFFFF2
 status.font = processing.sans,plain,13
 # For the clipboard icon, needs to be a little larger on macOS
 status.emoji.font = Dialog,plain,22
@@ -68,7 +68,7 @@ status.emoji.font.macosx = Dialog,plain,22
 ## EditorHeader - the tab area above the editor ##
 
 header.text.font = processing.sans,bold,14
-header.text.selected.color = #003D96
+header.text.selected.color = #002C5D
 header.text.unselected.color = #4F6A80
 header.tab.arrow.color = #4F6A80
 header.tab.selected.color = #C4E9FF
@@ -100,7 +100,7 @@ footer.updates.indicator.text.color = #00072B
 console.color = #2F3539
 console.output.color = #8C9495
 # text color for errors printed in the console
-console.error.color = #00D7FF
+console.error.color = #00CFFF
 
 
 ## PdeTextAreaDefaults - default colors for the editor ##
@@ -119,7 +119,7 @@ editor.linehighlight=true
 
 editor.caret.color = #000000
 # also used by EditorHeader
-editor.selection.color = #AAF8FF
+editor.selection.color = #A9F8FF
 
 # little pooties at the end of lines that show where they finish
 editor.eolmarkers = false
@@ -127,7 +127,7 @@ editor.eolmarkers.color = #999999
 
 # bracket/brace highlighting
 editor.brackethighlight = true
-editor.brackethighlight.color = #006699
+editor.brackethighlight.color = #006696
 
 # colors for the custom scroll bar
 editor.scrollbar.thumb.enabled.color = #3E769D
@@ -147,14 +147,14 @@ editor.gutter.linehighlight.color = #3E769D
 # squiggly line underneath errors in the editor
 editor.error.underline.color = #000000
 # squiggly line underneath warnings
-editor.warning.underline.color = #004BB5
+editor.warning.underline.color = #003674
 
 
 ## MarkerColumn - shows ticks adjacent the scroll bar ##
 
 # lines next to the scrollbar showing where errors are located
-editor.column.error.color = #ff5355
-editor.column.warning.color = #fed456
+editor.column.error.color = #000000
+editor.column.warning.color = #003674
 
 
 ## ErrorTable - the list of errors in the second tab found in the console area ##
@@ -175,11 +175,11 @@ errors.indicator.warning.color = #ef8115
 
 ## ManagerTabs - tabs in the Contribution Manager ##
 
-manager.tab.selected.color = #C4E9FF
-manager.tab.unselected.color = #A6CAE5
+manager.tab.selected.color = #000000
+manager.tab.unselected.color = #003674
 manager.tab.text.font = processing.sans,bold,14
-manager.tab.text.selected.color = #003D96
-manager.tab.text.unselected.color = #4F6A80
+manager.tab.text.selected.color = #FFFFF2
+manager.tab.text.unselected.color = #C4E9FF
 manager.tab.gradient.top = #6BA0C7
 manager.tab.gradient.bottom = #6BA0C7
 
@@ -200,26 +200,26 @@ tree.font = processing.sans,plain,12
 # For an explanation of these tags, see Token.java:
 # processing/app/src/processing/app/syntax/Token.java
 
-editor.token.function1.style = #006699,plain
-editor.token.function2.style = #006699,plain
-editor.token.function3.style = #669900,plain
-editor.token.function4.style = #006699,bold
+editor.token.function1.style = #006696,plain
+editor.token.function2.style = #006696,plain
+editor.token.function3.style = #6D9800,plain
+editor.token.function4.style = #006696,bold
 
-editor.token.keyword1.style = #33997e,plain
-editor.token.keyword2.style = #33997e,plain
-editor.token.keyword3.style = #669900,plain
-editor.token.keyword4.style = #d94a7a,plain
-editor.token.keyword5.style = #e2661a,plain
-editor.token.keyword6.style = #33997e,plain
+editor.token.keyword1.style = #309879,plain
+editor.token.keyword2.style = #309879,plain
+editor.token.keyword3.style = #6D9800,plain
+editor.token.keyword4.style = #DB4D6E,plain
+editor.token.keyword5.style = #E76700,plain
+editor.token.keyword6.style = #309879,plain
 
-editor.token.literal1.style = #7D4793,plain
-editor.token.literal2.style = #718a62,plain
+editor.token.literal1.style = #738A5B,plain
+editor.token.literal2.style = #75488D,plain
 
-editor.token.operator.style = #006699,plain
+editor.token.operator.style = #006696,plain
 
-editor.token.label.style = #666666,bold
+editor.token.label.style = #656560,bold
 
-editor.token.comment1.style = #666666,plain
-editor.token.comment2.style = #666666,plain
+editor.token.comment1.style = #656560,plain
+editor.token.comment2.style = #656560,plain
 
-editor.token.invalid.style = #666666,bold
+editor.token.invalid.style = #656560,bold
diff --git a/build/shared/lib/themes/malachite.txt b/build/shared/lib/themes/malachite.txt
index 8a9410467..0923a49b1 100644
--- a/build/shared/lib/themes/malachite.txt
+++ b/build/shared/lib/themes/malachite.txt
@@ -52,13 +52,13 @@ toolbar.button.debug.selected.stroke = none
 
 ## EditorStatus - status message bar directly below the editor ##
 
-status.notice.fgcolor = #001108
+status.notice.fgcolor = #CCE1CD
 status.notice.bgcolor = #57695C
-status.error.fgcolor = #000000
+status.error.fgcolor = #004500
 status.error.bgcolor = #FFFFF2
 status.warning.bgcolor = #17AD6A
-status.warning.fgcolor = #FFFFF2
-status.url.fgcolor = #cccccc
+status.warning.fgcolor = #003000
+status.url.fgcolor = #000000
 status.font = processing.sans,plain,13
 # For the clipboard icon, needs to be a little larger on macOS
 status.emoji.font = Dialog,plain,22
@@ -100,7 +100,7 @@ footer.updates.indicator.text.color = #F2FFEE
 console.color = #101410
 console.output.color = #7B7F77
 # text color for errors printed in the console
-console.error.color = #59DD94
+console.error.color = #00DE5C
 
 
 ## PdeTextAreaDefaults - default colors for the editor ##
@@ -127,7 +127,7 @@ editor.eolmarkers.color = #999999
 
 # bracket/brace highlighting
 editor.brackethighlight = true
-editor.brackethighlight.color = #006699
+editor.brackethighlight.color = #00BFD3
 
 # colors for the custom scroll bar
 editor.scrollbar.thumb.enabled.color = #505F53
@@ -153,8 +153,8 @@ editor.warning.underline.color = #17AD6A
 ## MarkerColumn - shows ticks adjacent the scroll bar ##
 
 # lines next to the scrollbar showing where errors are located
-editor.column.error.color = #ff5355
-editor.column.warning.color = #fed456
+editor.column.error.color = #FFFFF2
+editor.column.warning.color = #17AD6A
 
 
 ## ErrorTable - the list of errors in the second tab found in the console area ##
@@ -175,11 +175,11 @@ errors.indicator.warning.color = #ef8115
 
 ## ManagerTabs - tabs in the Contribution Manager ##
 
-manager.tab.selected.color = #000E05
-manager.tab.unselected.color = #131D17
+manager.tab.selected.color = #FFFFF2
+manager.tab.unselected.color = #17AD6A
 manager.tab.text.font = processing.sans,bold,14
-manager.tab.text.selected.color = #56BE83
-manager.tab.text.unselected.color = #5D675D
+manager.tab.text.selected.color = #000000
+manager.tab.text.unselected.color = #000E05
 manager.tab.gradient.top = #243028
 manager.tab.gradient.bottom = #243028
 
@@ -200,26 +200,26 @@ tree.font = processing.sans,plain,12
 # For an explanation of these tags, see Token.java:
 # processing/app/src/processing/app/syntax/Token.java
 
-editor.token.function1.style = #006699,plain
-editor.token.function2.style = #006699,plain
-editor.token.function3.style = #669900,plain
-editor.token.function4.style = #006699,bold
+editor.token.function1.style = #00BFD3,plain
+editor.token.function2.style = #00BFD3,plain
+editor.token.function3.style = #00A8FF,plain
+editor.token.function4.style = #00BFD3,bold
 
-editor.token.keyword1.style = #33997e,plain
-editor.token.keyword2.style = #33997e,plain
-editor.token.keyword3.style = #669900,plain
-editor.token.keyword4.style = #d94a7a,plain
-editor.token.keyword5.style = #e2661a,plain
-editor.token.keyword6.style = #33997e,plain
+editor.token.keyword1.style = #008BEA,plain
+editor.token.keyword2.style = #008BEA,plain
+editor.token.keyword3.style = #00A8FF,plain
+editor.token.keyword4.style = #BB42BA,plain
+editor.token.keyword5.style = #FF4894,plain
+editor.token.keyword6.style = #008BEA,plain
 
-editor.token.literal1.style = #7D4793,plain
-editor.token.literal2.style = #718a62,plain
+editor.token.literal1.style = #008A53,plain
+editor.token.literal2.style = #006C58,plain
 
-editor.token.operator.style = #006699,plain
+editor.token.operator.style = #00BFD3,plain
 
-editor.token.label.style = #666666,bold
+editor.token.label.style = #5E5E59,bold
 
-editor.token.comment1.style = #666666,plain
-editor.token.comment2.style = #666666,plain
+editor.token.comment1.style = #5E5E59,plain
+editor.token.comment2.style = #5E5E59,plain
 
-editor.token.invalid.style = #666666,bold
+editor.token.invalid.style = #5E5E59,bold
diff --git a/build/shared/lib/themes/olivine.txt b/build/shared/lib/themes/olivine.txt
index c7e596c4f..0f3fb1b5b 100644
--- a/build/shared/lib/themes/olivine.txt
+++ b/build/shared/lib/themes/olivine.txt
@@ -21,15 +21,15 @@ toolbar.button.disabled.field = #000D00
 toolbar.button.disabled.glyph = #DBF270
 toolbar.button.disabled.stroke = none
 toolbar.button.enabled.field = #FFFFF2
-toolbar.button.enabled.glyph = #7A9C00
+toolbar.button.enabled.glyph = #819929
 toolbar.button.enabled.stroke = none
-toolbar.button.pressed.field = #7A9C00
+toolbar.button.pressed.field = #819929
 toolbar.button.pressed.glyph = #FFFFF2
 toolbar.button.pressed.stroke = #FFFFF2
 toolbar.button.rollover.field = #FFFFF2
-toolbar.button.rollover.glyph = #173200
+toolbar.button.rollover.glyph = #172A00
 toolbar.button.rollover.stroke = none
-toolbar.button.selected.field = #101800
+toolbar.button.selected.field = #0D1600
 toolbar.button.selected.glyph = #FFFFF2
 toolbar.button.selected.stroke = none
 
@@ -52,13 +52,13 @@ toolbar.button.debug.selected.stroke = none
 
 ## EditorStatus - status message bar directly below the editor ##
 
-status.notice.fgcolor = #D8EF6D
+status.notice.fgcolor = #CCEC44
 status.notice.bgcolor = #547800
-status.error.fgcolor = #FFFFF2
+status.error.fgcolor = #93DB00
 status.error.bgcolor = #000000
-status.warning.bgcolor = #144900
-status.warning.fgcolor = #FFFFF2
-status.url.fgcolor = #cccccc
+status.warning.bgcolor = #1A3900
+status.warning.fgcolor = #C3DC60
+status.url.fgcolor = #FFFFF2
 status.font = processing.sans,plain,13
 # For the clipboard icon, needs to be a little larger on macOS
 status.emoji.font = Dialog,plain,22
@@ -68,7 +68,7 @@ status.emoji.font.macosx = Dialog,plain,22
 ## EditorHeader - the tab area above the editor ##
 
 header.text.font = processing.sans,bold,14
-header.text.selected.color = #153B00
+header.text.selected.color = #183000
 header.text.unselected.color = #65722E
 header.tab.arrow.color = #65722E
 header.tab.selected.color = #DDED8C
@@ -100,7 +100,7 @@ footer.updates.indicator.text.color = #000D00
 console.color = #363828
 console.output.color = #92947E
 # text color for errors printed in the console
-console.error.color = #A0D800
+console.error.color = #84CD00
 
 
 ## PdeTextAreaDefaults - default colors for the editor ##
@@ -119,7 +119,7 @@ editor.linehighlight=true
 
 editor.caret.color = #000000
 # also used by EditorHeader
-editor.selection.color = #E8F894
+editor.selection.color = #E7F994
 
 # little pooties at the end of lines that show where they finish
 editor.eolmarkers = false
@@ -127,7 +127,7 @@ editor.eolmarkers.color = #999999
 
 # bracket/brace highlighting
 editor.brackethighlight = true
-editor.brackethighlight.color = #006699
+editor.brackethighlight.color = #006696
 
 # colors for the custom scroll bar
 editor.scrollbar.thumb.enabled.color = #668000
@@ -147,14 +147,14 @@ editor.gutter.linehighlight.color = #668000
 # squiggly line underneath errors in the editor
 editor.error.underline.color = #000000
 # squiggly line underneath warnings
-editor.warning.underline.color = #144900
+editor.warning.underline.color = #1A3900
 
 
 ## MarkerColumn - shows ticks adjacent the scroll bar ##
 
 # lines next to the scrollbar showing where errors are located
-editor.column.error.color = #ff5355
-editor.column.warning.color = #fed456
+editor.column.error.color = #000000
+editor.column.warning.color = #1A3900
 
 
 ## ErrorTable - the list of errors in the second tab found in the console area ##
@@ -175,11 +175,11 @@ errors.indicator.warning.color = #ef8115
 
 ## ManagerTabs - tabs in the Contribution Manager ##
 
-manager.tab.selected.color = #DDED8C
-manager.tab.unselected.color = #C0D072
+manager.tab.selected.color = #000000
+manager.tab.unselected.color = #1A3900
 manager.tab.text.font = processing.sans,bold,14
-manager.tab.text.selected.color = #153B00
-manager.tab.text.unselected.color = #65722E
+manager.tab.text.selected.color = #FFFFF2
+manager.tab.text.unselected.color = #DDED8C
 manager.tab.gradient.top = #94AC2C
 manager.tab.gradient.bottom = #94AC2C
 
@@ -200,26 +200,26 @@ tree.font = processing.sans,plain,12
 # For an explanation of these tags, see Token.java:
 # processing/app/src/processing/app/syntax/Token.java
 
-editor.token.function1.style = #006699,plain
-editor.token.function2.style = #006699,plain
-editor.token.function3.style = #669900,plain
-editor.token.function4.style = #006699,bold
+editor.token.function1.style = #006696,plain
+editor.token.function2.style = #006696,plain
+editor.token.function3.style = #6D9800,plain
+editor.token.function4.style = #006696,bold
 
-editor.token.keyword1.style = #33997e,plain
-editor.token.keyword2.style = #33997e,plain
-editor.token.keyword3.style = #669900,plain
-editor.token.keyword4.style = #d94a7a,plain
-editor.token.keyword5.style = #e2661a,plain
-editor.token.keyword6.style = #33997e,plain
+editor.token.keyword1.style = #309879,plain
+editor.token.keyword2.style = #309879,plain
+editor.token.keyword3.style = #6D9800,plain
+editor.token.keyword4.style = #DB4D6E,plain
+editor.token.keyword5.style = #E76700,plain
+editor.token.keyword6.style = #309879,plain
 
-editor.token.literal1.style = #7D4793,plain
-editor.token.literal2.style = #718a62,plain
+editor.token.literal1.style = #738A5B,plain
+editor.token.literal2.style = #75488D,plain
 
-editor.token.operator.style = #006699,plain
+editor.token.operator.style = #006696,plain
 
-editor.token.label.style = #666666,bold
+editor.token.label.style = #656560,bold
 
-editor.token.comment1.style = #666666,plain
-editor.token.comment2.style = #666666,plain
+editor.token.comment1.style = #656560,plain
+editor.token.comment2.style = #656560,plain
 
-editor.token.invalid.style = #666666,bold
+editor.token.invalid.style = #656560,bold
diff --git a/build/shared/lib/themes/orpiment.txt b/build/shared/lib/themes/orpiment.txt
index ca250d64d..20d3b8334 100644
--- a/build/shared/lib/themes/orpiment.txt
+++ b/build/shared/lib/themes/orpiment.txt
@@ -21,15 +21,15 @@ toolbar.button.disabled.field = #2D0000
 toolbar.button.disabled.glyph = #FFDF4F
 toolbar.button.disabled.stroke = none
 toolbar.button.enabled.field = #FFFFF2
-toolbar.button.enabled.glyph = #B88900
+toolbar.button.enabled.glyph = #B28A02
 toolbar.button.enabled.stroke = none
-toolbar.button.pressed.field = #B88900
+toolbar.button.pressed.field = #B28A02
 toolbar.button.pressed.glyph = #FFFFF2
 toolbar.button.pressed.stroke = #FFFFF2
 toolbar.button.rollover.field = #FFFFF2
-toolbar.button.rollover.glyph = #582700
+toolbar.button.rollover.glyph = #491F00
 toolbar.button.rollover.stroke = none
-toolbar.button.selected.field = #2A1300
+toolbar.button.selected.field = #270F00
 toolbar.button.selected.glyph = #FFFFF2
 toolbar.button.selected.stroke = none
 
@@ -52,13 +52,13 @@ toolbar.button.debug.selected.stroke = none
 
 ## EditorStatus - status message bar directly below the editor ##
 
-status.notice.fgcolor = #FFEB5B
+status.notice.fgcolor = #3F1400
 status.notice.bgcolor = #B98500
-status.error.fgcolor = #FFFFF2
+status.error.fgcolor = #FFBA00
 status.error.bgcolor = #000000
-status.warning.bgcolor = #724400
-status.warning.fgcolor = #FFFFF2
-status.url.fgcolor = #cccccc
+status.warning.bgcolor = #593400
+status.warning.fgcolor = #FDCD4F
+status.url.fgcolor = #FFFFF2
 status.font = processing.sans,plain,13
 # For the clipboard icon, needs to be a little larger on macOS
 status.emoji.font = Dialog,plain,22
@@ -68,7 +68,7 @@ status.emoji.font.macosx = Dialog,plain,22
 ## EditorHeader - the tab area above the editor ##
 
 header.text.font = processing.sans,bold,14
-header.text.selected.color = #613400
+header.text.selected.color = #4E2900
 header.text.unselected.color = #A9893D
 header.tab.arrow.color = #A9893D
 header.tab.selected.color = #FFEC84
@@ -100,7 +100,7 @@ footer.updates.indicator.text.color = #2D0000
 console.color = #4B4331
 console.output.color = #A39982
 # text color for errors printed in the console
-console.error.color = #FFBA00
+console.error.color = #F1AC00
 
 
 ## PdeTextAreaDefaults - default colors for the editor ##
@@ -127,7 +127,7 @@ editor.eolmarkers.color = #999999
 
 # bracket/brace highlighting
 editor.brackethighlight = true
-editor.brackethighlight.color = #006699
+editor.brackethighlight.color = #006696
 
 # colors for the custom scroll bar
 editor.scrollbar.thumb.enabled.color = #C09000
@@ -147,14 +147,14 @@ editor.gutter.linehighlight.color = #C09000
 # squiggly line underneath errors in the editor
 editor.error.underline.color = #000000
 # squiggly line underneath warnings
-editor.warning.underline.color = #724400
+editor.warning.underline.color = #593400
 
 
 ## MarkerColumn - shows ticks adjacent the scroll bar ##
 
 # lines next to the scrollbar showing where errors are located
-editor.column.error.color = #ff5355
-editor.column.warning.color = #fed456
+editor.column.error.color = #000000
+editor.column.warning.color = #593400
 
 
 ## ErrorTable - the list of errors in the second tab found in the console area ##
@@ -175,11 +175,11 @@ errors.indicator.warning.color = #ef8115
 
 ## ManagerTabs - tabs in the Contribution Manager ##
 
-manager.tab.selected.color = #FFEC84
-manager.tab.unselected.color = #FFDE77
+manager.tab.selected.color = #000000
+manager.tab.unselected.color = #593400
 manager.tab.text.font = processing.sans,bold,14
-manager.tab.text.selected.color = #613400
-manager.tab.text.unselected.color = #A9893D
+manager.tab.text.selected.color = #FFFFF2
+manager.tab.text.unselected.color = #FFEC84
 manager.tab.gradient.top = #FFCC3A
 manager.tab.gradient.bottom = #FFCC3A
 
@@ -200,26 +200,26 @@ tree.font = processing.sans,plain,12
 # For an explanation of these tags, see Token.java:
 # processing/app/src/processing/app/syntax/Token.java
 
-editor.token.function1.style = #006699,plain
-editor.token.function2.style = #006699,plain
-editor.token.function3.style = #669900,plain
-editor.token.function4.style = #006699,bold
+editor.token.function1.style = #006696,plain
+editor.token.function2.style = #006696,plain
+editor.token.function3.style = #6D9800,plain
+editor.token.function4.style = #006696,bold
 
-editor.token.keyword1.style = #33997e,plain
-editor.token.keyword2.style = #33997e,plain
-editor.token.keyword3.style = #669900,plain
-editor.token.keyword4.style = #d94a7a,plain
-editor.token.keyword5.style = #e2661a,plain
-editor.token.keyword6.style = #33997e,plain
+editor.token.keyword1.style = #309879,plain
+editor.token.keyword2.style = #309879,plain
+editor.token.keyword3.style = #6D9800,plain
+editor.token.keyword4.style = #DB4D6E,plain
+editor.token.keyword5.style = #E76700,plain
+editor.token.keyword6.style = #309879,plain
 
-editor.token.literal1.style = #7D4793,plain
-editor.token.literal2.style = #718a62,plain
+editor.token.literal1.style = #738A5B,plain
+editor.token.literal2.style = #75488D,plain
 
-editor.token.operator.style = #006699,plain
+editor.token.operator.style = #006696,plain
 
-editor.token.label.style = #666666,bold
+editor.token.label.style = #656560,bold
 
-editor.token.comment1.style = #666666,plain
-editor.token.comment2.style = #666666,plain
+editor.token.comment1.style = #656560,plain
+editor.token.comment2.style = #656560,plain
 
-editor.token.invalid.style = #666666,bold
+editor.token.invalid.style = #656560,bold
diff --git a/build/shared/lib/themes/pyrite.txt b/build/shared/lib/themes/pyrite.txt
index fa9b266e7..bc3b40d07 100644
--- a/build/shared/lib/themes/pyrite.txt
+++ b/build/shared/lib/themes/pyrite.txt
@@ -52,13 +52,13 @@ toolbar.button.debug.selected.stroke = none
 
 ## EditorStatus - status message bar directly below the editor ##
 
-status.notice.fgcolor = #001B21
+status.notice.fgcolor = #97EDF1
 status.notice.bgcolor = #187D85
-status.error.fgcolor = #000000
+status.error.fgcolor = #3A3400
 status.error.bgcolor = #FFFFF2
 status.warning.bgcolor = #99915B
-status.warning.fgcolor = #FFFFF2
-status.url.fgcolor = #cccccc
+status.warning.fgcolor = #292100
+status.url.fgcolor = #000000
 status.font = processing.sans,plain,13
 # For the clipboard icon, needs to be a little larger on macOS
 status.emoji.font = Dialog,plain,22
@@ -100,7 +100,7 @@ footer.updates.indicator.text.color = #C9FFFF
 console.color = #131A1A
 console.output.color = #79827D
 # text color for errors printed in the console
-console.error.color = #D0C78C
+console.error.color = #C3BE00
 
 
 ## PdeTextAreaDefaults - default colors for the editor ##
@@ -127,7 +127,7 @@ editor.eolmarkers.color = #999999
 
 # bracket/brace highlighting
 editor.brackethighlight = true
-editor.brackethighlight.color = #006699
+editor.brackethighlight.color = #99A6EA
 
 # colors for the custom scroll bar
 editor.scrollbar.thumb.enabled.color = #327378
@@ -153,8 +153,8 @@ editor.warning.underline.color = #99915B
 ## MarkerColumn - shows ticks adjacent the scroll bar ##
 
 # lines next to the scrollbar showing where errors are located
-editor.column.error.color = #ff5355
-editor.column.warning.color = #fed456
+editor.column.error.color = #FFFFF2
+editor.column.warning.color = #99915B
 
 
 ## ErrorTable - the list of errors in the second tab found in the console area ##
@@ -175,11 +175,11 @@ errors.indicator.warning.color = #ef8115
 
 ## ManagerTabs - tabs in the Contribution Manager ##
 
-manager.tab.selected.color = #00171C
-manager.tab.unselected.color = #00292E
+manager.tab.selected.color = #FFFFF2
+manager.tab.unselected.color = #99915B
 manager.tab.text.font = processing.sans,bold,14
-manager.tab.text.selected.color = #AFA663
-manager.tab.text.unselected.color = #547778
+manager.tab.text.selected.color = #000000
+manager.tab.text.unselected.color = #00171C
 manager.tab.gradient.top = #00474E
 manager.tab.gradient.bottom = #00474E
 
@@ -200,26 +200,26 @@ tree.font = processing.sans,plain,12
 # For an explanation of these tags, see Token.java:
 # processing/app/src/processing/app/syntax/Token.java
 
-editor.token.function1.style = #006699,plain
-editor.token.function2.style = #006699,plain
-editor.token.function3.style = #669900,plain
-editor.token.function4.style = #006699,bold
+editor.token.function1.style = #99A6EA,plain
+editor.token.function2.style = #99A6EA,plain
+editor.token.function3.style = #F133F3,plain
+editor.token.function4.style = #99A6EA,bold
 
-editor.token.keyword1.style = #33997e,plain
-editor.token.keyword2.style = #33997e,plain
-editor.token.keyword3.style = #669900,plain
-editor.token.keyword4.style = #d94a7a,plain
-editor.token.keyword5.style = #e2661a,plain
-editor.token.keyword6.style = #33997e,plain
+editor.token.keyword1.style = #664FE8,plain
+editor.token.keyword2.style = #664FE8,plain
+editor.token.keyword3.style = #F133F3,plain
+editor.token.keyword4.style = #DA3644,plain
+editor.token.keyword5.style = #FF7500,plain
+editor.token.keyword6.style = #664FE8,plain
 
-editor.token.literal1.style = #7D4793,plain
-editor.token.literal2.style = #718a62,plain
+editor.token.literal1.style = #008B7E,plain
+editor.token.literal2.style = #0071B9,plain
 
-editor.token.operator.style = #006699,plain
+editor.token.operator.style = #99A6EA,plain
 
-editor.token.label.style = #666666,bold
+editor.token.label.style = #5E5E59,bold
 
-editor.token.comment1.style = #666666,plain
-editor.token.comment2.style = #666666,plain
+editor.token.comment1.style = #5E5E59,plain
+editor.token.comment2.style = #5E5E59,plain
 
-editor.token.invalid.style = #666666,bold
+editor.token.invalid.style = #5E5E59,bold
diff --git a/build/shared/lib/themes/serandite.txt b/build/shared/lib/themes/serandite.txt
index 90bae019b..138ef3b62 100644
--- a/build/shared/lib/themes/serandite.txt
+++ b/build/shared/lib/themes/serandite.txt
@@ -52,13 +52,13 @@ toolbar.button.debug.selected.stroke = none
 
 ## EditorStatus - status message bar directly below the editor ##
 
-status.notice.fgcolor = #FFBA57
+status.notice.fgcolor = #FFA804
 status.notice.bgcolor = #C12200
-status.error.fgcolor = #FFFFF2
+status.error.fgcolor = #FF53DA
 status.error.bgcolor = #000000
 status.warning.bgcolor = #662140
-status.warning.fgcolor = #FFFFF2
-status.url.fgcolor = #cccccc
+status.warning.fgcolor = #FFA7DB
+status.url.fgcolor = #FFFFF2
 status.font = processing.sans,plain,13
 # For the clipboard icon, needs to be a little larger on macOS
 status.emoji.font = Dialog,plain,22
@@ -100,7 +100,7 @@ footer.updates.indicator.text.color = #440000
 console.color = #402E22
 console.output.color = #A28B7A
 # text color for errors printed in the console
-console.error.color = #FFAEC7
+console.error.color = #FF3CCD
 
 
 ## PdeTextAreaDefaults - default colors for the editor ##
@@ -127,7 +127,7 @@ editor.eolmarkers.color = #999999
 
 # bracket/brace highlighting
 editor.brackethighlight = true
-editor.brackethighlight.color = #006699
+editor.brackethighlight.color = #006696
 
 # colors for the custom scroll bar
 editor.scrollbar.thumb.enabled.color = #BC4000
@@ -153,8 +153,8 @@ editor.warning.underline.color = #662140
 ## MarkerColumn - shows ticks adjacent the scroll bar ##
 
 # lines next to the scrollbar showing where errors are located
-editor.column.error.color = #ff5355
-editor.column.warning.color = #fed456
+editor.column.error.color = #000000
+editor.column.warning.color = #662140
 
 
 ## ErrorTable - the list of errors in the second tab found in the console area ##
@@ -175,11 +175,11 @@ errors.indicator.warning.color = #ef8115
 
 ## ManagerTabs - tabs in the Contribution Manager ##
 
-manager.tab.selected.color = #FFC67F
-manager.tab.unselected.color = #FFA55F
+manager.tab.selected.color = #000000
+manager.tab.unselected.color = #662140
 manager.tab.text.font = processing.sans,bold,14
-manager.tab.text.selected.color = #5E0B36
-manager.tab.text.unselected.color = #984E1A
+manager.tab.text.selected.color = #FFFFF2
+manager.tab.text.unselected.color = #FFC67F
 manager.tab.gradient.top = #EC6800
 manager.tab.gradient.bottom = #EC6800
 
@@ -200,26 +200,26 @@ tree.font = processing.sans,plain,12
 # For an explanation of these tags, see Token.java:
 # processing/app/src/processing/app/syntax/Token.java
 
-editor.token.function1.style = #006699,plain
-editor.token.function2.style = #006699,plain
-editor.token.function3.style = #669900,plain
-editor.token.function4.style = #006699,bold
+editor.token.function1.style = #006696,plain
+editor.token.function2.style = #006696,plain
+editor.token.function3.style = #6D9800,plain
+editor.token.function4.style = #006696,bold
 
-editor.token.keyword1.style = #33997e,plain
-editor.token.keyword2.style = #33997e,plain
-editor.token.keyword3.style = #669900,plain
-editor.token.keyword4.style = #d94a7a,plain
-editor.token.keyword5.style = #e2661a,plain
-editor.token.keyword6.style = #33997e,plain
+editor.token.keyword1.style = #309879,plain
+editor.token.keyword2.style = #309879,plain
+editor.token.keyword3.style = #6D9800,plain
+editor.token.keyword4.style = #DB4D6E,plain
+editor.token.keyword5.style = #E76700,plain
+editor.token.keyword6.style = #309879,plain
 
-editor.token.literal1.style = #7D4793,plain
-editor.token.literal2.style = #718a62,plain
+editor.token.literal1.style = #738A5B,plain
+editor.token.literal2.style = #75488D,plain
 
-editor.token.operator.style = #006699,plain
+editor.token.operator.style = #006696,plain
 
-editor.token.label.style = #666666,bold
+editor.token.label.style = #656560,bold
 
-editor.token.comment1.style = #666666,plain
-editor.token.comment2.style = #666666,plain
+editor.token.comment1.style = #656560,plain
+editor.token.comment2.style = #656560,plain
 
-editor.token.invalid.style = #666666,bold
+editor.token.invalid.style = #656560,bold
diff --git a/todo.txt b/todo.txt
index 8d87ffedd..f96fb3438 100755
--- a/todo.txt
+++ b/todo.txt
@@ -6,6 +6,7 @@ X   working again in beta 3
 X change the jdk download to include the arch
 X   when building on macOS, can't share folder b/c jdk zip is wrong arch
 X   but also requires checkout of processing-docs, so an unnecessary headache
+X update themes with new token colors
 
 
 . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
@@ -58,16 +59,18 @@ _   or for now, tell users how to do it manually
 
 
 design
-_ implement document icons on Windows
-_ implement document icons on Linux
-_ redesign of the Contribution Manager
+_ console scroll bar colors
+_ errors table theme
+_ contrib manager theme
+_   implement updateTheme()
 _   identify coloring for icons
 _   how much of theme to inherit
 _   generate manager icons
+_ implement document icons on Windows
+_ implement document icons on Linux
 _ decision about 'debug' versions of toolbar icons
 _ put themes in folders by name
 _ add notes about params to the wiki
-_   new scrollbars
 
 
 ui is ugly on macOS