Index: /applications/editors/josm/plugins/flatlaf/src/org/openstreetmap/josm/plugins/flatlaf/FlatDarkLaf.properties
===================================================================
--- /applications/editors/josm/plugins/flatlaf/src/org/openstreetmap/josm/plugins/flatlaf/FlatDarkLaf.properties	(revision 35698)
+++ /applications/editors/josm/plugins/flatlaf/src/org/openstreetmap/josm/plugins/flatlaf/FlatDarkLaf.properties	(revision 35699)
@@ -3,23 +3,100 @@
 #
 
-TabbedPane.selectedBackground=darken($TabbedPane.background,5%,derived noAutoInverse)
-TabbedPane.hoverColor=darken($TabbedPane.background,7%,derived noAutoInverse)
+# base colors (same values as Action.* in FlatLaf Dark theme)
+@JOSM.blue = #3592C4
+@JOSM.green = #499C54
+@JOSM.red = #C75450
+@JOSM.yellow = #F0A732
 
+
+# TabbedPane
+TabbedPane.selectedBackground = darken($TabbedPane.background,5%,derived noAutoInverse)
+TabbedPane.hoverColor = darken($TabbedPane.background,7%,derived noAutoInverse)
+
+# TwoColumnDiff
+JOSM.TwoColumnDiff.INSERTED = darken(@JOSM.green,25%)
+JOSM.TwoColumnDiff.DELETED = darken(@JOSM.red,25%)
+JOSM.TwoColumnDiff.CHANGED = darken(@JOSM.yellow,30%)
+JOSM.TwoColumnDiff.REVERSED = darken(@JOSM.yellow,15%)
+JOSM.TwoColumnDiff.SAME = @textComponentBackground
+JOSM.TwoColumnDiff.EMPTY = @textComponentBackground
+
+# TagTableCellRenderer
+JOSM.TagTableCellRenderer.BGCOLOR_SELECTED_FOCUS = $Table.selectionBackground
+JOSM.TagTableCellRenderer.BGCOLOR_SELECTED = $Table.selectionInactiveBackground
+
+# CoordinateInfoViewer
+JOSM.CoordinateInfoViewer.UNMODIFIED = darken(@background,3%)
 
 #---- NamedColorProperty ----
 
 # AbstractTextComponentValidator
-JOSM.clr.general.Input\ validation\:\ error=$Component.error.focusedBorderColor
-JOSM.clr.general.Input\ validation\:\ error\ background=$Component.error.borderColor
-JOSM.clr.general.Input\ validation\:\ warning=$Component.warning.focusedBorderColor
-JOSM.clr.general.Input\ validation\:\ warning\ background=$Component.warning.borderColor
-JOSM.clr.general.Input\ validation\:\ valid=#62b543
+JOSM.clr.general.Input\ validation\:\ error = $Component.error.focusedBorderColor
+JOSM.clr.general.Input\ validation\:\ error\ background = $Component.error.borderColor
+JOSM.clr.general.Input\ validation\:\ warning = $Component.warning.focusedBorderColor
+JOSM.clr.general.Input\ validation\:\ warning\ background = $Component.warning.borderColor
+JOSM.clr.general.Input\ validation\:\ valid = darken(@JOSM.green,10%)
 
 # ImageryProvidersPanel
-JOSM.clr.general.Imagery\ Background\:\ Default=darken(#499c54,10%)
+JOSM.clr.general.Imagery\ Background\:\ Default = darken(@JOSM.green,20%)
 
 # MapStatus
-JOSM.clr.general.Status\ bar\ background=darken(#b8cfe5,50%)
-JOSM.clr.general.Status\ bar\ foreground=@foreground
-JOSM.clr.general.Status\ bar\ background\:\ active=darken(#aaff5e,40%)
-JOSM.clr.general.Status\ bar\ foreground\:\ active=@foreground
+JOSM.clr.general.Status\ bar\ background = darken(#b8cfe5,50%)
+JOSM.clr.general.Status\ bar\ foreground = @foreground
+JOSM.clr.general.Status\ bar\ background\:\ active = darken(#aaff5e,40%)
+JOSM.clr.general.Status\ bar\ foreground\:\ active = @foreground
+
+# PreferencesTable.SettingCellRenderer
+JOSM.clr.general.Advanced\ Background\:\ Changed = darken(@JOSM.green,20%)
+JOSM.clr.general.Advanced\ Background\:\ NonDefault = darken(@JOSM.yellow,30%)
+
+# SourceEditor.FancySourceEntryTableCellRenderer
+JOSM.clr.general.External\ resource\ entry\:\ Active = darken(@JOSM.green,20%)
+JOSM.clr.general.External\ resource\ entry\:\ Inactive = lighten(@background,20%)
+
+# ConflictColors
+@JOSM.conflict.background = @background
+@JOSM.conflict.foreground = @foreground
+@JOSM.conflict.green = darken(@JOSM.green,20%)
+@JOSM.conflict.blue = darken(@JOSM.blue,25%)
+@JOSM.conflict.red = darken(@JOSM.red,25%)
+@JOSM.conflict.orange = darken(@JOSM.yellow,30%)
+@JOSM.conflict.gray1 = lighten(@JOSM.conflict.background,15%)
+@JOSM.conflict.gray2 = lighten(@JOSM.conflict.background,30%)
+
+JOSM.clr.general.Conflict\ background\:\ no\ conflict = @JOSM.conflict.gray1
+JOSM.clr.general.Conflict\ background\:\ decided = @JOSM.conflict.green
+JOSM.clr.general.Conflict\ background\:\ undecided = @JOSM.conflict.red
+JOSM.clr.general.Conflict\ background\:\ drop = @JOSM.conflict.background
+JOSM.clr.general.Conflict\ background\:\ keep = @JOSM.conflict.green
+JOSM.clr.general.Conflict\ background\:\ combined = @JOSM.conflict.green
+JOSM.clr.general.Conflict\ background\:\ selected = @JOSM.conflict.blue
+
+JOSM.clr.general.Conflict\ foreground\:\ undecided = @JOSM.conflict.foreground
+JOSM.clr.general.Conflict\ foreground\:\ drop = @JOSM.conflict.gray2
+JOSM.clr.general.Conflict\ foreground\:\ keep = @JOSM.conflict.foreground
+
+JOSM.clr.general.Conflict\ background\:\ empty row = @JOSM.conflict.gray1
+JOSM.clr.general.Conflict\ background\:\ frozen = @JOSM.conflict.gray1
+JOSM.clr.general.Conflict\ background\:\ in\ comparison = @JOSM.conflict.foreground
+JOSM.clr.general.Conflict\ foreground\:\ in\ comparison = @JOSM.conflict.background
+JOSM.clr.general.Conflict\ background = @JOSM.conflict.background
+JOSM.clr.general.Conflict\ foreground = @JOSM.conflict.foreground
+
+JOSM.clr.general.Conflict\ background\:\ not\ in\ opposite = @JOSM.conflict.red
+JOSM.clr.general.Conflict\ background\:\ in\ opposite = @JOSM.conflict.orange
+JOSM.clr.general.Conflict\ background\:\ same\ position\ in\ opposite = @JOSM.conflict.green
+
+JOSM.clr.general.Conflict\ background\:\ keep\ one\ tag = @JOSM.conflict.green
+JOSM.clr.general.Conflict\ foreground\:\ keep\ one\ tag = @JOSM.conflict.foreground
+JOSM.clr.general.Conflict\ background\:\ drop\ tag = @JOSM.conflict.gray2
+JOSM.clr.general.Conflict\ foreground\:\ drop\ tag = @JOSM.conflict.foreground
+JOSM.clr.general.Conflict\ background\:\ keep\ all\ tags = @JOSM.conflict.orange
+JOSM.clr.general.Conflict\ foreground\:\ keep\ all\ tags = @JOSM.conflict.foreground
+JOSM.clr.general.Conflict\ background\:\ sum\ all\ numeric\ tags = @JOSM.conflict.orange
+JOSM.clr.general.Conflict\ foreground\:\ sum\ all\ numeric\ tags = @JOSM.conflict.foreground
+
+JOSM.clr.general.Conflict\ background\:\ keep\ member = @JOSM.conflict.green
+JOSM.clr.general.Conflict\ foreground\:\ keep\ member = @JOSM.conflict.foreground
+JOSM.clr.general.Conflict\ background\:\ remove\ member = @JOSM.conflict.gray2
+JOSM.clr.general.Conflict\ foreground\:\ remove\ member = @JOSM.conflict.foreground