diff --git a/build/shared/lib/themes/antimony.txt b/build/shared/lib/themes/antimony.txt
index a45ac99ce..ecb1fc907 100644
--- a/build/shared/lib/themes/antimony.txt
+++ b/build/shared/lib/themes/antimony.txt
@@ -118,13 +118,13 @@ editor.gradient.top = #001F29
 editor.gradient.bottom = #001F29
 
 # highlight for the current line
-editor.linehighlight.color = #00182A
+editor.linehighlight.color = #161818
 # highlight for the current line
 editor.linehighlight=true
 
 editor.caret.color = #FFFFF2
 # also used by EditorHeader
-editor.selection.color = #002750
+editor.selection.color = #2A2D2C
 
 # little pooties at the end of lines that show where they finish
 editor.eolmarkers = false
@@ -159,7 +159,7 @@ editor.warning.underline.color = #727774
 
 # lines next to the scrollbar showing where errors are located
 editor.column.error.color = #FFFFF2
-editor.column.warning.color = #727774
+editor.column.warning.color = #365660
 
 
 ## ErrorTable - second tab below the console area, lists errors and warnings ##
@@ -171,21 +171,21 @@ errors.bgcolor = #00151F
 errors.row.font = processing.sans,plain,12
 errors.row.fgcolor = #FFFFF2
 errors.row.bgcolor = #004AA8
-errors.selection.fgcolor = #242424
-errors.selection.bgcolor = #e5e5e5
-errors.selection.error.bgcolor = #f5e6e6
-errors.selection.warning.bgcolor = #fdf2e7
+errors.selection.fgcolor = #000000
+errors.selection.bgcolor = #727774
+errors.selection.error.bgcolor = #000000
+errors.selection.warning.bgcolor = #00509D
 errors.indicator.error.color = #FFFFF2
 errors.indicator.warning.color = #0086EA
 
 
 ## ManagerTabs - tabs in the Contribution Manager ##
 
-manager.tab.selected.color = #FFFFF2
-manager.tab.unselected.color = #727774
+manager.tab.selected.color = #000C16
+manager.tab.unselected.color = #001921
 manager.tab.text.font = processing.sans,bold,14
-manager.tab.text.selected.color = #000000
-manager.tab.text.unselected.color = #000C16
+manager.tab.text.selected.color = #FFFFF2
+manager.tab.text.unselected.color = #6B8489
 manager.tab.gradient.top = #001F29
 manager.tab.gradient.bottom = #001F29
 
@@ -196,12 +196,21 @@ manager.tab.gradient.bottom = #001F29
 manager.tab.background = #001F29
 
 
+## ContributionTab
+
+manager.list.search.text.color = #000000
+manager.list.search.placeholder.color = #cccccc
+manager.list.search.background.color = #ffffff
+
+
 ## ListPanel – the listing inside a Contribution Manager tab ##
 
+manager.list.background.color = #000C16
 manager.list.header.color = #EBEBEB
 manager.list.section.color = #f8f8f8
-manager.list.row.color = #FFFFFF
-manager.list.selection.color = #e0fffd
+manager.list.selection.color = #657D82
+manager.list.text.color = #000000
+manager.list.incompatible.color = #CCCCCC
 
 
 ## ZoomTreeCellRenderer - tree for Examples and Sketchbook windows ##
diff --git a/build/shared/lib/themes/bauxite.txt b/build/shared/lib/themes/bauxite.txt
index 56e8bc0f2..f9272fd05 100644
--- a/build/shared/lib/themes/bauxite.txt
+++ b/build/shared/lib/themes/bauxite.txt
@@ -118,13 +118,13 @@ editor.gradient.top = #3E4249
 editor.gradient.bottom = #3E4249
 
 # highlight for the current line
-editor.linehighlight.color = #270700
+editor.linehighlight.color = #3C1700
 # highlight for the current line
 editor.linehighlight=true
 
 editor.caret.color = #FFFFF2
 # also used by EditorHeader
-editor.selection.color = #3E0900
+editor.selection.color = #592900
 
 # little pooties at the end of lines that show where they finish
 editor.eolmarkers = false
@@ -159,7 +159,7 @@ editor.warning.underline.color = #F8951D
 
 # lines next to the scrollbar showing where errors are located
 editor.column.error.color = #FFFFF2
-editor.column.warning.color = #F8951D
+editor.column.warning.color = #7A7E84
 
 
 ## ErrorTable - second tab below the console area, lists errors and warnings ##
@@ -171,21 +171,21 @@ errors.bgcolor = #1F232B
 errors.row.font = processing.sans,plain,12
 errors.row.fgcolor = #FFFFF2
 errors.row.bgcolor = #A03000
-errors.selection.fgcolor = #242424
-errors.selection.bgcolor = #e5e5e5
-errors.selection.error.bgcolor = #f5e6e6
-errors.selection.warning.bgcolor = #fdf2e7
+errors.selection.fgcolor = #000000
+errors.selection.bgcolor = #F8951D
+errors.selection.error.bgcolor = #000000
+errors.selection.warning.bgcolor = #923600
 errors.indicator.error.color = #FFFFF2
 errors.indicator.warning.color = #DC6100
 
 
 ## ManagerTabs - tabs in the Contribution Manager ##
 
-manager.tab.selected.color = #FFFFF2
-manager.tab.unselected.color = #F8951D
+manager.tab.selected.color = #0F1218
+manager.tab.unselected.color = #2F3238
 manager.tab.text.font = processing.sans,bold,14
-manager.tab.text.selected.color = #000000
-manager.tab.text.unselected.color = #0F1218
+manager.tab.text.selected.color = #FFFFF2
+manager.tab.text.unselected.color = #8E9194
 manager.tab.gradient.top = #3E4249
 manager.tab.gradient.bottom = #3E4249
 
@@ -196,12 +196,21 @@ manager.tab.gradient.bottom = #3E4249
 manager.tab.background = #3E4249
 
 
+## ContributionTab
+
+manager.list.search.text.color = #000000
+manager.list.search.placeholder.color = #cccccc
+manager.list.search.background.color = #ffffff
+
+
 ## ListPanel – the listing inside a Contribution Manager tab ##
 
+manager.list.background.color = #0F1218
 manager.list.header.color = #EBEBEB
 manager.list.section.color = #f8f8f8
-manager.list.row.color = #FFFFFF
-manager.list.selection.color = #e0fffd
+manager.list.selection.color = #7A7D81
+manager.list.text.color = #000000
+manager.list.incompatible.color = #CCCCCC
 
 
 ## ZoomTreeCellRenderer - tree for Examples and Sketchbook windows ##
diff --git a/build/shared/lib/themes/beryl.txt b/build/shared/lib/themes/beryl.txt
index 36e0089cc..626c6ee06 100644
--- a/build/shared/lib/themes/beryl.txt
+++ b/build/shared/lib/themes/beryl.txt
@@ -21,15 +21,15 @@ toolbar.button.disabled.field = #008763
 toolbar.button.disabled.glyph = #007250
 toolbar.button.disabled.stroke = none
 toolbar.button.enabled.field = #FFFFF2
-toolbar.button.enabled.glyph = #00AAE6
+toolbar.button.enabled.glyph = #0081BC
 toolbar.button.enabled.stroke = none
-toolbar.button.pressed.field = #00AAE6
+toolbar.button.pressed.field = #00649E
 toolbar.button.pressed.glyph = #FFFFF2
 toolbar.button.pressed.stroke = #FFFFF2
 toolbar.button.rollover.field = #FFFFF2
-toolbar.button.rollover.glyph = #00323D
+toolbar.button.rollover.glyph = #001D2E
 toolbar.button.rollover.stroke = none
-toolbar.button.selected.field = #002340
+toolbar.button.selected.field = #001D2E
 toolbar.button.selected.glyph = #FFFFF2
 toolbar.button.selected.stroke = none
 
@@ -118,13 +118,13 @@ editor.gradient.top = #009D76
 editor.gradient.bottom = #009D76
 
 # highlight for the current line
-editor.linehighlight.color = #B2FFFF
+editor.linehighlight.color = #C5F9FF
 # highlight for the current line
 editor.linehighlight=true
 
 editor.caret.color = #000000
 # also used by EditorHeader
-editor.selection.color = #00FFFF
+editor.selection.color = #A3DDE6
 
 # little pooties at the end of lines that show where they finish
 editor.eolmarkers = false
@@ -159,7 +159,7 @@ editor.warning.underline.color = #004A59
 
 # lines next to the scrollbar showing where errors are located
 editor.column.error.color = #000000
-editor.column.warning.color = #004A59
+editor.column.warning.color = #56FFE8
 
 
 ## ErrorTable - second tab below the console area, lists errors and warnings ##
@@ -171,21 +171,21 @@ errors.bgcolor = #005336
 errors.row.font = processing.sans,plain,12
 errors.row.fgcolor = #000000
 errors.row.bgcolor = #00B9FF
-errors.selection.fgcolor = #242424
-errors.selection.bgcolor = #e5e5e5
-errors.selection.error.bgcolor = #f5e6e6
-errors.selection.warning.bgcolor = #fdf2e7
+errors.selection.fgcolor = #FFFFF2
+errors.selection.bgcolor = #004A59
+errors.selection.error.bgcolor = #FFFFF2
+errors.selection.warning.bgcolor = #00BBFF
 errors.indicator.error.color = #000000
 errors.indicator.warning.color = #0085E5
 
 
 ## ManagerTabs - tabs in the Contribution Manager ##
 
-manager.tab.selected.color = #000000
-manager.tab.unselected.color = #004A59
+manager.tab.selected.color = #73F5CD
+manager.tab.unselected.color = #03B893
 manager.tab.text.font = processing.sans,bold,14
-manager.tab.text.selected.color = #FFFFF2
-manager.tab.text.unselected.color = #73F5CD
+manager.tab.text.selected.color = #000000
+manager.tab.text.unselected.color = #005E43
 manager.tab.gradient.top = #009D76
 manager.tab.gradient.bottom = #009D76
 
@@ -196,12 +196,21 @@ manager.tab.gradient.bottom = #009D76
 manager.tab.background = #009D76
 
 
+## ContributionTab
+
+manager.list.search.text.color = #000000
+manager.list.search.placeholder.color = #cccccc
+manager.list.search.background.color = #ffffff
+
+
 ## ListPanel – the listing inside a Contribution Manager tab ##
 
+manager.list.background.color = #73F5CD
 manager.list.header.color = #EBEBEB
 manager.list.section.color = #f8f8f8
-manager.list.row.color = #FFFFFF
-manager.list.selection.color = #e0fffd
+manager.list.selection.color = #007A5D
+manager.list.text.color = #000000
+manager.list.incompatible.color = #CCCCCC
 
 
 ## ZoomTreeCellRenderer - tree for Examples and Sketchbook windows ##
diff --git a/build/shared/lib/themes/calcite.txt b/build/shared/lib/themes/calcite.txt
index 6e3343f43..01329efad 100644
--- a/build/shared/lib/themes/calcite.txt
+++ b/build/shared/lib/themes/calcite.txt
@@ -21,15 +21,15 @@ toolbar.button.disabled.field = #B5B8B7
 toolbar.button.disabled.glyph = #9FA3A2
 toolbar.button.disabled.stroke = none
 toolbar.button.enabled.field = #FFFFF2
-toolbar.button.enabled.glyph = #0096F4
+toolbar.button.enabled.glyph = #0FA7FF
 toolbar.button.enabled.stroke = none
-toolbar.button.pressed.field = #0096F4
+toolbar.button.pressed.field = #007CD7
 toolbar.button.pressed.glyph = #FFFFF2
 toolbar.button.pressed.stroke = #FFFFF2
 toolbar.button.rollover.field = #FFFFF2
-toolbar.button.rollover.glyph = #062945
+toolbar.button.rollover.glyph = #005084
 toolbar.button.rollover.stroke = none
-toolbar.button.selected.field = #00163E
+toolbar.button.selected.field = #005084
 toolbar.button.selected.glyph = #FFFFF2
 toolbar.button.selected.stroke = none
 
@@ -54,8 +54,8 @@ toolbar.button.debug.selected.stroke = none
 
 status.notice.fgcolor = #1A1F23
 status.notice.bgcolor = #878B8D
-status.error.fgcolor = #00CEFF
-status.error.bgcolor = #000000
+status.error.fgcolor = #FFFFF2
+status.error.bgcolor = #C40000
 status.warning.bgcolor = #033D64
 status.warning.fgcolor = #80D9FF
 status.url.fgcolor = #FFFFF2
@@ -118,13 +118,13 @@ editor.gradient.top = #CBCECC
 editor.gradient.bottom = #CBCECC
 
 # highlight for the current line
-editor.linehighlight.color = #E3F9FF
+editor.linehighlight.color = #E3F1FE
 # highlight for the current line
 editor.linehighlight=true
 
 editor.caret.color = #000000
 # also used by EditorHeader
-editor.selection.color = #C0F4FF
+editor.selection.color = #C5D5E6
 
 # little pooties at the end of lines that show where they finish
 editor.eolmarkers = false
@@ -150,7 +150,7 @@ editor.gutter.text.color = #000009
 editor.gutter.linehighlight.color = #929696
 
 # squiggly line underneath errors in the editor
-editor.error.underline.color = #000000
+editor.error.underline.color = #FF0000
 # squiggly line underneath warnings
 editor.warning.underline.color = #033D64
 
@@ -158,8 +158,8 @@ editor.warning.underline.color = #033D64
 ## MarkerColumn - shows ticks adjacent the scroll bar ##
 
 # lines next to the scrollbar showing where errors are located
-editor.column.error.color = #000000
-editor.column.warning.color = #033D64
+editor.column.error.color = #BE0000
+editor.column.warning.color = #FBFFFA
 
 
 ## ErrorTable - second tab below the console area, lists errors and warnings ##
@@ -171,21 +171,21 @@ errors.bgcolor = #5E6263
 errors.row.font = processing.sans,plain,12
 errors.row.fgcolor = #000000
 errors.row.bgcolor = #00DCFF
-errors.selection.fgcolor = #242424
-errors.selection.bgcolor = #e5e5e5
-errors.selection.error.bgcolor = #f5e6e6
-errors.selection.warning.bgcolor = #fdf2e7
+errors.selection.fgcolor = #FFFFF2
+errors.selection.bgcolor = #033D64
+errors.selection.error.bgcolor = #FFFFF2
+errors.selection.warning.bgcolor = #009DFF
 errors.indicator.error.color = #000000
 errors.indicator.warning.color = #0098FF
 
 
 ## ManagerTabs - tabs in the Contribution Manager ##
 
-manager.tab.selected.color = #000000
-manager.tab.unselected.color = #033D64
+manager.tab.selected.color = #EFF2ED
+manager.tab.unselected.color = #D7DAD6
 manager.tab.text.font = processing.sans,bold,14
-manager.tab.text.selected.color = #FFFFF2
-manager.tab.text.unselected.color = #EFF2ED
+manager.tab.text.selected.color = #000000
+manager.tab.text.unselected.color = #646767
 manager.tab.gradient.top = #CBCECC
 manager.tab.gradient.bottom = #CBCECC
 
@@ -196,12 +196,21 @@ manager.tab.gradient.bottom = #CBCECC
 manager.tab.background = #CBCECC
 
 
+## ContributionTab
+
+manager.list.search.text.color = #000000
+manager.list.search.placeholder.color = #cccccc
+manager.list.search.background.color = #ffffff
+
+
 ## ListPanel – the listing inside a Contribution Manager tab ##
 
+manager.list.background.color = #EFF2ED
 manager.list.header.color = #EBEBEB
 manager.list.section.color = #f8f8f8
-manager.list.row.color = #FFFFFF
-manager.list.selection.color = #e0fffd
+manager.list.selection.color = #6F7171
+manager.list.text.color = #000000
+manager.list.incompatible.color = #CCCCCC
 
 
 ## ZoomTreeCellRenderer - tree for Examples and Sketchbook windows ##
diff --git a/build/shared/lib/themes/feldspar.txt b/build/shared/lib/themes/feldspar.txt
index 52f89a6cb..af41f49a1 100644
--- a/build/shared/lib/themes/feldspar.txt
+++ b/build/shared/lib/themes/feldspar.txt
@@ -21,15 +21,15 @@ toolbar.button.disabled.field = #B58353
 toolbar.button.disabled.glyph = #9E6E40
 toolbar.button.disabled.stroke = none
 toolbar.button.enabled.field = #FFFFF2
-toolbar.button.enabled.glyph = #E46F00
+toolbar.button.enabled.glyph = #D05F00
 toolbar.button.enabled.stroke = none
-toolbar.button.pressed.field = #E46F00
+toolbar.button.pressed.field = #A63C00
 toolbar.button.pressed.glyph = #FFFFF2
 toolbar.button.pressed.stroke = #FFFFF2
 toolbar.button.rollover.field = #FFFFF2
-toolbar.button.rollover.glyph = #421300
+toolbar.button.rollover.glyph = #5C0800
 toolbar.button.rollover.stroke = none
-toolbar.button.selected.field = #310000
+toolbar.button.selected.field = #5C0800
 toolbar.button.selected.glyph = #FFFFF2
 toolbar.button.selected.stroke = none
 
@@ -118,13 +118,13 @@ editor.gradient.top = #CC9866
 editor.gradient.bottom = #CC9866
 
 # highlight for the current line
-editor.linehighlight.color = #FFEFC3
+editor.linehighlight.color = #FFEBCA
 # highlight for the current line
 editor.linehighlight=true
 
 editor.caret.color = #000000
 # also used by EditorHeader
-editor.selection.color = #FFDF91
+editor.selection.color = #EECEAC
 
 # little pooties at the end of lines that show where they finish
 editor.eolmarkers = false
@@ -159,7 +159,7 @@ editor.warning.underline.color = #5B1B00
 
 # lines next to the scrollbar showing where errors are located
 editor.column.error.color = #000000
-editor.column.warning.color = #5B1B00
+editor.column.warning.color = #FFF3BA
 
 
 ## ErrorTable - second tab below the console area, lists errors and warnings ##
@@ -171,21 +171,21 @@ errors.bgcolor = #6F4418
 errors.row.font = processing.sans,plain,12
 errors.row.fgcolor = #000000
 errors.row.bgcolor = #FF8900
-errors.selection.fgcolor = #242424
-errors.selection.bgcolor = #e5e5e5
-errors.selection.error.bgcolor = #f5e6e6
-errors.selection.warning.bgcolor = #fdf2e7
+errors.selection.fgcolor = #FFFFF2
+errors.selection.bgcolor = #5B1B00
+errors.selection.error.bgcolor = #FFFFF2
+errors.selection.warning.bgcolor = #DF7300
 errors.indicator.error.color = #000000
 errors.indicator.warning.color = #C85100
 
 
 ## ManagerTabs - tabs in the Contribution Manager ##
 
-manager.tab.selected.color = #000000
-manager.tab.unselected.color = #5B1B00
+manager.tab.selected.color = #FFDEB3
+manager.tab.unselected.color = #DCB086
 manager.tab.text.font = processing.sans,bold,14
-manager.tab.text.selected.color = #FFFFF2
-manager.tab.text.unselected.color = #FFDEB3
+manager.tab.text.selected.color = #000000
+manager.tab.text.unselected.color = #74502D
 manager.tab.gradient.top = #CC9866
 manager.tab.gradient.bottom = #CC9866
 
@@ -196,12 +196,21 @@ manager.tab.gradient.bottom = #CC9866
 manager.tab.background = #CC9866
 
 
+## ContributionTab
+
+manager.list.search.text.color = #000000
+manager.list.search.placeholder.color = #cccccc
+manager.list.search.background.color = #ffffff
+
+
 ## ListPanel – the listing inside a Contribution Manager tab ##
 
+manager.list.background.color = #FFDEB3
 manager.list.header.color = #EBEBEB
 manager.list.section.color = #f8f8f8
-manager.list.row.color = #FFFFFF
-manager.list.selection.color = #e0fffd
+manager.list.selection.color = #896542
+manager.list.text.color = #000000
+manager.list.incompatible.color = #CCCCCC
 
 
 ## ZoomTreeCellRenderer - tree for Examples and Sketchbook windows ##
diff --git a/build/shared/lib/themes/fluorite.txt b/build/shared/lib/themes/fluorite.txt
index 4a1022715..cb8259459 100644
--- a/build/shared/lib/themes/fluorite.txt
+++ b/build/shared/lib/themes/fluorite.txt
@@ -118,13 +118,13 @@ editor.gradient.top = #301751
 editor.gradient.bottom = #301751
 
 # highlight for the current line
-editor.linehighlight.color = #1A0629
+editor.linehighlight.color = #1C1A1C
 # highlight for the current line
 editor.linehighlight=true
 
 editor.caret.color = #FFFFF2
 # also used by EditorHeader
-editor.selection.color = #28034F
+editor.selection.color = #312E31
 
 # little pooties at the end of lines that show where they finish
 editor.eolmarkers = false
@@ -159,7 +159,7 @@ editor.warning.underline.color = #A49EA1
 
 # lines next to the scrollbar showing where errors are located
 editor.column.error.color = #FFFFF2
-editor.column.warning.color = #A49EA1
+editor.column.warning.color = #6F508E
 
 
 ## ErrorTable - second tab below the console area, lists errors and warnings ##
@@ -171,21 +171,21 @@ errors.bgcolor = #1E0740
 errors.row.font = processing.sans,plain,12
 errors.row.fgcolor = #FFFFF2
 errors.row.bgcolor = #5200B3
-errors.selection.fgcolor = #242424
-errors.selection.bgcolor = #e5e5e5
-errors.selection.error.bgcolor = #f5e6e6
-errors.selection.warning.bgcolor = #fdf2e7
+errors.selection.fgcolor = #000000
+errors.selection.bgcolor = #A49EA1
+errors.selection.error.bgcolor = #000000
+errors.selection.warning.bgcolor = #6822B2
 errors.indicator.error.color = #FFFFF2
 errors.indicator.warning.color = #963EF2
 
 
 ## ManagerTabs - tabs in the Contribution Manager ##
 
-manager.tab.selected.color = #FFFFF2
-manager.tab.unselected.color = #A49EA1
+manager.tab.selected.color = #17002B
+manager.tab.unselected.color = #27133F
 manager.tab.text.font = processing.sans,bold,14
-manager.tab.text.selected.color = #000000
-manager.tab.text.unselected.color = #17002B
+manager.tab.text.selected.color = #FFFFF2
+manager.tab.text.unselected.color = #957AAC
 manager.tab.gradient.top = #301751
 manager.tab.gradient.bottom = #301751
 
@@ -196,12 +196,21 @@ manager.tab.gradient.bottom = #301751
 manager.tab.background = #301751
 
 
+## ContributionTab
+
+manager.list.search.text.color = #000000
+manager.list.search.placeholder.color = #cccccc
+manager.list.search.background.color = #ffffff
+
+
 ## ListPanel – the listing inside a Contribution Manager tab ##
 
+manager.list.background.color = #17002B
 manager.list.header.color = #EBEBEB
 manager.list.section.color = #f8f8f8
-manager.list.row.color = #FFFFFF
-manager.list.selection.color = #e0fffd
+manager.list.selection.color = #89709E
+manager.list.text.color = #000000
+manager.list.incompatible.color = #CCCCCC
 
 
 ## ZoomTreeCellRenderer - tree for Examples and Sketchbook windows ##
diff --git a/build/shared/lib/themes/gabbro.txt b/build/shared/lib/themes/gabbro.txt
index d5282ea30..725c727d4 100644
--- a/build/shared/lib/themes/gabbro.txt
+++ b/build/shared/lib/themes/gabbro.txt
@@ -21,15 +21,15 @@ toolbar.button.disabled.field = #72805D
 toolbar.button.disabled.glyph = #5E6C4B
 toolbar.button.disabled.stroke = none
 toolbar.button.enabled.field = #FFFFF2
-toolbar.button.enabled.glyph = #4BA400
+toolbar.button.enabled.glyph = #238400
 toolbar.button.enabled.stroke = none
-toolbar.button.pressed.field = #4BA400
+toolbar.button.pressed.field = #006500
 toolbar.button.pressed.glyph = #FFFFF2
 toolbar.button.pressed.stroke = #FFFFF2
 toolbar.button.rollover.field = #FFFFF2
-toolbar.button.rollover.glyph = #132D00
+toolbar.button.rollover.glyph = #002400
 toolbar.button.rollover.stroke = none
-toolbar.button.selected.field = #001C00
+toolbar.button.selected.field = #002400
 toolbar.button.selected.glyph = #FFFFF2
 toolbar.button.selected.stroke = none
 
@@ -118,13 +118,13 @@ editor.gradient.top = #869570
 editor.gradient.bottom = #869570
 
 # highlight for the current line
-editor.linehighlight.color = #E7FFC4
+editor.linehighlight.color = #E6F5CB
 # highlight for the current line
 editor.linehighlight=true
 
 editor.caret.color = #000000
 # also used by EditorHeader
-editor.selection.color = #CDFF95
+editor.selection.color = #C8D9AD
 
 # little pooties at the end of lines that show where they finish
 editor.eolmarkers = false
@@ -159,7 +159,7 @@ editor.warning.underline.color = #194200
 
 # lines next to the scrollbar showing where errors are located
 editor.column.error.color = #000000
-editor.column.warning.color = #194200
+editor.column.warning.color = #F4FFD7
 
 
 ## ErrorTable - second tab below the console area, lists errors and warnings ##
@@ -171,21 +171,21 @@ errors.bgcolor = #3D4A2C
 errors.row.font = processing.sans,plain,12
 errors.row.fgcolor = #000000
 errors.row.bgcolor = #38B500
-errors.selection.fgcolor = #242424
-errors.selection.bgcolor = #e5e5e5
-errors.selection.error.bgcolor = #f5e6e6
-errors.selection.warning.bgcolor = #fdf2e7
+errors.selection.fgcolor = #FFFFF2
+errors.selection.bgcolor = #194200
+errors.selection.error.bgcolor = #FFFFF2
+errors.selection.warning.bgcolor = #4DAA00
 errors.indicator.error.color = #000000
 errors.indicator.warning.color = #008000
 
 
 ## ManagerTabs - tabs in the Contribution Manager ##
 
-manager.tab.selected.color = #000000
-manager.tab.unselected.color = #194200
+manager.tab.selected.color = #DAE6C3
+manager.tab.unselected.color = #A2AF8E
 manager.tab.text.font = processing.sans,bold,14
-manager.tab.text.selected.color = #FFFFF2
-manager.tab.text.unselected.color = #DAE6C3
+manager.tab.text.selected.color = #000000
+manager.tab.text.unselected.color = #4A553C
 manager.tab.gradient.top = #869570
 manager.tab.gradient.bottom = #869570
 
@@ -196,12 +196,21 @@ manager.tab.gradient.bottom = #869570
 manager.tab.background = #869570
 
 
+## ContributionTab
+
+manager.list.search.text.color = #000000
+manager.list.search.placeholder.color = #cccccc
+manager.list.search.background.color = #ffffff
+
+
 ## ListPanel – the listing inside a Contribution Manager tab ##
 
+manager.list.background.color = #DAE6C3
 manager.list.header.color = #EBEBEB
 manager.list.section.color = #f8f8f8
-manager.list.row.color = #FFFFFF
-manager.list.selection.color = #e0fffd
+manager.list.selection.color = #636D53
+manager.list.text.color = #000000
+manager.list.incompatible.color = #CCCCCC
 
 
 ## ZoomTreeCellRenderer - tree for Examples and Sketchbook windows ##
diff --git a/build/shared/lib/themes/galena.txt b/build/shared/lib/themes/galena.txt
index 3620868b2..47f4c972f 100644
--- a/build/shared/lib/themes/galena.txt
+++ b/build/shared/lib/themes/galena.txt
@@ -21,15 +21,15 @@ toolbar.button.disabled.field = #626567
 toolbar.button.disabled.glyph = #4F5254
 toolbar.button.disabled.stroke = none
 toolbar.button.enabled.field = #FFFFF2
-toolbar.button.enabled.glyph = #5394D4
+toolbar.button.enabled.glyph = #0063A1
 toolbar.button.enabled.stroke = none
-toolbar.button.pressed.field = #5394D4
+toolbar.button.pressed.field = #004B86
 toolbar.button.pressed.glyph = #FFFFF2
 toolbar.button.pressed.stroke = #FFFFF2
 toolbar.button.rollover.field = #FFFFF2
-toolbar.button.rollover.glyph = #2D2F31
+toolbar.button.rollover.glyph = #00040E
 toolbar.button.rollover.stroke = none
-toolbar.button.selected.field = #001940
+toolbar.button.selected.field = #00040E
 toolbar.button.selected.glyph = #FFFFF2
 toolbar.button.selected.stroke = none
 
@@ -54,8 +54,8 @@ toolbar.button.debug.selected.stroke = none
 
 status.notice.fgcolor = #D5DAD9
 status.notice.bgcolor = #4F5457
-status.error.fgcolor = #00CEFF
-status.error.bgcolor = #000000
+status.error.fgcolor = #FFFFF2
+status.error.bgcolor = #8F0000
 status.warning.bgcolor = #434649
 status.warning.fgcolor = #ACDAFF
 status.url.fgcolor = #FFFFF2
@@ -118,13 +118,13 @@ editor.gradient.top = #76797A
 editor.gradient.bottom = #76797A
 
 # highlight for the current line
-editor.linehighlight.color = #E3F9FF
+editor.linehighlight.color = #E3F1FE
 # highlight for the current line
 editor.linehighlight=true
 
 editor.caret.color = #000000
 # also used by EditorHeader
-editor.selection.color = #C0F4FF
+editor.selection.color = #C5D5E6
 
 # little pooties at the end of lines that show where they finish
 editor.eolmarkers = false
@@ -150,7 +150,7 @@ editor.gutter.text.color = #000009
 editor.gutter.linehighlight.color = #565A5C
 
 # squiggly line underneath errors in the editor
-editor.error.underline.color = #000000
+editor.error.underline.color = #FF0000
 # squiggly line underneath warnings
 editor.warning.underline.color = #434649
 
@@ -158,8 +158,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 = #000000
-editor.column.warning.color = #434649
+editor.column.error.color = #9C0000
+editor.column.warning.color = #FBFFFA
 
 
 ## ErrorTable - second tab below the console area, lists errors and warnings ##
@@ -171,21 +171,21 @@ errors.bgcolor = #393C3F
 errors.row.font = processing.sans,plain,12
 errors.row.fgcolor = #000000
 errors.row.bgcolor = #0091FF
-errors.selection.fgcolor = #242424
-errors.selection.bgcolor = #e5e5e5
-errors.selection.error.bgcolor = #f5e6e6
-errors.selection.warning.bgcolor = #fdf2e7
+errors.selection.fgcolor = #FFFFF2
+errors.selection.bgcolor = #434649
+errors.selection.error.bgcolor = #FFFFF2
+errors.selection.warning.bgcolor = #00A4FF
 errors.indicator.error.color = #000000
 errors.indicator.warning.color = #0067DC
 
 
 ## ManagerTabs - tabs in the Contribution Manager ##
 
-manager.tab.selected.color = #000000
-manager.tab.unselected.color = #434649
+manager.tab.selected.color = #D9DCD7
+manager.tab.unselected.color = #969997
 manager.tab.text.font = processing.sans,bold,14
-manager.tab.text.selected.color = #FFFFF2
-manager.tab.text.unselected.color = #D9DCD7
+manager.tab.text.selected.color = #000000
+manager.tab.text.unselected.color = #474A4B
 manager.tab.gradient.top = #76797A
 manager.tab.gradient.bottom = #76797A
 
@@ -196,12 +196,21 @@ manager.tab.gradient.bottom = #76797A
 manager.tab.background = #76797A
 
 
+## ContributionTab
+
+manager.list.search.text.color = #000000
+manager.list.search.placeholder.color = #cccccc
+manager.list.search.background.color = #ffffff
+
+
 ## ListPanel – the listing inside a Contribution Manager tab ##
 
+manager.list.background.color = #D9DCD7
 manager.list.header.color = #EBEBEB
 manager.list.section.color = #f8f8f8
-manager.list.row.color = #FFFFFF
-manager.list.selection.color = #e0fffd
+manager.list.selection.color = #656767
+manager.list.text.color = #000000
+manager.list.incompatible.color = #CCCCCC
 
 
 ## ZoomTreeCellRenderer - tree for Examples and Sketchbook windows ##
diff --git a/build/shared/lib/themes/garnet.txt b/build/shared/lib/themes/garnet.txt
index 4487c56cc..7f0853322 100644
--- a/build/shared/lib/themes/garnet.txt
+++ b/build/shared/lib/themes/garnet.txt
@@ -118,13 +118,13 @@ editor.gradient.top = #88272C
 editor.gradient.bottom = #88272C
 
 # highlight for the current line
-editor.linehighlight.color = #290200
+editor.linehighlight.color = #490B10
 # highlight for the current line
 editor.linehighlight=true
 
 editor.caret.color = #FFFFF2
 # also used by EditorHeader
-editor.selection.color = #470000
+editor.selection.color = #6C1A1F
 
 # little pooties at the end of lines that show where they finish
 editor.eolmarkers = false
@@ -159,7 +159,7 @@ editor.warning.underline.color = #FF9490
 
 # lines next to the scrollbar showing where errors are located
 editor.column.error.color = #FFFFF2
-editor.column.warning.color = #FF9490
+editor.column.warning.color = #D16865
 
 
 ## ErrorTable - second tab below the console area, lists errors and warnings ##
@@ -171,21 +171,21 @@ errors.bgcolor = #5B000A
 errors.row.font = processing.sans,plain,12
 errors.row.fgcolor = #FFFFF2
 errors.row.bgcolor = #CB0022
-errors.selection.fgcolor = #242424
-errors.selection.bgcolor = #e5e5e5
-errors.selection.error.bgcolor = #f5e6e6
-errors.selection.warning.bgcolor = #fdf2e7
+errors.selection.fgcolor = #000000
+errors.selection.bgcolor = #FF9490
+errors.selection.error.bgcolor = #000000
+errors.selection.warning.bgcolor = #BA0D2C
 errors.indicator.error.color = #FFFFF2
 errors.indicator.warning.color = #FF384D
 
 
 ## ManagerTabs - tabs in the Contribution Manager ##
 
-manager.tab.selected.color = #FFFFF2
-manager.tab.unselected.color = #FF9490
+manager.tab.selected.color = #380000
+manager.tab.unselected.color = #681E21
 manager.tab.text.font = processing.sans,bold,14
-manager.tab.text.selected.color = #000000
-manager.tab.text.unselected.color = #380000
+manager.tab.text.selected.color = #FFFFF2
+manager.tab.text.unselected.color = #D37D77
 manager.tab.gradient.top = #88272C
 manager.tab.gradient.bottom = #88272C
 
@@ -196,12 +196,21 @@ manager.tab.gradient.bottom = #88272C
 manager.tab.background = #88272C
 
 
+## ContributionTab
+
+manager.list.search.text.color = #000000
+manager.list.search.placeholder.color = #cccccc
+manager.list.search.background.color = #ffffff
+
+
 ## ListPanel – the listing inside a Contribution Manager tab ##
 
+manager.list.background.color = #380000
 manager.list.header.color = #EBEBEB
 manager.list.section.color = #f8f8f8
-manager.list.row.color = #FFFFFF
-manager.list.selection.color = #e0fffd
+manager.list.selection.color = #B66963
+manager.list.text.color = #000000
+manager.list.incompatible.color = #CCCCCC
 
 
 ## ZoomTreeCellRenderer - tree for Examples and Sketchbook windows ##
diff --git a/build/shared/lib/themes/jasper.txt b/build/shared/lib/themes/jasper.txt
index b3786819f..ec2dabf35 100644
--- a/build/shared/lib/themes/jasper.txt
+++ b/build/shared/lib/themes/jasper.txt
@@ -21,15 +21,15 @@ toolbar.button.disabled.field = #BF2B13
 toolbar.button.disabled.glyph = #A70700
 toolbar.button.disabled.stroke = none
 toolbar.button.enabled.field = #FFFFF2
-toolbar.button.enabled.glyph = #EA674D
+toolbar.button.enabled.glyph = #AF321E
 toolbar.button.enabled.stroke = none
-toolbar.button.pressed.field = #EA674D
+toolbar.button.pressed.field = #901100
 toolbar.button.pressed.glyph = #FFFFF2
 toolbar.button.pressed.stroke = #FFFFF2
 toolbar.button.rollover.field = #FFFFF2
-toolbar.button.rollover.glyph = #760000
+toolbar.button.rollover.glyph = #620000
 toolbar.button.rollover.stroke = none
-toolbar.button.selected.field = #360000
+toolbar.button.selected.field = #620000
 toolbar.button.selected.glyph = #FFFFF2
 toolbar.button.selected.stroke = none
 
@@ -118,13 +118,13 @@ editor.gradient.top = #D8432A
 editor.gradient.bottom = #D8432A
 
 # highlight for the current line
-editor.linehighlight.color = #FFEAD4
+editor.linehighlight.color = #FFE7D5
 # highlight for the current line
 editor.linehighlight=true
 
 editor.caret.color = #000000
 # also used by EditorHeader
-editor.selection.color = #FFD3B5
+editor.selection.color = #F5CAB8
 
 # little pooties at the end of lines that show where they finish
 editor.eolmarkers = false
@@ -159,7 +159,7 @@ editor.warning.underline.color = #790000
 
 # lines next to the scrollbar showing where errors are located
 editor.column.error.color = #000000
-editor.column.warning.color = #790000
+editor.column.warning.color = #FFCEA8
 
 
 ## ErrorTable - second tab below the console area, lists errors and warnings ##
@@ -171,21 +171,21 @@ errors.bgcolor = #890000
 errors.row.font = processing.sans,plain,12
 errors.row.fgcolor = #000000
 errors.row.bgcolor = #FF310F
-errors.selection.fgcolor = #242424
-errors.selection.bgcolor = #e5e5e5
-errors.selection.error.bgcolor = #f5e6e6
-errors.selection.warning.bgcolor = #fdf2e7
+errors.selection.fgcolor = #FFFFF2
+errors.selection.bgcolor = #790000
+errors.selection.error.bgcolor = #FFFFF2
+errors.selection.warning.bgcolor = #F54E32
 errors.indicator.error.color = #000000
 errors.indicator.warning.color = #CC0000
 
 
 ## ManagerTabs - tabs in the Contribution Manager ##
 
-manager.tab.selected.color = #000000
-manager.tab.unselected.color = #790000
+manager.tab.selected.color = #FFBA9B
+manager.tab.unselected.color = #EE745A
 manager.tab.text.font = processing.sans,bold,14
-manager.tab.text.selected.color = #FFFFF2
-manager.tab.text.unselected.color = #FFBA9B
+manager.tab.text.selected.color = #000000
+manager.tab.text.unselected.color = #8F1E0C
 manager.tab.gradient.top = #D8432A
 manager.tab.gradient.bottom = #D8432A
 
@@ -196,12 +196,21 @@ manager.tab.gradient.bottom = #D8432A
 manager.tab.background = #D8432A
 
 
+## ContributionTab
+
+manager.list.search.text.color = #000000
+manager.list.search.placeholder.color = #cccccc
+manager.list.search.background.color = #ffffff
+
+
 ## ListPanel – the listing inside a Contribution Manager tab ##
 
+manager.list.background.color = #FFBA9B
 manager.list.header.color = #EBEBEB
 manager.list.section.color = #f8f8f8
-manager.list.row.color = #FFFFFF
-manager.list.selection.color = #e0fffd
+manager.list.selection.color = #AF4430
+manager.list.text.color = #000000
+manager.list.incompatible.color = #CCCCCC
 
 
 ## ZoomTreeCellRenderer - tree for Examples and Sketchbook windows ##
diff --git a/build/shared/lib/themes/kyanite.txt b/build/shared/lib/themes/kyanite.txt
index 928175fb6..60c8f5e47 100644
--- a/build/shared/lib/themes/kyanite.txt
+++ b/build/shared/lib/themes/kyanite.txt
@@ -21,15 +21,15 @@ toolbar.button.disabled.field = #558BB2
 toolbar.button.disabled.glyph = #3E769D
 toolbar.button.disabled.stroke = none
 toolbar.button.enabled.field = #FFFFF2
-toolbar.button.enabled.glyph = #009FFF
+toolbar.button.enabled.glyph = #0088F4
 toolbar.button.enabled.stroke = none
-toolbar.button.pressed.field = #009FFF
+toolbar.button.pressed.field = #0068CF
 toolbar.button.pressed.glyph = #FFFFF2
 toolbar.button.pressed.stroke = #FFFFF2
 toolbar.button.rollover.field = #FFFFF2
-toolbar.button.rollover.glyph = #002652
+toolbar.button.rollover.glyph = #002E7A
 toolbar.button.rollover.stroke = none
-toolbar.button.selected.field = #00163A
+toolbar.button.selected.field = #002E7A
 toolbar.button.selected.glyph = #FFFFF2
 toolbar.button.selected.stroke = none
 
@@ -55,9 +55,9 @@ toolbar.button.debug.selected.stroke = none
 status.notice.fgcolor = #A1E6FF
 status.notice.bgcolor = #0870A1
 status.error.fgcolor = #FFFFF2
-status.error.bgcolor = #B40000
-status.warning.bgcolor = #FF8F38
-status.warning.fgcolor = #810000
+status.error.bgcolor = #BF0000
+status.warning.bgcolor = #003774
+status.warning.fgcolor = #00DFFF
 status.url.fgcolor = #FFFFF2
 status.font = processing.sans,plain,13
 # For the clipboard icon, needs to be a little larger on macOS
@@ -118,13 +118,13 @@ editor.gradient.top = #6BA0C7
 editor.gradient.bottom = #6BA0C7
 
 # highlight for the current line
-editor.linehighlight.color = #DAFBFF
+editor.linehighlight.color = #DEF3FF
 # highlight for the current line
 editor.linehighlight=true
 
 editor.caret.color = #000000
 # also used by EditorHeader
-editor.selection.color = #AAF8FF
+editor.selection.color = #BFD7E6
 
 # little pooties at the end of lines that show where they finish
 editor.eolmarkers = false
@@ -152,14 +152,14 @@ editor.gutter.linehighlight.color = #3E769D
 # squiggly line underneath errors in the editor
 editor.error.underline.color = #FF0000
 # squiggly line underneath warnings
-editor.warning.underline.color = #FF8128
+editor.warning.underline.color = #003774
 
 
 ## MarkerColumn - shows ticks adjacent the scroll bar ##
 
 # lines next to the scrollbar showing where errors are located
-editor.column.error.color = #BE0000
-editor.column.warning.color = #FFD57E
+editor.column.error.color = #AD0000
+editor.column.warning.color = #D1FFFF
 
 
 ## ErrorTable - second tab below the console area, lists errors and warnings ##
@@ -171,21 +171,21 @@ errors.bgcolor = #005074
 errors.row.font = processing.sans,plain,12
 errors.row.fgcolor = #000000
 errors.row.bgcolor = #00B7FF
-errors.selection.fgcolor = #242424
-errors.selection.bgcolor = #e5e5e5
-errors.selection.error.bgcolor = #f5e6e6
-errors.selection.warning.bgcolor = #fdf2e7
+errors.selection.fgcolor = #FFFFF2
+errors.selection.bgcolor = #003774
+errors.selection.error.bgcolor = #FFFFF2
+errors.selection.warning.bgcolor = #009CFD
 errors.indicator.error.color = #000000
 errors.indicator.warning.color = #0081F3
 
 
 ## ManagerTabs - tabs in the Contribution Manager ##
 
-manager.tab.selected.color = #000000
-manager.tab.unselected.color = #003774
+manager.tab.selected.color = #C4E9FF
+manager.tab.unselected.color = #90B7D5
 manager.tab.text.font = processing.sans,bold,14
-manager.tab.text.selected.color = #FFFFF2
-manager.tab.text.unselected.color = #C4E9FF
+manager.tab.text.selected.color = #000000
+manager.tab.text.unselected.color = #2F5976
 manager.tab.gradient.top = #6BA0C7
 manager.tab.gradient.bottom = #6BA0C7
 
@@ -196,12 +196,21 @@ manager.tab.gradient.bottom = #6BA0C7
 manager.tab.background = #6BA0C7
 
 
+## ContributionTab
+
+manager.list.search.text.color = #000000
+manager.list.search.placeholder.color = #cccccc
+manager.list.search.background.color = #ffffff
+
+
 ## ListPanel – the listing inside a Contribution Manager tab ##
 
+manager.list.background.color = #C4E9FF
 manager.list.header.color = #EBEBEB
 manager.list.section.color = #f8f8f8
-manager.list.row.color = #FFFFFF
-manager.list.selection.color = #e0fffd
+manager.list.selection.color = #4A6F8A
+manager.list.text.color = #000000
+manager.list.incompatible.color = #CCCCCC
 
 
 ## ZoomTreeCellRenderer - tree for Examples and Sketchbook windows ##
diff --git a/build/shared/lib/themes/malachite.txt b/build/shared/lib/themes/malachite.txt
index 3aaa1d4ef..9136dadfa 100644
--- a/build/shared/lib/themes/malachite.txt
+++ b/build/shared/lib/themes/malachite.txt
@@ -118,13 +118,13 @@ editor.gradient.top = #243028
 editor.gradient.bottom = #243028
 
 # highlight for the current line
-editor.linehighlight.color = #001900
+editor.linehighlight.color = #00240A
 # highlight for the current line
 editor.linehighlight=true
 
 editor.caret.color = #FFFFF2
 # also used by EditorHeader
-editor.selection.color = #002600
+editor.selection.color = #003C1A
 
 # little pooties at the end of lines that show where they finish
 editor.eolmarkers = false
@@ -159,7 +159,7 @@ editor.warning.underline.color = #17AD6A
 
 # lines next to the scrollbar showing where errors are located
 editor.column.error.color = #FFFFF2
-editor.column.warning.color = #17AD6A
+editor.column.warning.color = #5C6B5F
 
 
 ## ErrorTable - second tab below the console area, lists errors and warnings ##
@@ -171,21 +171,21 @@ errors.bgcolor = #101D15
 errors.row.font = processing.sans,plain,12
 errors.row.fgcolor = #FFFFF2
 errors.row.bgcolor = #005804
-errors.selection.fgcolor = #242424
-errors.selection.bgcolor = #e5e5e5
-errors.selection.error.bgcolor = #f5e6e6
-errors.selection.warning.bgcolor = #fdf2e7
+errors.selection.fgcolor = #000000
+errors.selection.bgcolor = #17AD6A
+errors.selection.error.bgcolor = #000000
+errors.selection.warning.bgcolor = #005C18
 errors.indicator.error.color = #FFFFF2
 errors.indicator.warning.color = #009138
 
 
 ## ManagerTabs - tabs in the Contribution Manager ##
 
-manager.tab.selected.color = #FFFFF2
-manager.tab.unselected.color = #17AD6A
+manager.tab.selected.color = #011008
+manager.tab.unselected.color = #1C261F
 manager.tab.text.font = processing.sans,bold,14
-manager.tab.text.selected.color = #000000
-manager.tab.text.unselected.color = #011008
+manager.tab.text.selected.color = #FFFFF2
+manager.tab.text.unselected.color = #7F8B7F
 manager.tab.gradient.top = #243028
 manager.tab.gradient.bottom = #243028
 
@@ -196,12 +196,21 @@ manager.tab.gradient.bottom = #243028
 manager.tab.background = #243028
 
 
+## ContributionTab
+
+manager.list.search.text.color = #000000
+manager.list.search.placeholder.color = #cccccc
+manager.list.search.background.color = #ffffff
+
+
 ## ListPanel – the listing inside a Contribution Manager tab ##
 
+manager.list.background.color = #011008
 manager.list.header.color = #EBEBEB
 manager.list.section.color = #f8f8f8
-manager.list.row.color = #FFFFFF
-manager.list.selection.color = #e0fffd
+manager.list.selection.color = #737E72
+manager.list.text.color = #000000
+manager.list.incompatible.color = #CCCCCC
 
 
 ## ZoomTreeCellRenderer - tree for Examples and Sketchbook windows ##
diff --git a/build/shared/lib/themes/olivine.txt b/build/shared/lib/themes/olivine.txt
index 317cb1f49..b4055ac8d 100644
--- a/build/shared/lib/themes/olivine.txt
+++ b/build/shared/lib/themes/olivine.txt
@@ -21,15 +21,15 @@ toolbar.button.disabled.field = #7E9710
 toolbar.button.disabled.glyph = #698200
 toolbar.button.disabled.stroke = none
 toolbar.button.enabled.field = #FFFFF2
-toolbar.button.enabled.glyph = #839926
+toolbar.button.enabled.glyph = #728811
 toolbar.button.enabled.stroke = none
-toolbar.button.pressed.field = #839926
+toolbar.button.pressed.field = #4F6600
 toolbar.button.pressed.glyph = #FFFFF2
 toolbar.button.pressed.stroke = #FFFFF2
 toolbar.button.rollover.field = #FFFFF2
-toolbar.button.rollover.glyph = #192A00
+toolbar.button.rollover.glyph = #193300
 toolbar.button.rollover.stroke = none
-toolbar.button.selected.field = #0E1600
+toolbar.button.selected.field = #193300
 toolbar.button.selected.glyph = #FFFFF2
 toolbar.button.selected.stroke = none
 
@@ -118,13 +118,13 @@ editor.gradient.top = #94AC2C
 editor.gradient.bottom = #94AC2C
 
 # highlight for the current line
-editor.linehighlight.color = #F4FBC4
+editor.linehighlight.color = #EEF3CB
 # highlight for the current line
 editor.linehighlight=true
 
 editor.caret.color = #000000
 # also used by EditorHeader
-editor.selection.color = #E8F894
+editor.selection.color = #D2D7AD
 
 # little pooties at the end of lines that show where they finish
 editor.eolmarkers = false
@@ -159,7 +159,7 @@ editor.warning.underline.color = #1B3900
 
 # lines next to the scrollbar showing where errors are located
 editor.column.error.color = #000000
-editor.column.warning.color = #1B3900
+editor.column.warning.color = #F2FF85
 
 
 ## ErrorTable - second tab below the console area, lists errors and warnings ##
@@ -171,21 +171,21 @@ errors.bgcolor = #3B5700
 errors.row.font = processing.sans,plain,12
 errors.row.fgcolor = #000000
 errors.row.bgcolor = #90BD00
-errors.selection.fgcolor = #242424
-errors.selection.bgcolor = #e5e5e5
-errors.selection.error.bgcolor = #f5e6e6
-errors.selection.warning.bgcolor = #fdf2e7
+errors.selection.fgcolor = #FFFFF2
+errors.selection.bgcolor = #1B3900
+errors.selection.error.bgcolor = #FFFFF2
+errors.selection.warning.bgcolor = #799C00
 errors.indicator.error.color = #000000
 errors.indicator.warning.color = #538400
 
 
 ## ManagerTabs - tabs in the Contribution Manager ##
 
-manager.tab.selected.color = #000000
-manager.tab.unselected.color = #1B3900
+manager.tab.selected.color = #DFEF8D
+manager.tab.unselected.color = #AFC15D
 manager.tab.text.font = processing.sans,bold,14
-manager.tab.text.selected.color = #FFFFF2
-manager.tab.text.unselected.color = #DFEF8D
+manager.tab.text.selected.color = #000000
+manager.tab.text.unselected.color = #4C5F00
 manager.tab.gradient.top = #94AC2C
 manager.tab.gradient.bottom = #94AC2C
 
@@ -196,12 +196,21 @@ manager.tab.gradient.bottom = #94AC2C
 manager.tab.background = #94AC2C
 
 
+## ContributionTab
+
+manager.list.search.text.color = #000000
+manager.list.search.placeholder.color = #cccccc
+manager.list.search.background.color = #ffffff
+
+
 ## ListPanel – the listing inside a Contribution Manager tab ##
 
+manager.list.background.color = #DFEF8D
 manager.list.header.color = #EBEBEB
 manager.list.section.color = #f8f8f8
-manager.list.row.color = #FFFFFF
-manager.list.selection.color = #e0fffd
+manager.list.selection.color = #627319
+manager.list.text.color = #000000
+manager.list.incompatible.color = #CCCCCC
 
 
 ## ZoomTreeCellRenderer - tree for Examples and Sketchbook windows ##
diff --git a/build/shared/lib/themes/orpiment.txt b/build/shared/lib/themes/orpiment.txt
index f232e7e0e..e006f00b5 100644
--- a/build/shared/lib/themes/orpiment.txt
+++ b/build/shared/lib/themes/orpiment.txt
@@ -21,15 +21,15 @@ toolbar.button.disabled.field = #EAB61B
 toolbar.button.disabled.glyph = #D1A000
 toolbar.button.disabled.stroke = none
 toolbar.button.enabled.field = #FFFFF2
-toolbar.button.enabled.glyph = #B38A00
+toolbar.button.enabled.glyph = #CB9F25
 toolbar.button.enabled.stroke = none
-toolbar.button.pressed.field = #B38A00
+toolbar.button.pressed.field = #997300
 toolbar.button.pressed.glyph = #FFFFF2
 toolbar.button.pressed.stroke = #FFFFF2
 toolbar.button.rollover.field = #FFFFF2
-toolbar.button.rollover.glyph = #4C1F00
+toolbar.button.rollover.glyph = #784800
 toolbar.button.rollover.stroke = none
-toolbar.button.selected.field = #280F00
+toolbar.button.selected.field = #784800
 toolbar.button.selected.glyph = #FFFFF2
 toolbar.button.selected.stroke = none
 
@@ -118,13 +118,13 @@ editor.gradient.top = #FFCC3A
 editor.gradient.bottom = #FFCC3A
 
 # highlight for the current line
-editor.linehighlight.color = #FFF4C3
+editor.linehighlight.color = #FEEECA
 # highlight for the current line
 editor.linehighlight=true
 
 editor.caret.color = #000000
 # also used by EditorHeader
-editor.selection.color = #FFEB92
+editor.selection.color = #E2D2AC
 
 # little pooties at the end of lines that show where they finish
 editor.eolmarkers = false
@@ -159,7 +159,7 @@ editor.warning.underline.color = #5B3400
 
 # lines next to the scrollbar showing where errors are located
 editor.column.error.color = #000000
-editor.column.warning.color = #5B3400
+editor.column.warning.color = #FFF666
 
 
 ## ErrorTable - second tab below the console area, lists errors and warnings ##
@@ -171,21 +171,21 @@ errors.bgcolor = #845D00
 errors.row.font = processing.sans,plain,12
 errors.row.fgcolor = #000000
 errors.row.bgcolor = #FFCF00
-errors.selection.fgcolor = #242424
-errors.selection.bgcolor = #e5e5e5
-errors.selection.error.bgcolor = #f5e6e6
-errors.selection.warning.bgcolor = #fdf2e7
+errors.selection.fgcolor = #FFFFF2
+errors.selection.bgcolor = #5B3400
+errors.selection.error.bgcolor = #FFFFF2
+errors.selection.warning.bgcolor = #C08F00
 errors.indicator.error.color = #000000
 errors.indicator.warning.color = #BE8900
 
 
 ## ManagerTabs - tabs in the Contribution Manager ##
 
-manager.tab.selected.color = #000000
-manager.tab.unselected.color = #5B3400
+manager.tab.selected.color = #FFED85
+manager.tab.unselected.color = #FFD86A
 manager.tab.text.font = processing.sans,bold,14
-manager.tab.text.selected.color = #FFFFF2
-manager.tab.text.unselected.color = #FFED85
+manager.tab.text.selected.color = #000000
+manager.tab.text.unselected.color = #856300
 manager.tab.gradient.top = #FFCC3A
 manager.tab.gradient.bottom = #FFCC3A
 
@@ -196,12 +196,21 @@ manager.tab.gradient.bottom = #FFCC3A
 manager.tab.background = #FFCC3A
 
 
+## ContributionTab
+
+manager.list.search.text.color = #000000
+manager.list.search.placeholder.color = #cccccc
+manager.list.search.background.color = #ffffff
+
+
 ## ListPanel – the listing inside a Contribution Manager tab ##
 
+manager.list.background.color = #FFED85
 manager.list.header.color = #EBEBEB
 manager.list.section.color = #f8f8f8
-manager.list.row.color = #FFFFFF
-manager.list.selection.color = #e0fffd
+manager.list.selection.color = #8F6C00
+manager.list.text.color = #000000
+manager.list.incompatible.color = #CCCCCC
 
 
 ## ZoomTreeCellRenderer - tree for Examples and Sketchbook windows ##
diff --git a/build/shared/lib/themes/pyrite.txt b/build/shared/lib/themes/pyrite.txt
index bdea53ade..40cc89b72 100644
--- a/build/shared/lib/themes/pyrite.txt
+++ b/build/shared/lib/themes/pyrite.txt
@@ -118,13 +118,13 @@ editor.gradient.top = #00474E
 editor.gradient.bottom = #00474E
 
 # highlight for the current line
-editor.linehighlight.color = #181100
+editor.linehighlight.color = #24210B
 # highlight for the current line
 editor.linehighlight=true
 
 editor.caret.color = #FFFFF2
 # also used by EditorHeader
-editor.selection.color = #251C00
+editor.selection.color = #3A361A
 
 # little pooties at the end of lines that show where they finish
 editor.eolmarkers = false
@@ -159,7 +159,7 @@ editor.warning.underline.color = #99915B
 
 # lines next to the scrollbar showing where errors are located
 editor.column.error.color = #FFFFF2
-editor.column.warning.color = #99915B
+editor.column.warning.color = #458589
 
 
 ## ErrorTable - second tab below the console area, lists errors and warnings ##
@@ -171,21 +171,21 @@ errors.bgcolor = #002930
 errors.row.font = processing.sans,plain,12
 errors.row.fgcolor = #FFFFF2
 errors.row.bgcolor = #595800
-errors.selection.fgcolor = #242424
-errors.selection.bgcolor = #e5e5e5
-errors.selection.error.bgcolor = #f5e6e6
-errors.selection.warning.bgcolor = #fdf2e7
+errors.selection.fgcolor = #000000
+errors.selection.bgcolor = #99915B
+errors.selection.error.bgcolor = #000000
+errors.selection.warning.bgcolor = #4B4900
 errors.indicator.error.color = #FFFFF2
 errors.indicator.warning.color = #8C8800
 
 
 ## ManagerTabs - tabs in the Contribution Manager ##
 
-manager.tab.selected.color = #FFFFF2
-manager.tab.unselected.color = #99915B
+manager.tab.selected.color = #00181C
+manager.tab.unselected.color = #00373B
 manager.tab.text.font = processing.sans,bold,14
-manager.tab.text.selected.color = #000000
-manager.tab.text.unselected.color = #00181C
+manager.tab.text.selected.color = #FFFFF2
+manager.tab.text.unselected.color = #68989A
 manager.tab.gradient.top = #00474E
 manager.tab.gradient.bottom = #00474E
 
@@ -196,12 +196,21 @@ manager.tab.gradient.bottom = #00474E
 manager.tab.background = #00474E
 
 
+## ContributionTab
+
+manager.list.search.text.color = #000000
+manager.list.search.placeholder.color = #cccccc
+manager.list.search.background.color = #ffffff
+
+
 ## ListPanel – the listing inside a Contribution Manager tab ##
 
+manager.list.background.color = #00181C
 manager.list.header.color = #EBEBEB
 manager.list.section.color = #f8f8f8
-manager.list.row.color = #FFFFFF
-manager.list.selection.color = #e0fffd
+manager.list.selection.color = #588586
+manager.list.text.color = #000000
+manager.list.incompatible.color = #CCCCCC
 
 
 ## ZoomTreeCellRenderer - tree for Examples and Sketchbook windows ##
diff --git a/build/shared/lib/themes/serandite.txt b/build/shared/lib/themes/serandite.txt
index c83122077..86f84241c 100644
--- a/build/shared/lib/themes/serandite.txt
+++ b/build/shared/lib/themes/serandite.txt
@@ -21,15 +21,15 @@ toolbar.button.disabled.field = #D25300
 toolbar.button.disabled.glyph = #B93D00
 toolbar.button.disabled.stroke = none
 toolbar.button.enabled.field = #FFFFF2
-toolbar.button.enabled.glyph = #EB5B9A
+toolbar.button.enabled.glyph = #C7377C
 toolbar.button.enabled.stroke = none
-toolbar.button.pressed.field = #EB5B9A
+toolbar.button.pressed.field = #A40360
 toolbar.button.pressed.glyph = #FFFFF2
 toolbar.button.pressed.stroke = #FFFFF2
 toolbar.button.rollover.field = #FFFFF2
-toolbar.button.rollover.glyph = #47162B
+toolbar.button.rollover.glyph = #480022
 toolbar.button.rollover.stroke = none
-toolbar.button.selected.field = #340019
+toolbar.button.selected.field = #480022
 toolbar.button.selected.glyph = #FFFFF2
 toolbar.button.selected.stroke = none
 
@@ -118,13 +118,13 @@ editor.gradient.top = #EC6800
 editor.gradient.bottom = #EC6800
 
 # highlight for the current line
-editor.linehighlight.color = #FFEBF1
+editor.linehighlight.color = #FFE8E8
 # highlight for the current line
 editor.linehighlight=true
 
 editor.caret.color = #000000
 # also used by EditorHeader
-editor.selection.color = #FFD5F0
+editor.selection.color = #EDCBCE
 
 # little pooties at the end of lines that show where they finish
 editor.eolmarkers = false
@@ -159,7 +159,7 @@ editor.warning.underline.color = #662140
 
 # lines next to the scrollbar showing where errors are located
 editor.column.error.color = #000000
-editor.column.warning.color = #662140
+editor.column.warning.color = #FFD773
 
 
 ## ErrorTable - second tab below the console area, lists errors and warnings ##
@@ -171,21 +171,21 @@ errors.bgcolor = #8E1300
 errors.row.font = processing.sans,plain,12
 errors.row.fgcolor = #000000
 errors.row.bgcolor = #FF55AB
-errors.selection.fgcolor = #242424
-errors.selection.bgcolor = #e5e5e5
-errors.selection.error.bgcolor = #f5e6e6
-errors.selection.warning.bgcolor = #fdf2e7
+errors.selection.fgcolor = #FFFFF2
+errors.selection.bgcolor = #662140
+errors.selection.error.bgcolor = #FFFFF2
+errors.selection.warning.bgcolor = #F461A1
 errors.indicator.error.color = #000000
 errors.indicator.warning.color = #D0007A
 
 
 ## ManagerTabs - tabs in the Contribution Manager ##
 
-manager.tab.selected.color = #000000
-manager.tab.unselected.color = #662140
+manager.tab.selected.color = #FFC67D
+manager.tab.unselected.color = #FC8D42
 manager.tab.text.font = processing.sans,bold,14
-manager.tab.text.selected.color = #FFFFF2
-manager.tab.text.unselected.color = #FFC67D
+manager.tab.text.selected.color = #000000
+manager.tab.text.unselected.color = #923200
 manager.tab.gradient.top = #EC6800
 manager.tab.gradient.bottom = #EC6800
 
@@ -196,12 +196,21 @@ manager.tab.gradient.bottom = #EC6800
 manager.tab.background = #EC6800
 
 
+## ContributionTab
+
+manager.list.search.text.color = #000000
+manager.list.search.placeholder.color = #cccccc
+manager.list.search.background.color = #ffffff
+
+
 ## ListPanel – the listing inside a Contribution Manager tab ##
 
+manager.list.background.color = #FFC67D
 manager.list.header.color = #EBEBEB
 manager.list.section.color = #f8f8f8
-manager.list.row.color = #FFFFFF
-manager.list.selection.color = #e0fffd
+manager.list.selection.color = #AC4E00
+manager.list.text.color = #000000
+manager.list.incompatible.color = #CCCCCC
 
 
 ## ZoomTreeCellRenderer - tree for Examples and Sketchbook windows ##