Fixing selections, bnold and cursor colors, fixes #2216

Signed-off-by: Antenore Gatta <antenore@simbiosi.org>

245 files changed, 913 insertions, 51 deletions

diff --git a/data/theme/3024 Day.colors b/data/theme/3024 Day.colors
index ac9636cd8..d51a765ef 100644
--- a/data/theme/3024 Day.colors
+++ b/data/theme/3024 Day.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #f7f7f7
 cursor = #4a4543
+cursor_foreground = #f7f7f7
 foreground = #4a4543
+highlight = #a5a2a2
+highlight_foreground = #4a4543
 color0 = #090300
 color1 = #db2d20
 color2 = #01a252
diff --git a/data/theme/3024 Night.colors b/data/theme/3024 Night.colors
index 16b50283c..2089edd60 100644
--- a/data/theme/3024 Night.colors
+++ b/data/theme/3024 Night.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #090300
 cursor = #a5a2a2
+cursor_foreground = #090300
 foreground = #a5a2a2
+highlight = #4a4543
+highlight_foreground = #a5a2a2
 color0 = #090300
 color1 = #db2d20
 color2 = #01a252
diff --git a/data/theme/Adventure.colors b/data/theme/Adventure.colors
index 4041c8c0e..4d1171777 100644
--- a/data/theme/Adventure.colors
+++ b/data/theme/Adventure.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #040404
 cursor = #feffff
+cursor_foreground = #000000
 foreground = #feffff
+highlight = #606060
+highlight_foreground = #ffffff
 color0 = #040404
 color1 = #d84a33
 color2 = #5da602
diff --git a/data/theme/AdventureTime.colors b/data/theme/AdventureTime.colors
index 59bf96c61..173874cd5 100644
--- a/data/theme/AdventureTime.colors
+++ b/data/theme/AdventureTime.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #1f1d45
 cursor = #efbf38
+cursor_foreground = #08080a
 foreground = #f8dcc0
+highlight = #706b4e
+highlight_foreground = #f3d9c4
 color0 = #050404
 color1 = #bd0013
 color2 = #4ab118
diff --git a/data/theme/Afterglow.colors b/data/theme/Afterglow.colors
index 680fb1b24..5429610c8 100644
--- a/data/theme/Afterglow.colors
+++ b/data/theme/Afterglow.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #212121
 cursor = #d0d0d0
+cursor_foreground = #151515
 foreground = #d0d0d0
+highlight = #303030
+highlight_foreground = #d0d0d0
 color0 = #151515
 color1 = #ac4142
 color2 = #7e8e50
diff --git a/data/theme/AlienBlood.colors b/data/theme/AlienBlood.colors
index e89632814..0e3420beb 100644
--- a/data/theme/AlienBlood.colors
+++ b/data/theme/AlienBlood.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #0f1610
 cursor = #73fa91
+cursor_foreground = #0f1610
 foreground = #637d75
+highlight = #1d4125
+highlight_foreground = #73fa91
 color0 = #112616
 color1 = #7f2b27
 color2 = #2f7e25
diff --git a/data/theme/Andromeda.colors b/data/theme/Andromeda.colors
index 9ea320987..bcd4604a1 100644
--- a/data/theme/Andromeda.colors
+++ b/data/theme/Andromeda.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #262a33
 cursor = #f8f8f0
+cursor_foreground = #cfcfc2
 foreground = #e5e5e5
+highlight = #5a5c62
+highlight_foreground = #ece7e7
 color0 = #000000
 color1 = #cd3131
 color2 = #05bc79
diff --git a/data/theme/Argonaut.colors b/data/theme/Argonaut.colors
index 12b5403ba..dedaca0ae 100644
--- a/data/theme/Argonaut.colors
+++ b/data/theme/Argonaut.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #0e1019
 cursor = #ff0018
+cursor_foreground = #ff0018
 foreground = #fffaf4
+highlight = #002a3b
+highlight_foreground = #ffffff
 color0 = #232323
 color1 = #ff000f
 color2 = #8ce10b
diff --git a/data/theme/Arthur.colors b/data/theme/Arthur.colors
index a2aaee2c0..7d8e03f6b 100644
--- a/data/theme/Arthur.colors
+++ b/data/theme/Arthur.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #1c1c1c
 cursor = #e2bbef
+cursor_foreground = #000000
 foreground = #ddeedd
+highlight = #4d4d4d
+highlight_foreground = #ffffff
 color0 = #3d352a
 color1 = #cd5c5c
 color2 = #86af80
diff --git a/data/theme/AtelierSulphurpool.colors b/data/theme/AtelierSulphurpool.colors
index c5159afe6..425dc428c 100644
--- a/data/theme/AtelierSulphurpool.colors
+++ b/data/theme/AtelierSulphurpool.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #202746
 cursor = #979db4
+cursor_foreground = #202746
 foreground = #979db4
+highlight = #5e6687
+highlight_foreground = #979db4
 color0 = #202746
 color1 = #c94922
 color2 = #ac9739
diff --git a/data/theme/Atom.colors b/data/theme/Atom.colors
index 6681369ce..61b1538a3 100644
--- a/data/theme/Atom.colors
+++ b/data/theme/Atom.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #161719
 cursor = #d0d0d0
+cursor_foreground = #151515
 foreground = #c5c8c6
+highlight = #444444
+highlight_foreground = #c5c8c6
 color0 = #000000
 color1 = #fd5ff1
 color2 = #87c38a
diff --git a/data/theme/AtomOneLight.colors b/data/theme/AtomOneLight.colors
index e33fbdbc5..35071e1c1 100644
--- a/data/theme/AtomOneLight.colors
+++ b/data/theme/AtomOneLight.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #f9f9f9
 cursor = #bbbbbb
+cursor_foreground = #ffffff
 foreground = #2a2c33
+highlight = #ededed
+highlight_foreground = #2a2c33
 color0 = #000000
 color1 = #de3e35
 color2 = #3f953a
diff --git a/data/theme/Aurora.colors b/data/theme/Aurora.colors
index 651f243f1..a4eb33ba0 100644
--- a/data/theme/Aurora.colors
+++ b/data/theme/Aurora.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #23262e
 cursor = #ee5d43
+cursor_foreground = #ffd29c
 foreground = #ffca28
+highlight = #292e38
+highlight_foreground = #00e8c6
 color0 = #23262e
 color1 = #f0266f
 color2 = #8fd46d
diff --git a/data/theme/Banana Blueberry.colors b/data/theme/Banana Blueberry.colors
index 16d42d91d..ef41a5f09 100644
--- a/data/theme/Banana Blueberry.colors
+++ b/data/theme/Banana Blueberry.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #191323
 cursor = #e07d13
+cursor_foreground = #ffffff
 foreground = #cccccc
+highlight = #220525
+highlight_foreground = #f4f4f4
 color0 = #17141f
 color1 = #ff6b7f
 color2 = #00bd9c
diff --git a/data/theme/Batman.colors b/data/theme/Batman.colors
index e80059e42..f8470b767 100644
--- a/data/theme/Batman.colors
+++ b/data/theme/Batman.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #1b1d1e
 cursor = #fcef0c
+cursor_foreground = #000000
 foreground = #6f6f6f
+highlight = #4d504c
+highlight_foreground = #f0e04a
 color0 = #1b1d1e
 color1 = #e6dc44
 color2 = #c8be46
diff --git a/data/theme/Belafonte Day.colors b/data/theme/Belafonte Day.colors
index 33d7672f6..4cd2b8597 100644
--- a/data/theme/Belafonte Day.colors
+++ b/data/theme/Belafonte Day.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #d5ccba
 cursor = #45373c
+cursor_foreground = #d5ccba
 foreground = #45373c
+highlight = #968c83
+highlight_foreground = #45373c
 color0 = #20111b
 color1 = #be100e
 color2 = #858162
diff --git a/data/theme/Belafonte Night.colors b/data/theme/Belafonte Night.colors
index 4851bc338..c60a858d8 100644
--- a/data/theme/Belafonte Night.colors
+++ b/data/theme/Belafonte Night.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #20111b
 cursor = #968c83
+cursor_foreground = #20111b
 foreground = #968c83
+highlight = #45373c
+highlight_foreground = #968c83
 color0 = #20111b
 color1 = #be100e
 color2 = #858162
diff --git a/data/theme/BirdsOfParadise.colors b/data/theme/BirdsOfParadise.colors
index b93a11873..8d4c5eac2 100644
--- a/data/theme/BirdsOfParadise.colors
+++ b/data/theme/BirdsOfParadise.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #2a1f1d
 cursor = #573d26
+cursor_foreground = #573d26
 foreground = #e0dbb7
+highlight = #563c27
+highlight_foreground = #e0dbbb
 color0 = #573d26
 color1 = #be2d26
 color2 = #6ba18a
diff --git a/data/theme/Blazer.colors b/data/theme/Blazer.colors
index 788920146..53116f214 100644
--- a/data/theme/Blazer.colors
+++ b/data/theme/Blazer.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #0d1926
 cursor = #d9e6f2
+cursor_foreground = #0d1926
 foreground = #d9e6f2
+highlight =
+highlight_foreground =
 color0 = #000000
 color1 = #b87a7a
 color2 = #7ab87a
diff --git a/data/theme/Blue Matrix.colors b/data/theme/Blue Matrix.colors
index 2e3ea6c83..6a58e901b 100644
--- a/data/theme/Blue Matrix.colors
+++ b/data/theme/Blue Matrix.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #101116
 cursor = #76ff9f
+cursor_foreground = #ffffff
 foreground = #00a2ff
+highlight = #c1deff
+highlight_foreground = #000000
 color0 = #101116
 color1 = #ff5680
 color2 = #00ff9c
diff --git a/data/theme/BlueBerryPie.colors b/data/theme/BlueBerryPie.colors
index 1d44a7d3b..08c1fe42f 100644
--- a/data/theme/BlueBerryPie.colors
+++ b/data/theme/BlueBerryPie.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #1c0c28
 cursor = #fcfad6
+cursor_foreground = #000000
 foreground = #babab9
+highlight = #606060
+highlight_foreground = #ffffff
 color0 = #0a4c62
 color1 = #99246e
 color2 = #5cb1b3
diff --git a/data/theme/BlulocoDark.colors b/data/theme/BlulocoDark.colors
index 8a6b43a52..354d6c6d0 100644
--- a/data/theme/BlulocoDark.colors
+++ b/data/theme/BlulocoDark.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #1e2127
 cursor = #fec309
+cursor_foreground = #ffffff
 foreground = #abb2bf
+highlight = #2f3441
+highlight_foreground = #abb2bf
 color0 = #4a505d
 color1 = #f81141
 color2 = #23974a
diff --git a/data/theme/BlulocoLight.colors b/data/theme/BlulocoLight.colors
index c426ccc1d..5addaa5bf 100644
--- a/data/theme/BlulocoLight.colors
+++ b/data/theme/BlulocoLight.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #f7f7f7
 cursor = #ed0047
+cursor_foreground = #ffffff
 foreground = #2a2c33
+highlight = #d2ecff
+highlight_foreground = #2a2c33
 color0 = #cbccd5
 color1 = #c90e42
 color2 = #21883a
diff --git a/data/theme/Borland.colors b/data/theme/Borland.colors
index cc5d57764..6013200f9 100644
--- a/data/theme/Borland.colors
+++ b/data/theme/Borland.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #0000a4
 cursor = #ffa560
+cursor_foreground = #ffffff
 foreground = #ffff4e
+highlight = #a4a4a4
+highlight_foreground = #0000a4
 color0 = #4f4f4f
 color1 = #ff6c60
 color2 = #a8ff60
diff --git a/data/theme/Breeze.colors b/data/theme/Breeze.colors
index 7a74d9dfe..f531da41c 100644
--- a/data/theme/Breeze.colors
+++ b/data/theme/Breeze.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #31363b
 cursor = #eff0f1
+cursor_foreground = #31363b
 foreground = #eff0f1
+highlight = #eff0f1
+highlight_foreground = #31363b
 color0 = #31363b
 color1 = #ed1515
 color2 = #11d116
diff --git a/data/theme/Bright Lights.colors b/data/theme/Bright Lights.colors
index d7b0671c8..013d7c416 100644
--- a/data/theme/Bright Lights.colors
+++ b/data/theme/Bright Lights.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #191919
 cursor = #f34b00
+cursor_foreground = #002831
 foreground = #b3c9d7
+highlight = #b3c9d7
+highlight_foreground = #191919
 color0 = #191919
 color1 = #ff355b
 color2 = #b7e876
diff --git a/data/theme/Broadcast.colors b/data/theme/Broadcast.colors
index 3ba570ede..bee2f33a6 100644
--- a/data/theme/Broadcast.colors
+++ b/data/theme/Broadcast.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #2b2b2b
 cursor = #ffffff
+cursor_foreground = #e6e1dc
 foreground = #e6e1dc
+highlight = #5a647e
+highlight_foreground = #e6e1dc
 color0 = #000000
 color1 = #da4939
 color2 = #519f50
diff --git a/data/theme/Brogrammer.colors b/data/theme/Brogrammer.colors
index 231e76e58..31b4ef8be 100644
--- a/data/theme/Brogrammer.colors
+++ b/data/theme/Brogrammer.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #131313
 cursor = #b9b9b9
+cursor_foreground = #101010
 foreground = #d6dbe5
+highlight = #1f1f1f
+highlight_foreground = #d6dbe5
 color0 = #1f1f1f
 color1 = #f81118
 color2 = #2dc55e
diff --git a/data/theme/Builtin Dark.colors b/data/theme/Builtin Dark.colors
index 27f2d5a77..10da98487 100644
--- a/data/theme/Builtin Dark.colors
+++ b/data/theme/Builtin Dark.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #000000
 cursor = #bbbbbb
+cursor_foreground = #ffffff
 foreground = #bbbbbb
+highlight = #b5d5ff
+highlight_foreground = #000000
 color0 = #000000
 color1 = #bb0000
 color2 = #00bb00
diff --git a/data/theme/Builtin Light.colors b/data/theme/Builtin Light.colors
index 2e5a53b49..02732cc51 100644
--- a/data/theme/Builtin Light.colors
+++ b/data/theme/Builtin Light.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #ffffff
 cursor = #000000
+cursor_foreground = #ffffff
 foreground = #000000
+highlight = #b5d5ff
+highlight_foreground = #000000
 color0 = #000000
 color1 = #bb0000
 color2 = #00bb00
diff --git a/data/theme/Builtin Pastel Dark.colors b/data/theme/Builtin Pastel Dark.colors
index f0381c580..71a06b66c 100644
--- a/data/theme/Builtin Pastel Dark.colors
+++ b/data/theme/Builtin Pastel Dark.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #000000
 cursor = #ffa560
+cursor_foreground = #ffffff
 foreground = #bbbbbb
+highlight = #363983
+highlight_foreground = #f2f2f2
 color0 = #4f4f4f
 color1 = #ff6c60
 color2 = #a8ff60
diff --git a/data/theme/Builtin Solarized Dark.colors b/data/theme/Builtin Solarized Dark.colors
index e4073e68b..c5e74eac1 100644
--- a/data/theme/Builtin Solarized Dark.colors
+++ b/data/theme/Builtin Solarized Dark.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #002b36
 cursor = #839496
+cursor_foreground = #073642
 foreground = #839496
+highlight = #073642
+highlight_foreground = #93a1a1
 color0 = #073642
 color1 = #dc322f
 color2 = #859900
diff --git a/data/theme/Builtin Solarized Light.colors b/data/theme/Builtin Solarized Light.colors
index 002de3fd5..6b24e0578 100644
--- a/data/theme/Builtin Solarized Light.colors
+++ b/data/theme/Builtin Solarized Light.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #fdf6e3
 cursor = #657b83
+cursor_foreground = #eee8d5
 foreground = #657b83
+highlight = #eee8d5
+highlight_foreground = #586e75
 color0 = #073642
 color1 = #dc322f
 color2 = #859900
diff --git a/data/theme/Builtin Tango Dark.colors b/data/theme/Builtin Tango Dark.colors
index 4d43e43a8..ccd62c60c 100644
--- a/data/theme/Builtin Tango Dark.colors
+++ b/data/theme/Builtin Tango Dark.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #000000
 cursor = #ffffff
+cursor_foreground = #000000
 foreground = #ffffff
+highlight = #b5d5ff
+highlight_foreground = #000000
 color0 = #000000
 color1 = #cc0000
 color2 = #4e9a06
diff --git a/data/theme/Builtin Tango Light.colors b/data/theme/Builtin Tango Light.colors
index d6001e9b4..643c77b80 100644
--- a/data/theme/Builtin Tango Light.colors
+++ b/data/theme/Builtin Tango Light.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #ffffff
 cursor = #000000
+cursor_foreground = #ffffff
 foreground = #000000
+highlight = #b5d5ff
+highlight_foreground = #000000
 color0 = #000000
 color1 = #cc0000
 color2 = #4e9a06
diff --git a/data/theme/C64.colors b/data/theme/C64.colors
index 0585e776c..5efaed44e 100644
--- a/data/theme/C64.colors
+++ b/data/theme/C64.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #40318d
 cursor = #7869c4
+cursor_foreground = #40318d
 foreground = #7869c4
+highlight = #7869c4
+highlight_foreground = #40318d
 color0 = #090300
 color1 = #883932
 color2 = #55a049
diff --git a/data/theme/CLRS.colors b/data/theme/CLRS.colors
index fd2526af0..30df17492 100644
--- a/data/theme/CLRS.colors
+++ b/data/theme/CLRS.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #ffffff
 cursor = #6fd3fc
+cursor_foreground = #ffffff
 foreground = #262626
+highlight = #6fd3fc
+highlight_foreground = #041730
 color0 = #000000
 color1 = #f8282a
 color2 = #328a5d
diff --git a/data/theme/Calamity.colors b/data/theme/Calamity.colors
index e29a5433d..35b5cb5bf 100644
--- a/data/theme/Calamity.colors
+++ b/data/theme/Calamity.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #2f2833
 cursor = #d5ced9
+cursor_foreground = #2f2833
 foreground = #d5ced9
+highlight = #7e6c88
+highlight_foreground = #d5ced9
 color0 = #2f2833
 color1 = #fc644d
 color2 = #a5f69c
diff --git a/data/theme/Chalk.colors b/data/theme/Chalk.colors
index 1fc008371..c9e08df9d 100644
--- a/data/theme/Chalk.colors
+++ b/data/theme/Chalk.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #2b2d2e
 cursor = #708284
+cursor_foreground = #002831
 foreground = #d2d8d9
+highlight = #e4e8ed
+highlight_foreground = #3f4041
 color0 = #7d8b8f
 color1 = #b23a52
 color2 = #789b6a
diff --git a/data/theme/Chalkboard.colors b/data/theme/Chalkboard.colors
index e7b4389d1..d2278cdb8 100644
--- a/data/theme/Chalkboard.colors
+++ b/data/theme/Chalkboard.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #29262f
 cursor = #d9e6f2
+cursor_foreground = #29262f
 foreground = #d9e6f2
+highlight = #073642
+highlight_foreground = #ffffff
 color0 = #000000
 color1 = #c37372
 color2 = #72c373
diff --git a/data/theme/ChallengerDeep.colors b/data/theme/ChallengerDeep.colors
index eee68254c..8e8c702bc 100644
--- a/data/theme/ChallengerDeep.colors
+++ b/data/theme/ChallengerDeep.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #1e1c31
 cursor = #fbfcfc
+cursor_foreground = #ff271d
 foreground = #cbe1e7
+highlight = #cbe1e7
+highlight_foreground = #1e1c31
 color0 = #141228
 color1 = #ff5458
 color2 = #62d196
diff --git a/data/theme/Chester.colors b/data/theme/Chester.colors
index 2447fdd2a..95f539727 100644
--- a/data/theme/Chester.colors
+++ b/data/theme/Chester.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #2c3643
 cursor = #b4b1b1
+cursor_foreground = #000000
 foreground = #ffffff
+highlight = #67747c
+highlight_foreground = #ffffff
 color0 = #080200
 color1 = #fa5e5b
 color2 = #16c98d
diff --git a/data/theme/Ciapre.colors b/data/theme/Ciapre.colors
index d9c32889f..83e8dce97 100644
--- a/data/theme/Ciapre.colors
+++ b/data/theme/Ciapre.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #191c27
 cursor = #92805b
+cursor_foreground = #181818
 foreground = #aea47a
+highlight = #172539
+highlight_foreground = #aea47f
 color0 = #181818
 color1 = #810009
 color2 = #48513b
diff --git a/data/theme/Cobalt Neon.colors b/data/theme/Cobalt Neon.colors
index be1b722fe..a86e27f42 100644
--- a/data/theme/Cobalt Neon.colors
+++ b/data/theme/Cobalt Neon.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #142838
 cursor = #c4206f
+cursor_foreground = #8ff586
 foreground = #8ff586
+highlight = #094fb1
+highlight_foreground = #8ff586
 color0 = #142631
 color1 = #ff2320
 color2 = #3ba5ff
diff --git a/data/theme/Cobalt2.colors b/data/theme/Cobalt2.colors
index 9788a7edf..5eeb5bde2 100644
--- a/data/theme/Cobalt2.colors
+++ b/data/theme/Cobalt2.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #132738
 cursor = #f0cc09
+cursor_foreground = #fefff2
 foreground = #ffffff
+highlight = #18354f
+highlight_foreground = #b5b5b5
 color0 = #000000
 color1 = #ff0000
 color2 = #38de21
diff --git a/data/theme/CrayonPonyFish.colors b/data/theme/CrayonPonyFish.colors
index 15cf3c4ca..714a480ed 100644
--- a/data/theme/CrayonPonyFish.colors
+++ b/data/theme/CrayonPonyFish.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #150707
 cursor = #68525a
+cursor_foreground = #140707
 foreground = #68525a
+highlight = #2b1b1d
+highlight_foreground = #69525a
 color0 = #2b1b1d
 color1 = #91002b
 color2 = #579524
diff --git a/data/theme/Cyberdyne.colors b/data/theme/Cyberdyne.colors
index 8a5c2642a..2f7de4f9b 100644
--- a/data/theme/Cyberdyne.colors
+++ b/data/theme/Cyberdyne.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #151144
 cursor = #00ff9c
+cursor_foreground = #ffffff
 foreground = #00ff92
+highlight = #454d96
+highlight_foreground = #f4f4f4
 color0 = #080808
 color1 = #ff8373
 color2 = #00c172
diff --git a/data/theme/Dark Pastel.colors b/data/theme/Dark Pastel.colors
index 41d12ef35..d478dcaa2 100644
--- a/data/theme/Dark Pastel.colors
+++ b/data/theme/Dark Pastel.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #000000
 cursor = #bbbbbb
+cursor_foreground = #ffffff
 foreground = #ffffff
+highlight = #b5d5ff
+highlight_foreground = #000000
 color0 = #000000
 color1 = #ff5555
 color2 = #55ff55
diff --git a/data/theme/Dark+.colors b/data/theme/Dark+.colors
index ce538e32d..7c722e75d 100644
--- a/data/theme/Dark+.colors
+++ b/data/theme/Dark+.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #0e0e0e
 cursor = #ffffff
+cursor_foreground = #000000
 foreground = #cccccc
+highlight = #3a3d41
+highlight_foreground = #e0e0e0
 color0 = #000000
 color1 = #cd3131
 color2 = #0dbc79
diff --git a/data/theme/Darkside.colors b/data/theme/Darkside.colors
index 4341bdb7b..4e6f71b28 100644
--- a/data/theme/Darkside.colors
+++ b/data/theme/Darkside.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #222324
 cursor = #bbbbbb
+cursor_foreground = #ffffff
 foreground = #bababa
+highlight = #303333
+highlight_foreground = #bababa
 color0 = #000000
 color1 = #e8341c
 color2 = #68c256
diff --git a/data/theme/Desert.colors b/data/theme/Desert.colors
index 62178acda..bfaad9a8d 100644
--- a/data/theme/Desert.colors
+++ b/data/theme/Desert.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #333333
 cursor = #00ff00
+cursor_foreground = #000000
 foreground = #ffffff
+highlight = #b5d5ff
+highlight_foreground = #000000
 color0 = #4d4d4d
 color1 = #ff2b2b
 color2 = #98fb98
diff --git a/data/theme/DimmedMonokai.colors b/data/theme/DimmedMonokai.colors
index 883931461..1fe23acab 100644
--- a/data/theme/DimmedMonokai.colors
+++ b/data/theme/DimmedMonokai.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #1f1f1f
 cursor = #f83e19
+cursor_foreground = #171717
 foreground = #b9bcba
+highlight = #2a2d32
+highlight_foreground = #b9bcba
 color0 = #3a3d43
 color1 = #be3f48
 color2 = #879a3b
diff --git a/data/theme/Django.colors b/data/theme/Django.colors
index e732b36b2..61463f08f 100644
--- a/data/theme/Django.colors
+++ b/data/theme/Django.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #0b2f20
 cursor = #336442
+cursor_foreground = #f8f8f8
 foreground = #f8f8f8
+highlight = #245032
+highlight_foreground = #f8f8f8
 color0 = #000000
 color1 = #fd6209
 color2 = #41a83e
diff --git a/data/theme/DjangoRebornAgain.colors b/data/theme/DjangoRebornAgain.colors
index fbf4fe1f8..8bd52b191 100644
--- a/data/theme/DjangoRebornAgain.colors
+++ b/data/theme/DjangoRebornAgain.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #051f14
 cursor = #ffcc00
+cursor_foreground = #dadedc
 foreground = #dadedc
+highlight = #203727
+highlight_foreground = #dadedc
 color0 = #000000
 color1 = #fd6209
 color2 = #41a83e
diff --git a/data/theme/DjangoSmooth.colors b/data/theme/DjangoSmooth.colors
index b5c06dd4f..41e4a8b9c 100644
--- a/data/theme/DjangoSmooth.colors
+++ b/data/theme/DjangoSmooth.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #245032
 cursor = #336442
+cursor_foreground = #f8f8f8
 foreground = #f8f8f8
+highlight = #336442
+highlight_foreground = #f8f8f8
 color0 = #000000
 color1 = #fd6209
 color2 = #41a83e
diff --git a/data/theme/DoomOne.colors b/data/theme/DoomOne.colors
index b1dcae3b0..95a8fafaf 100644
--- a/data/theme/DoomOne.colors
+++ b/data/theme/DoomOne.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #282c34
 cursor = #51afef
+cursor_foreground = #1b1b1b
 foreground = #bbc2cf
+highlight = #42444b
+highlight_foreground = #bbc2cf
 color0 = #000000
 color1 = #ff6c6b
 color2 = #98be65
diff --git a/data/theme/DotGov.colors b/data/theme/DotGov.colors
index 922433b94..fe73620a3 100644
--- a/data/theme/DotGov.colors
+++ b/data/theme/DotGov.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #262c35
 cursor = #d9002f
+cursor_foreground = #ffffff
 foreground = #ebebeb
+highlight = #1a4080
+highlight_foreground = #ffffff
 color0 = #191919
 color1 = #bf091d
 color2 = #3d9751
diff --git a/data/theme/Dracula+.colors b/data/theme/Dracula+.colors
index aa484b5f0..4165f5e06 100644
--- a/data/theme/Dracula+.colors
+++ b/data/theme/Dracula+.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #212121
 cursor = #eceff4
+cursor_foreground = #282828
 foreground = #f8f8f2
+highlight = #f8f8f2
+highlight_foreground = #545454
 color0 = #21222c
 color1 = #ff5555
 color2 = #50fa7b
diff --git a/data/theme/Dracula.colors b/data/theme/Dracula.colors
index 97aa5f3fc..7b65f633b 100644
--- a/data/theme/Dracula.colors
+++ b/data/theme/Dracula.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #1e1f29
 cursor = #bbbbbb
+cursor_foreground = #ffffff
 foreground = #f8f8f2
+highlight = #44475a
+highlight_foreground = #ffffff
 color0 = #000000
 color1 = #ff5555
 color2 = #50fa7b
diff --git a/data/theme/Duotone Dark.colors b/data/theme/Duotone Dark.colors
index 0d1d6e871..37bdb47c3 100644
--- a/data/theme/Duotone Dark.colors
+++ b/data/theme/Duotone Dark.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #1f1d27
 cursor = #ff9839
+cursor_foreground = #1f1d27
 foreground = #b7a1ff
+highlight = #353147
+highlight_foreground = #b7a2ff
 color0 = #1f1d27
 color1 = #d9393e
 color2 = #2dcd73
diff --git a/data/theme/ENCOM.colors b/data/theme/ENCOM.colors
index 5e76d4ddf..bfe205bb5 100644
--- a/data/theme/ENCOM.colors
+++ b/data/theme/ENCOM.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #000000
 cursor = #bbbbbb
+cursor_foreground = #ffffff
 foreground = #00a595
+highlight = #00a48c
+highlight_foreground = #3de1c9
 color0 = #000000
 color1 = #9f0000
 color2 = #008b00
diff --git a/data/theme/Earthsong.colors b/data/theme/Earthsong.colors
index 5bca42f05..ce7bd0990 100644
--- a/data/theme/Earthsong.colors
+++ b/data/theme/Earthsong.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #292520
 cursor = #f6f7ec
+cursor_foreground = #292520
 foreground = #e5c7a9
+highlight = #121418
+highlight_foreground = #e5c7a9
 color0 = #121418
 color1 = #c94234
 color2 = #85c54c
diff --git a/data/theme/Elemental.colors b/data/theme/Elemental.colors
index a649b2100..1bea998fa 100644
--- a/data/theme/Elemental.colors
+++ b/data/theme/Elemental.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #22211d
 cursor = #facb80
+cursor_foreground = #161611
 foreground = #807a74
+highlight = #413829
+highlight_foreground = #facd77
 color0 = #3c3c30
 color1 = #98290f
 color2 = #479a43
diff --git a/data/theme/Elementary.colors b/data/theme/Elementary.colors
index bb964b550..9746b7aed 100644
--- a/data/theme/Elementary.colors
+++ b/data/theme/Elementary.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #181818
 cursor = #bbbbbb
+cursor_foreground = #ffffff
 foreground = #efefef
+highlight = #b5d5ff
+highlight_foreground = #000000
 color0 = #242424
 color1 = #d71c15
 color2 = #5aa513
diff --git a/data/theme/Espresso Libre.colors b/data/theme/Espresso Libre.colors
index 9a3e54b7a..2bf2b30da 100644
--- a/data/theme/Espresso Libre.colors
+++ b/data/theme/Espresso Libre.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #2a211c
 cursor = #ffffff
+cursor_foreground = #000000
 foreground = #b8a898
+highlight = #c3dcff
+highlight_foreground = #b8a898
 color0 = #000000
 color1 = #cc0000
 color2 = #1a921c
diff --git a/data/theme/Espresso.colors b/data/theme/Espresso.colors
index dce8ef0b1..2bdc8b75b 100644
--- a/data/theme/Espresso.colors
+++ b/data/theme/Espresso.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #323232
 cursor = #d6d6d6
+cursor_foreground = #ffffff
 foreground = #ffffff
+highlight = #5b5b5b
+highlight_foreground = #ffffff
 color0 = #353535
 color1 = #d25252
 color2 = #a5c261
diff --git a/data/theme/Fahrenheit.colors b/data/theme/Fahrenheit.colors
index 69a1587f9..4fd740f21 100644
--- a/data/theme/Fahrenheit.colors
+++ b/data/theme/Fahrenheit.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #000000
 cursor = #bbbbbb
+cursor_foreground = #ffffff
 foreground = #ffffce
+highlight = #4e739f
+highlight_foreground = #ffffce
 color0 = #1d1d1d
 color1 = #cda074
 color2 = #9e744d
diff --git a/data/theme/Fideloper.colors b/data/theme/Fideloper.colors
index 2af16ba94..28b3b0b90 100644
--- a/data/theme/Fideloper.colors
+++ b/data/theme/Fideloper.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #292f33
 cursor = #d4605a
+cursor_foreground = #fefff2
 foreground = #dbdae0
+highlight = #efb8ac
+highlight_foreground = #ffffff
 color0 = #292f33
 color1 = #cb1e2d
 color2 = #edb8ac
diff --git a/data/theme/FirefoxDev.colors b/data/theme/FirefoxDev.colors
index 0f79e4b2f..f0c3ae58f 100644
--- a/data/theme/FirefoxDev.colors
+++ b/data/theme/FirefoxDev.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #0e1011
 cursor = #708284
+cursor_foreground = #002831
 foreground = #7c8fa4
+highlight = #163c61
+highlight_foreground = #f2f5f9
 color0 = #002831
 color1 = #e63853
 color2 = #5eb83c
diff --git a/data/theme/Firewatch.colors b/data/theme/Firewatch.colors
index 66c6f70a3..b1bb2fe45 100644
--- a/data/theme/Firewatch.colors
+++ b/data/theme/Firewatch.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #1e2027
 cursor = #f6f7ec
+cursor_foreground = #c4c5b5
 foreground = #9ba2b2
+highlight = #2f363e
+highlight_foreground = #7d8fa4
 color0 = #585f6d
 color1 = #d95360
 color2 = #5ab977
diff --git a/data/theme/FishTank.colors b/data/theme/FishTank.colors
index 23202b238..51c23c1b5 100644
--- a/data/theme/FishTank.colors
+++ b/data/theme/FishTank.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #232537
 cursor = #fecd5e
+cursor_foreground = #232537
 foreground = #ecf0fe
+highlight = #fcf7e9
+highlight_foreground = #232537
 color0 = #03073c
 color1 = #c6004a
 color2 = #acf157
diff --git a/data/theme/Flat.colors b/data/theme/Flat.colors
index c9d6eaadd..8ad057f1f 100644
--- a/data/theme/Flat.colors
+++ b/data/theme/Flat.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #002240
 cursor = #e5be0c
+cursor_foreground = #ffffff
 foreground = #2cc55d
+highlight = #792b9c
+highlight_foreground = #ffffff
 color0 = #222d3f
 color1 = #a82320
 color2 = #32a548
diff --git a/data/theme/Flatland.colors b/data/theme/Flatland.colors
index 391b92740..d903b59cb 100644
--- a/data/theme/Flatland.colors
+++ b/data/theme/Flatland.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #1d1f21
 cursor = #708284
+cursor_foreground = #002831
 foreground = #b8dbef
+highlight = #2b2a24
+highlight_foreground = #ffffff
 color0 = #1d1d19
 color1 = #f18339
 color2 = #9fd364
diff --git a/data/theme/Floraverse.colors b/data/theme/Floraverse.colors
index 9171a809d..06ec5f8f4 100644
--- a/data/theme/Floraverse.colors
+++ b/data/theme/Floraverse.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #0e0d15
 cursor = #bbbbbb
+cursor_foreground = #ffffff
 foreground = #dbd1b9
+highlight = #f3e0b8
+highlight_foreground = #08002e
 color0 = #08002e
 color1 = #64002c
 color2 = #5d731a
diff --git a/data/theme/ForestBlue.colors b/data/theme/ForestBlue.colors
index ded094ed6..2b224ab22 100644
--- a/data/theme/ForestBlue.colors
+++ b/data/theme/ForestBlue.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #051519
 cursor = #9e9ecb
+cursor_foreground = #000000
 foreground = #e2d8cd
+highlight = #4d4d4d
+highlight_foreground = #ffffff
 color0 = #333333
 color1 = #f8818e
 color2 = #92d3a2
diff --git a/data/theme/Framer.colors b/data/theme/Framer.colors
index cbe37a9ee..11b756f2f 100644
--- a/data/theme/Framer.colors
+++ b/data/theme/Framer.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #111111
 cursor = #fcdc08
+cursor_foreground = #161616
 foreground = #777777
+highlight = #666666
+highlight_foreground = #ffffff
 color0 = #141414
 color1 = #ff5555
 color2 = #98ec65
diff --git a/data/theme/FrontEndDelight.colors b/data/theme/FrontEndDelight.colors
index 6857e1069..629e28df9 100644
--- a/data/theme/FrontEndDelight.colors
+++ b/data/theme/FrontEndDelight.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #1b1c1d
 cursor = #cdcdcd
+cursor_foreground = #1b1c1d
 foreground = #adadad
+highlight = #ea6154
+highlight_foreground = #1b1c1d
 color0 = #242526
 color1 = #f8511b
 color2 = #565747
diff --git a/data/theme/FunForrest.colors b/data/theme/FunForrest.colors
index 5193578fa..69711a444 100644
--- a/data/theme/FunForrest.colors
+++ b/data/theme/FunForrest.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #251200
 cursor = #e5591c
+cursor_foreground = #000000
 foreground = #dec165
+highlight = #e5591c
+highlight_foreground = #000000
 color0 = #000000
 color1 = #d6262b
 color2 = #919c00
diff --git a/data/theme/Galaxy.colors b/data/theme/Galaxy.colors
index 8b73e774e..de46d4a69 100644
--- a/data/theme/Galaxy.colors
+++ b/data/theme/Galaxy.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #1d2837
 cursor = #bbbbbb
+cursor_foreground = #ffffff
 foreground = #ffffff
+highlight = #b5d5ff
+highlight_foreground = #000000
 color0 = #000000
 color1 = #f9555f
 color2 = #21b089
diff --git a/data/theme/Github.colors b/data/theme/Github.colors
index e8d547a11..3ac011bfb 100644
--- a/data/theme/Github.colors
+++ b/data/theme/Github.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #f4f4f4
 cursor = #3f3f3f
+cursor_foreground = #f4f4f4
 foreground = #3e3e3e
+highlight = #a9c1e2
+highlight_foreground = #535353
 color0 = #3e3e3e
 color1 = #970b16
 color2 = #07962a
diff --git a/data/theme/Glacier.colors b/data/theme/Glacier.colors
index 547d96e40..948a3d389 100644
--- a/data/theme/Glacier.colors
+++ b/data/theme/Glacier.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #0c1115
 cursor = #6c6c6c
+cursor_foreground = #6c6c6c
 foreground = #ffffff
+highlight = #bd2523
+highlight_foreground = #ffffff
 color0 = #2e343c
 color1 = #bd0f2f
 color2 = #35a770
diff --git a/data/theme/Grape.colors b/data/theme/Grape.colors
index f4710a4ad..856d8e1de 100644
--- a/data/theme/Grape.colors
+++ b/data/theme/Grape.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #171423
 cursor = #a288f7
+cursor_foreground = #171422
 foreground = #9f9fa1
+highlight = #493d70
+highlight_foreground = #171422
 color0 = #2d283f
 color1 = #ed2261
 color2 = #1fa91b
diff --git a/data/theme/Grass.colors b/data/theme/Grass.colors
index 726d10ca0..64413eb16 100644
--- a/data/theme/Grass.colors
+++ b/data/theme/Grass.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #13773d
 cursor = #8c2800
+cursor_foreground = #ffffff
 foreground = #fff0a5
+highlight = #b64926
+highlight_foreground = #ffffff
 color0 = #000000
 color1 = #bb0000
 color2 = #00bb00
diff --git a/data/theme/Gruvbox Dark.colors b/data/theme/Gruvbox Dark.colors
index 1cd7af546..61974d840 100644
--- a/data/theme/Gruvbox Dark.colors
+++ b/data/theme/Gruvbox Dark.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #1e1e1e
 cursor = #e6d4a3
+cursor_foreground = #1e1e1e
 foreground = #e6d4a3
+highlight = #e6d4a3
+highlight_foreground = #534a42
 color0 = #1e1e1e
 color1 = #be0f17
 color2 = #868715
diff --git a/data/theme/Gruvbox Light.colors b/data/theme/Gruvbox Light.colors
index 9b7374a7d..2d51dec58 100644
--- a/data/theme/Gruvbox Light.colors
+++ b/data/theme/Gruvbox Light.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #fbf1c7
 cursor = #282828
+cursor_foreground = #282828
 foreground = #282828
+highlight = #d5c4a1
+highlight_foreground = #665c54
 color0 = #fbf1c7
 color1 = #9d0006
 color2 = #79740e
diff --git a/data/theme/Guezwhoz.colors b/data/theme/Guezwhoz.colors
index d0cf067a1..473e072ec 100644
--- a/data/theme/Guezwhoz.colors
+++ b/data/theme/Guezwhoz.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #1c1c1c
 cursor = #eeeeee
+cursor_foreground = #eeeeee
 foreground = #d0d0d0
+highlight = #005f5f
+highlight_foreground = #eeeeee
 color0 = #080808
 color1 = #ff5f5f
 color2 = #87d7af
diff --git a/data/theme/Hacktober.colors b/data/theme/Hacktober.colors
index b10d10d5e..9c8a9bd65 100644
--- a/data/theme/Hacktober.colors
+++ b/data/theme/Hacktober.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #141414
 cursor = #c9c9c9
+cursor_foreground = #141414
 foreground = #c9c9c9
+highlight = #141414
+highlight_foreground = #c9c9c9
 color0 = #191918
 color1 = #b34538
 color2 = #587744
diff --git a/data/theme/Hardcore.colors b/data/theme/Hardcore.colors
index d7632b218..a60e75572 100644
--- a/data/theme/Hardcore.colors
+++ b/data/theme/Hardcore.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #121212
 cursor = #bbbbbb
+cursor_foreground = #ffffff
 foreground = #a0a0a0
+highlight = #453b39
+highlight_foreground = #b6bbc0
 color0 = #1b1d1e
 color1 = #f92672
 color2 = #a6e22e
diff --git a/data/theme/Harper.colors b/data/theme/Harper.colors
index a00a90d11..de2266520 100644
--- a/data/theme/Harper.colors
+++ b/data/theme/Harper.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #010101
 cursor = #a8a49d
+cursor_foreground = #010101
 foreground = #a8a49d
+highlight = #5a5753
+highlight_foreground = #a8a49d
 color0 = #010101
 color1 = #f8b63f
 color2 = #7fb5e1
diff --git a/data/theme/Highway.colors b/data/theme/Highway.colors
index f3a733d7a..120979ad2 100644
--- a/data/theme/Highway.colors
+++ b/data/theme/Highway.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #222225
 cursor = #e0d9b9
+cursor_foreground = #1f192a
 foreground = #ededed
+highlight = #384564
+highlight_foreground = #ededed
 color0 = #000000
 color1 = #d00e18
 color2 = #138034
diff --git a/data/theme/Hipster Green.colors b/data/theme/Hipster Green.colors
index 0c52f08ad..911cdbe4c 100644
--- a/data/theme/Hipster Green.colors
+++ b/data/theme/Hipster Green.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #100b05
 cursor = #23ff18
+cursor_foreground = #ff0018
 foreground = #84c138
+highlight = #083905
+highlight_foreground = #ffffff
 color0 = #000000
 color1 = #b6214a
 color2 = #00a600
diff --git a/data/theme/Hivacruz.colors b/data/theme/Hivacruz.colors
index 0527fc52d..9a059cecd 100644
--- a/data/theme/Hivacruz.colors
+++ b/data/theme/Hivacruz.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #132638
 cursor = #979db4
+cursor_foreground = #202746
 foreground = #ede4e4
+highlight = #5e6687
+highlight_foreground = #979db4
 color0 = #202746
 color1 = #c94922
 color2 = #ac9739
diff --git a/data/theme/Homebrew.colors b/data/theme/Homebrew.colors
index eead27810..2c8e4ad66 100644
--- a/data/theme/Homebrew.colors
+++ b/data/theme/Homebrew.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #000000
 cursor = #23ff18
+cursor_foreground = #ff0018
 foreground = #00ff00
+highlight = #083905
+highlight_foreground = #ffffff
 color0 = #000000
 color1 = #990000
 color2 = #00a600
diff --git a/data/theme/Hopscotch.256.colors b/data/theme/Hopscotch.256.colors
index 282f9ed0e..a08535f67 100644
--- a/data/theme/Hopscotch.256.colors
+++ b/data/theme/Hopscotch.256.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #322931
 cursor = #b9b5b8
+cursor_foreground = #322931
 foreground = #b9b5b8
+highlight = #5c545b
+highlight_foreground = #b9b5b8
 color0 = #322931
 color1 = #dd464c
 color2 = #8fc13e
diff --git a/data/theme/Hopscotch.colors b/data/theme/Hopscotch.colors
index 5eb2198e9..9a7c9d913 100644
--- a/data/theme/Hopscotch.colors
+++ b/data/theme/Hopscotch.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #322931
 cursor = #b9b5b8
+cursor_foreground = #322931
 foreground = #b9b5b8
+highlight = #5c545b
+highlight_foreground = #b9b5b8
 color0 = #322931
 color1 = #dd464c
 color2 = #8fc13e
diff --git a/data/theme/Hurtado.colors b/data/theme/Hurtado.colors
index e6087b816..6593ce098 100644
--- a/data/theme/Hurtado.colors
+++ b/data/theme/Hurtado.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #000000
 cursor = #bbbbbb
+cursor_foreground = #ffffff
 foreground = #dbdbdb
+highlight = #b5d5ff
+highlight_foreground = #000000
 color0 = #575757
 color1 = #ff1b00
 color2 = #a5e055
diff --git a/data/theme/Hybrid.colors b/data/theme/Hybrid.colors
index 56eb8e9c7..9a6ef4f3e 100644
--- a/data/theme/Hybrid.colors
+++ b/data/theme/Hybrid.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #161719
 cursor = #b7bcba
+cursor_foreground = #1e1f22
 foreground = #b7bcba
+highlight = #1e1f22
+highlight_foreground = #b7bcba
 color0 = #2a2e33
 color1 = #b84d51
 color2 = #b3bf5a
diff --git a/data/theme/IC_Green_PPL.colors b/data/theme/IC_Green_PPL.colors
index 25c6d8d22..b7e0fcaef 100644
--- a/data/theme/IC_Green_PPL.colors
+++ b/data/theme/IC_Green_PPL.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #2c2c2c
 cursor = #47fa6b
+cursor_foreground = #292929
 foreground = #e0f1dc
+highlight = #116b41
+highlight_foreground = #e0f1dc
 color0 = #014401
 color1 = #ff2736
 color2 = #41a638
diff --git a/data/theme/IC_Orange_PPL.colors b/data/theme/IC_Orange_PPL.colors
index 6add03b64..e590fdb52 100644
--- a/data/theme/IC_Orange_PPL.colors
+++ b/data/theme/IC_Orange_PPL.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #262626
 cursor = #fc531d
+cursor_foreground = #ffc88a
 foreground = #ffcb83
+highlight = #c14020
+highlight_foreground = #ffc88a
 color0 = #000000
 color1 = #c13900
 color2 = #a4a900
diff --git a/data/theme/IR_Black.colors b/data/theme/IR_Black.colors
index fe3f8539c..8504ed646 100644
--- a/data/theme/IR_Black.colors
+++ b/data/theme/IR_Black.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #000000
 cursor = #808080
+cursor_foreground = #ffffff
 foreground = #f1f1f1
+highlight = #b5d5ff
+highlight_foreground = #000000
 color0 = #4f4f4f
 color1 = #fa6c60
 color2 = #a8ff60
diff --git a/data/theme/Jackie Brown.colors b/data/theme/Jackie Brown.colors
index d4356e5c8..b3c5de3cc 100644
--- a/data/theme/Jackie Brown.colors
+++ b/data/theme/Jackie Brown.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #2c1d16
 cursor = #23ff18
+cursor_foreground = #ff0018
 foreground = #ffcc2f
+highlight = #af8d21
+highlight_foreground = #ffffff
 color0 = #2c1d16
 color1 = #ef5734
 color2 = #2baf2b
diff --git a/data/theme/Japanesque.colors b/data/theme/Japanesque.colors
index 489183b9f..0de7d1387 100644
--- a/data/theme/Japanesque.colors
+++ b/data/theme/Japanesque.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #1e1e1e
 cursor = #edcf4f
+cursor_foreground = #343935
 foreground = #f7f6ec
+highlight = #175877
+highlight_foreground = #f7f6ec
 color0 = #343935
 color1 = #cf3f61
 color2 = #7bb75b
diff --git a/data/theme/Jellybeans.colors b/data/theme/Jellybeans.colors
index 687c81516..d3dd4885e 100644
--- a/data/theme/Jellybeans.colors
+++ b/data/theme/Jellybeans.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #121212
 cursor = #ffa560
+cursor_foreground = #ffffff
 foreground = #dedede
+highlight = #474e91
+highlight_foreground = #f4f4f4
 color0 = #929292
 color1 = #e27373
 color2 = #94b979
diff --git a/data/theme/JetBrains Darcula.colors b/data/theme/JetBrains Darcula.colors
index 70e1fe4fd..db81ad2ff 100644
--- a/data/theme/JetBrains Darcula.colors
+++ b/data/theme/JetBrains Darcula.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #202020
 cursor = #ffffff
+cursor_foreground = #000000
 foreground = #adadad
+highlight = #1a3272
+highlight_foreground = #adadad
 color0 = #000000
 color1 = #fa5355
 color2 = #126e00
diff --git a/data/theme/Kibble.colors b/data/theme/Kibble.colors
index 15a77bbae..690f3822d 100644
--- a/data/theme/Kibble.colors
+++ b/data/theme/Kibble.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #0e100a
 cursor = #9fda9c
+cursor_foreground = #000000
 foreground = #f7f7f7
+highlight = #9ba787
+highlight_foreground = #000000
 color0 = #4d4d4d
 color1 = #c70031
 color2 = #29cf13
diff --git a/data/theme/Kolorit.colors b/data/theme/Kolorit.colors
index 6d2055b47..185dab3b8 100644
--- a/data/theme/Kolorit.colors
+++ b/data/theme/Kolorit.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #1d1a1e
 cursor = #c7c7c7
+cursor_foreground = #ffffff
 foreground = #efecec
+highlight = #e1925c
+highlight_foreground = #1d1a1e
 color0 = #1d1a1e
 color1 = #ff5b82
 color2 = #47d7a1
diff --git a/data/theme/Konsolas.colors b/data/theme/Konsolas.colors
index 5fe740cc8..f2bad7216 100644
--- a/data/theme/Konsolas.colors
+++ b/data/theme/Konsolas.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #060606
 cursor = #c8c1c1
+cursor_foreground = #060606
 foreground = #c8c1c1
+highlight = #060606
+highlight_foreground = #c8c1c1
 color0 = #000000
 color1 = #aa1717
 color2 = #18b218
diff --git a/data/theme/Lab Fox.colors b/data/theme/Lab Fox.colors
index d5977f059..45c327950 100644
--- a/data/theme/Lab Fox.colors
+++ b/data/theme/Lab Fox.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #2e2e2e
 cursor = #7f7f7f
+cursor_foreground = #7f7f7f
 foreground = #ffffff
+highlight = #cb392e
+highlight_foreground = #ffffff
 color0 = #2e2e2e
 color1 = #fc6d26
 color2 = #3eb383
diff --git a/data/theme/Laser.colors b/data/theme/Laser.colors
index 0db033bf1..ec2e6f1d5 100644
--- a/data/theme/Laser.colors
+++ b/data/theme/Laser.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #030d18
 cursor = #00ff9c
+cursor_foreground = #ffffff
 foreground = #f106e3
+highlight = #2e206a
+highlight_foreground = #f4f4f4
 color0 = #626262
 color1 = #ff8373
 color2 = #b4fb73
diff --git a/data/theme/Later This Evening.colors b/data/theme/Later This Evening.colors
index a444ed3b5..ecf337e26 100644
--- a/data/theme/Later This Evening.colors
+++ b/data/theme/Later This Evening.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #222222
 cursor = #424242
+cursor_foreground = #959595
 foreground = #959595
+highlight = #424242
+highlight_foreground = #959595
 color0 = #2b2b2b
 color1 = #d45a60
 color2 = #afba67
diff --git a/data/theme/Lavandula.colors b/data/theme/Lavandula.colors
index c3f3ef766..0d280b39e 100644
--- a/data/theme/Lavandula.colors
+++ b/data/theme/Lavandula.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #050014
 cursor = #8c91fa
+cursor_foreground = #050014
 foreground = #736e7d
+highlight = #37323c
+highlight_foreground = #8c91fa
 color0 = #230046
 color1 = #7d1625
 color2 = #337e6f
diff --git a/data/theme/LiquidCarbon.colors b/data/theme/LiquidCarbon.colors
index f35cda17a..d060600bf 100644
--- a/data/theme/LiquidCarbon.colors
+++ b/data/theme/LiquidCarbon.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #303030
 cursor = #ffffff
+cursor_foreground = #000000
 foreground = #afc2c2
+highlight = #7dbeff
+highlight_foreground = #000000
 color0 = #000000
 color1 = #ff3030
 color2 = #559a70
diff --git a/data/theme/LiquidCarbonTransparent.colors b/data/theme/LiquidCarbonTransparent.colors
index 6900aa9f1..70a357b1a 100644
--- a/data/theme/LiquidCarbonTransparent.colors
+++ b/data/theme/LiquidCarbonTransparent.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #000000
 cursor = #ffffff
+cursor_foreground = #000000
 foreground = #afc2c2
+highlight = #7dbeff
+highlight_foreground = #000000
 color0 = #000000
 color1 = #ff3030
 color2 = #559a70
diff --git a/data/theme/LiquidCarbonTransparentInverse.colors b/data/theme/LiquidCarbonTransparentInverse.colors
index 6437a18ed..5998ccafe 100644
--- a/data/theme/LiquidCarbonTransparentInverse.colors
+++ b/data/theme/LiquidCarbonTransparentInverse.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #000000
 cursor = #ffffff
+cursor_foreground = #000000
 foreground = #afc2c2
+highlight = #7dbeff
+highlight_foreground = #000000
 color0 = #bccccd
 color1 = #ff3030
 color2 = #559a70
diff --git a/data/theme/Man Page.colors b/data/theme/Man Page.colors
index 2f832e9c2..b6fe789ea 100644
--- a/data/theme/Man Page.colors
+++ b/data/theme/Man Page.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #fef49c
 cursor = #7f7f7f
+cursor_foreground = #000000
 foreground = #000000
+highlight = #a4c9cd
+highlight_foreground = #000000
 color0 = #000000
 color1 = #cc0000
 color2 = #00a600
diff --git a/data/theme/Material.colors b/data/theme/Material.colors
index b67f3de1d..169eab720 100644
--- a/data/theme/Material.colors
+++ b/data/theme/Material.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #eaeaea
 cursor = #16afca
+cursor_foreground = #2e2e2d
 foreground = #232322
+highlight = #c2c2c2
+highlight_foreground = #4e4e4e
 color0 = #212121
 color1 = #b7141f
 color2 = #457b24
diff --git a/data/theme/MaterialDark.colors b/data/theme/MaterialDark.colors
index bfe97a43d..83572becd 100644
--- a/data/theme/MaterialDark.colors
+++ b/data/theme/MaterialDark.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #232322
 cursor = #16afca
+cursor_foreground = #dfdfdf
 foreground = #e5e5e5
+highlight = #dfdfdf
+highlight_foreground = #3d3d3d
 color0 = #212121
 color1 = #b7141f
 color2 = #457b24
diff --git a/data/theme/MaterialDarker.colors b/data/theme/MaterialDarker.colors
index 8c7b66fa4..7521acb80 100644
--- a/data/theme/MaterialDarker.colors
+++ b/data/theme/MaterialDarker.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #212121
 cursor = #ffffff
+cursor_foreground = #ffffff
 foreground = #eeffff
+highlight = #eeffff
+highlight_foreground = #545454
 color0 = #000000
 color1 = #ff5370
 color2 = #c3e88d
diff --git a/data/theme/MaterialOcean.colors b/data/theme/MaterialOcean.colors
index 556d965e5..ab4949d25 100644
--- a/data/theme/MaterialOcean.colors
+++ b/data/theme/MaterialOcean.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #0f111a
 cursor = #ffcc00
+cursor_foreground = #0f111a
 foreground = #8f93a2
+highlight = #1f2233
+highlight_foreground = #8f93a2
 color0 = #546e7a
 color1 = #ff5370
 color2 = #c3e88d
diff --git a/data/theme/Mathias.colors b/data/theme/Mathias.colors
index 835f2fc34..cdf0eaa7d 100644
--- a/data/theme/Mathias.colors
+++ b/data/theme/Mathias.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #000000
 cursor = #bbbbbb
+cursor_foreground = #ffffff
 foreground = #bbbbbb
+highlight = #555555
+highlight_foreground = #f2f2f2
 color0 = #000000
 color1 = #e52222
 color2 = #a6e32d
diff --git a/data/theme/Medallion.colors b/data/theme/Medallion.colors
index 701607fe4..0561d96a7 100644
--- a/data/theme/Medallion.colors
+++ b/data/theme/Medallion.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #1d1908
 cursor = #d3ba30
+cursor_foreground = #d2bc3d
 foreground = #cac296
+highlight = #626dac
+highlight_foreground = #cac29a
 color0 = #000000
 color1 = #b64c00
 color2 = #7c8b16
diff --git a/data/theme/Mirage.colors b/data/theme/Mirage.colors
index 408d87075..298febbfe 100644
--- a/data/theme/Mirage.colors
+++ b/data/theme/Mirage.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #1b2738
 cursor = #ddb3ff
+cursor_foreground = #ffffff
 foreground = #a6b2c0
+highlight = #273951
+highlight_foreground = #d3dbe5
 color0 = #011627
 color1 = #ff9999
 color2 = #85cc95
diff --git a/data/theme/Misterioso.colors b/data/theme/Misterioso.colors
index 3168a2a2a..d446b825b 100644
--- a/data/theme/Misterioso.colors
+++ b/data/theme/Misterioso.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #2d3743
 cursor = #000000
+cursor_foreground = #ffffff
 foreground = #e1e1e0
+highlight = #2d37ff
+highlight_foreground = #000000
 color0 = #000000
 color1 = #ff4242
 color2 = #74af68
diff --git a/data/theme/Molokai.colors b/data/theme/Molokai.colors
index 37e096086..7a1f64e9b 100644
--- a/data/theme/Molokai.colors
+++ b/data/theme/Molokai.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #121212
 cursor = #bbbbbb
+cursor_foreground = #ffffff
 foreground = #bbbbbb
+highlight = #b5d5ff
+highlight_foreground = #000000
 color0 = #121212
 color1 = #fa2573
 color2 = #98e123
diff --git a/data/theme/MonaLisa.colors b/data/theme/MonaLisa.colors
index aeef69d30..eac5af58d 100644
--- a/data/theme/MonaLisa.colors
+++ b/data/theme/MonaLisa.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #120b0d
 cursor = #c46c32
+cursor_foreground = #120b0d
 foreground = #f7d66a
+highlight = #f7d66a
+highlight_foreground = #120b0d
 color0 = #351b0e
 color1 = #9b291c
 color2 = #636232
diff --git a/data/theme/Monokai Remastered.colors b/data/theme/Monokai Remastered.colors
index 7e10ed5f8..b9b234c13 100644
--- a/data/theme/Monokai Remastered.colors
+++ b/data/theme/Monokai Remastered.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #0c0c0c
 cursor = #fc971f
+cursor_foreground = #000000
 foreground = #d9d9d9
+highlight = #343434
+highlight_foreground = #ffffff
 color0 = #1a1a1a
 color1 = #f4005f
 color2 = #98e024
diff --git a/data/theme/Monokai Soda.colors b/data/theme/Monokai Soda.colors
index 516781cdb..9973433dd 100644
--- a/data/theme/Monokai Soda.colors
+++ b/data/theme/Monokai Soda.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #1a1a1a
 cursor = #f6f7ec
+cursor_foreground = #c4c5b5
 foreground = #c4c5b5
+highlight = #343434
+highlight_foreground = #c4c5b5
 color0 = #1a1a1a
 color1 = #f4005f
 color2 = #98e024
diff --git a/data/theme/Monokai Vivid.colors b/data/theme/Monokai Vivid.colors
index f95900119..1124606b3 100644
--- a/data/theme/Monokai Vivid.colors
+++ b/data/theme/Monokai Vivid.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #121212
 cursor = #fb0007
+cursor_foreground = #ea0009
 foreground = #f9f9f9
+highlight = #ffffff
+highlight_foreground = #000000
 color0 = #121212
 color1 = #fa2934
 color2 = #98e123
diff --git a/data/theme/N0tch2k.colors b/data/theme/N0tch2k.colors
index b8eea96f9..da42db8d9 100644
--- a/data/theme/N0tch2k.colors
+++ b/data/theme/N0tch2k.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #222222
 cursor = #aa9175
+cursor_foreground = #000000
 foreground = #a0a0a0
+highlight = #4d4d4d
+highlight_foreground = #ffffff
 color0 = #383838
 color1 = #a95551
 color2 = #666666
diff --git a/data/theme/Neopolitan.colors b/data/theme/Neopolitan.colors
index 8f98023a8..97d3f0150 100644
--- a/data/theme/Neopolitan.colors
+++ b/data/theme/Neopolitan.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #271f19
 cursor = #ffffff
+cursor_foreground = #ffffff
 foreground = #ffffff
+highlight = #253b76
+highlight_foreground = #ffffff
 color0 = #000000
 color1 = #800000
 color2 = #61ce3c
diff --git a/data/theme/Neutron.colors b/data/theme/Neutron.colors
index c497a3053..da7f892e3 100644
--- a/data/theme/Neutron.colors
+++ b/data/theme/Neutron.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #1c1e22
 cursor = #f6f7ec
+cursor_foreground = #c4c5b5
 foreground = #e6e8ef
+highlight = #2f363e
+highlight_foreground = #7d8fa4
 color0 = #23252b
 color1 = #b54036
 color2 = #5ab977
diff --git a/data/theme/Night Owlish Light.colors b/data/theme/Night Owlish Light.colors
index ad100fafe..6edfffae7 100644
--- a/data/theme/Night Owlish Light.colors
+++ b/data/theme/Night Owlish Light.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #ffffff
 cursor = #403f53
+cursor_foreground = #fbfbfb
 foreground = #403f53
+highlight = #f2f2f2
+highlight_foreground = #403f53
 color0 = #011627
 color1 = #d3423e
 color2 = #2aa298
diff --git a/data/theme/NightLion v1.colors b/data/theme/NightLion v1.colors
index 6b6be1046..4a42621b1 100644
--- a/data/theme/NightLion v1.colors
+++ b/data/theme/NightLion v1.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #000000
 cursor = #bbbbbb
+cursor_foreground = #ffffff
 foreground = #bbbbbb
+highlight = #b5d5ff
+highlight_foreground = #000000
 color0 = #4c4c4c
 color1 = #bb0000
 color2 = #5fde8f
diff --git a/data/theme/NightLion v2.colors b/data/theme/NightLion v2.colors
index 2ec421ba8..a36175dbe 100644
--- a/data/theme/NightLion v2.colors
+++ b/data/theme/NightLion v2.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #171717
 cursor = #bbbbbb
+cursor_foreground = #ffffff
 foreground = #bbbbbb
+highlight = #b5d5ff
+highlight_foreground = #000000
 color0 = #4c4c4c
 color1 = #bb0000
 color2 = #04f623
diff --git a/data/theme/Nocturnal Winter.colors b/data/theme/Nocturnal Winter.colors
index 26ed7cecb..e10f37226 100644
--- a/data/theme/Nocturnal Winter.colors
+++ b/data/theme/Nocturnal Winter.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #0d0d17
 cursor = #e6e5e5
+cursor_foreground = #ffffff
 foreground = #e6e5e5
+highlight = #adbdd0
+highlight_foreground = #000000
 color0 = #4d4d4d
 color1 = #f12d52
 color2 = #09cd7e
diff --git a/data/theme/Novel.colors b/data/theme/Novel.colors
index 27f9ee2b7..8ad433c5b 100644
--- a/data/theme/Novel.colors
+++ b/data/theme/Novel.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #dfdbc3
 cursor = #73635a
+cursor_foreground = #000000
 foreground = #3b2322
+highlight = #a4a390
+highlight_foreground = #000000
 color0 = #000000
 color1 = #cc0000
 color2 = #009600
diff --git a/data/theme/Obsidian.colors b/data/theme/Obsidian.colors
index 7610b268e..393af230e 100644
--- a/data/theme/Obsidian.colors
+++ b/data/theme/Obsidian.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #283033
 cursor = #c0cad0
+cursor_foreground = #cdcdcd
 foreground = #cdcdcd
+highlight = #3e4c4f
+highlight_foreground = #dfe1e2
 color0 = #000000
 color1 = #a60001
 color2 = #00bb00
diff --git a/data/theme/Ocean.colors b/data/theme/Ocean.colors
index 226e0c1f4..afe6de8b0 100644
--- a/data/theme/Ocean.colors
+++ b/data/theme/Ocean.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #224fbc
 cursor = #7f7f7f
+cursor_foreground = #ffffff
 foreground = #ffffff
+highlight = #216dff
+highlight_foreground = #ffffff
 color0 = #000000
 color1 = #990000
 color2 = #00a600
diff --git a/data/theme/OceanicMaterial.colors b/data/theme/OceanicMaterial.colors
index 50c76e6d6..0abdbfa46 100644
--- a/data/theme/OceanicMaterial.colors
+++ b/data/theme/OceanicMaterial.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #1c262b
 cursor = #b3b8c3
+cursor_foreground = #ffffff
 foreground = #c2c8d7
+highlight = #6dc2b8
+highlight_foreground = #c2c8d7
 color0 = #000000
 color1 = #ee2b2a
 color2 = #40a33f
diff --git a/data/theme/Ollie.colors b/data/theme/Ollie.colors
index e64e9f8a8..1f804a7ea 100644
--- a/data/theme/Ollie.colors
+++ b/data/theme/Ollie.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #222125
 cursor = #5b6ea7
+cursor_foreground = #2a292d
 foreground = #8a8dae
+highlight = #1e3a66
+highlight_foreground = #8a8eac
 color0 = #000000
 color1 = #ac2e31
 color2 = #31ac61
diff --git a/data/theme/OneHalfDark.colors b/data/theme/OneHalfDark.colors
index c19872b3c..7e2da240c 100644
--- a/data/theme/OneHalfDark.colors
+++ b/data/theme/OneHalfDark.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #282c34
 cursor = #a3b3cc
+cursor_foreground = #dcdfe4
 foreground = #dcdfe4
+highlight = #474e5d
+highlight_foreground = #dcdfe4
 color0 = #282c34
 color1 = #e06c75
 color2 = #98c379
diff --git a/data/theme/OneHalfLight.colors b/data/theme/OneHalfLight.colors
index 63d6a3502..27eae93f3 100644
--- a/data/theme/OneHalfLight.colors
+++ b/data/theme/OneHalfLight.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #fafafa
 cursor = #bfceff
+cursor_foreground = #383a42
 foreground = #383a42
+highlight = #bfceff
+highlight_foreground = #383a42
 color0 = #383a42
 color1 = #e45649
 color2 = #50a14f
diff --git a/data/theme/Operator Mono Dark.colors b/data/theme/Operator Mono Dark.colors
index 27cce6c50..11d470a56 100644
--- a/data/theme/Operator Mono Dark.colors
+++ b/data/theme/Operator Mono Dark.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #191919
 cursor = #fcdc08
+cursor_foreground = #161616
 foreground = #c3cac2
+highlight = #19273b
+highlight_foreground = #dde5dc
 color0 = #5a5a5a
 color1 = #ca372d
 color2 = #4d7b3a
diff --git a/data/theme/Overnight Slumber.colors b/data/theme/Overnight Slumber.colors
index c8871651e..c3a8813a8 100644
--- a/data/theme/Overnight Slumber.colors
+++ b/data/theme/Overnight Slumber.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #0e1729
 cursor = #ffa7c4
+cursor_foreground = #ffffff
 foreground = #ced2d6
+highlight = #1f2b41
+highlight_foreground = #ced2d6
 color0 = #0a1222
 color1 = #ffa7c4
 color2 = #85cc95
diff --git a/data/theme/Pandora.colors b/data/theme/Pandora.colors
index 01caaf6de..86685022a 100644
--- a/data/theme/Pandora.colors
+++ b/data/theme/Pandora.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #141e43
 cursor = #43d58e
+cursor_foreground = #ffffff
 foreground = #e1e1e1
+highlight = #2d37ff
+highlight_foreground = #82e0ff
 color0 = #000000
 color1 = #ff4242
 color2 = #74af68
diff --git a/data/theme/Paraiso Dark.colors b/data/theme/Paraiso Dark.colors
index 7903436c3..05b5c4eaf 100644
--- a/data/theme/Paraiso Dark.colors
+++ b/data/theme/Paraiso Dark.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #2f1e2e
 cursor = #a39e9b
+cursor_foreground = #2f1e2e
 foreground = #a39e9b
+highlight = #4f424c
+highlight_foreground = #a39e9b
 color0 = #2f1e2e
 color1 = #ef6155
 color2 = #48b685
diff --git a/data/theme/Parasio Dark.colors b/data/theme/Parasio Dark.colors
index 7903436c3..05b5c4eaf 100644
--- a/data/theme/Parasio Dark.colors
+++ b/data/theme/Parasio Dark.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #2f1e2e
 cursor = #a39e9b
+cursor_foreground = #2f1e2e
 foreground = #a39e9b
+highlight = #4f424c
+highlight_foreground = #a39e9b
 color0 = #2f1e2e
 color1 = #ef6155
 color2 = #48b685
diff --git a/data/theme/PaulMillr.colors b/data/theme/PaulMillr.colors
index ef79e17ff..96bc0e612 100644
--- a/data/theme/PaulMillr.colors
+++ b/data/theme/PaulMillr.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #000000
 cursor = #4d4d4d
+cursor_foreground = #ffffff
 foreground = #f2f2f2
+highlight = #414141
+highlight_foreground = #ffffff
 color0 = #2a2a2a
 color1 = #ff0000
 color2 = #79ff0f
diff --git a/data/theme/PencilDark.colors b/data/theme/PencilDark.colors
index 314653cad..d2cee7bef 100644
--- a/data/theme/PencilDark.colors
+++ b/data/theme/PencilDark.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #212121
 cursor = #20bbfc
+cursor_foreground = #f1f1f1
 foreground = #f1f1f1
+highlight = #b6d6fd
+highlight_foreground = #f1f1f1
 color0 = #212121
 color1 = #c30771
 color2 = #10a778
diff --git a/data/theme/PencilLight.colors b/data/theme/PencilLight.colors
index 7e95bdcc4..830ea2d04 100644
--- a/data/theme/PencilLight.colors
+++ b/data/theme/PencilLight.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #f1f1f1
 cursor = #20bbfc
+cursor_foreground = #424242
 foreground = #424242
+highlight = #b6d6fd
+highlight_foreground = #424242
 color0 = #212121
 color1 = #c30771
 color2 = #10a778
diff --git a/data/theme/Piatto Light.colors b/data/theme/Piatto Light.colors
index 78602af6f..fbd4f7777 100644
--- a/data/theme/Piatto Light.colors
+++ b/data/theme/Piatto Light.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #ffffff
 cursor = #5e77c8
+cursor_foreground = #abbee5
 foreground = #414141
+highlight = #706b4e
+highlight_foreground = #acbcdc
 color0 = #414141
 color1 = #b23771
 color2 = #66781e
diff --git a/data/theme/Pnevma.colors b/data/theme/Pnevma.colors
index 783908a6e..f8be022f5 100644
--- a/data/theme/Pnevma.colors
+++ b/data/theme/Pnevma.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #1c1c1c
 cursor = #e4c9af
+cursor_foreground = #000000
 foreground = #d0d0d0
+highlight = #4d4d4d
+highlight_foreground = #ffffff
 color0 = #2f2e2d
 color1 = #a36666
 color2 = #90a57d
diff --git a/data/theme/Popping and Locking.colors b/data/theme/Popping and Locking.colors
index 2ce3d3720..5b8c4118f 100644
--- a/data/theme/Popping and Locking.colors
+++ b/data/theme/Popping and Locking.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #181921
 cursor = #c7c7c7
+cursor_foreground = #ffffff
 foreground = #ebdbb2
+highlight = #ebdbb2
+highlight_foreground = #928374
 color0 = #1d2021
 color1 = #cc241d
 color2 = #98971a
diff --git a/data/theme/Pro Light.colors b/data/theme/Pro Light.colors
index 552cc5aa3..b9616d0dc 100644
--- a/data/theme/Pro Light.colors
+++ b/data/theme/Pro Light.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #ffffff
 cursor = #4d4d4d
+cursor_foreground = #f2f2f2
 foreground = #191919
+highlight = #c1ddff
+highlight_foreground = #191919
 color0 = #000000
 color1 = #e5492b
 color2 = #50d148
diff --git a/data/theme/Pro.colors b/data/theme/Pro.colors
index a2c009314..1500d6e7c 100644
--- a/data/theme/Pro.colors
+++ b/data/theme/Pro.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #000000
 cursor = #4d4d4d
+cursor_foreground = #ffffff
 foreground = #f2f2f2
+highlight = #414141
+highlight_foreground = #000000
 color0 = #000000
 color1 = #990000
 color2 = #00a600
diff --git a/data/theme/Purple Rain.colors b/data/theme/Purple Rain.colors
index 241332d39..040d647e1 100644
--- a/data/theme/Purple Rain.colors
+++ b/data/theme/Purple Rain.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #21084a
 cursor = #ff271d
+cursor_foreground = #ff271d
 foreground = #fffbf6
+highlight = #287691
+highlight_foreground = #ffffff
 color0 = #000000
 color1 = #ff260e
 color2 = #9be205
diff --git a/data/theme/Rapture.colors b/data/theme/Rapture.colors
index 85d811401..5c7c35590 100644
--- a/data/theme/Rapture.colors
+++ b/data/theme/Rapture.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #111e2a
 cursor = #ffffff
+cursor_foreground = #111e2a
 foreground = #c0c9e5
+highlight = #304b66
+highlight_foreground = #ffffff
 color0 = #000000
 color1 = #fc644d
 color2 = #7afde1
diff --git a/data/theme/Red Alert.colors b/data/theme/Red Alert.colors
index 1167afcb8..baf220b50 100644
--- a/data/theme/Red Alert.colors
+++ b/data/theme/Red Alert.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #762423
 cursor = #ffffff
+cursor_foreground = #762423
 foreground = #ffffff
+highlight = #073642
+highlight_foreground = #ffffff
 color0 = #000000
 color1 = #d62e4e
 color2 = #71be6b
diff --git a/data/theme/Red Planet.colors b/data/theme/Red Planet.colors
index 750a2aea3..4bb84d2ac 100644
--- a/data/theme/Red Planet.colors
+++ b/data/theme/Red Planet.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #222222
 cursor = #c2b790
+cursor_foreground = #202020
 foreground = #c2b790
+highlight = #1b324a
+highlight_foreground = #bcb291
 color0 = #202020
 color1 = #8c3432
 color2 = #728271
diff --git a/data/theme/Red Sands.colors b/data/theme/Red Sands.colors
index ed88a389e..b2879392d 100644
--- a/data/theme/Red Sands.colors
+++ b/data/theme/Red Sands.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #7a251e
 cursor = #ffffff
+cursor_foreground = #000000
 foreground = #d7c9a7
+highlight = #a4a390
+highlight_foreground = #000000
 color0 = #000000
 color1 = #ff3f00
 color2 = #00bb00
diff --git a/data/theme/Relaxed.colors b/data/theme/Relaxed.colors
index e5a41e828..3aba4fb3e 100644
--- a/data/theme/Relaxed.colors
+++ b/data/theme/Relaxed.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #353a44
 cursor = #d9d9d9
+cursor_foreground = #1b1b1b
 foreground = #d9d9d9
+highlight = #6a7985
+highlight_foreground = #d9d9d9
 color0 = #151515
 color1 = #bc5653
 color2 = #909d63
diff --git a/data/theme/Rippedcasts.colors b/data/theme/Rippedcasts.colors
index c79d5cbfa..4d091e02f 100644
--- a/data/theme/Rippedcasts.colors
+++ b/data/theme/Rippedcasts.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #2b2b2b
 cursor = #7f7f7f
+cursor_foreground = #ffffff
 foreground = #ffffff
+highlight = #5a647e
+highlight_foreground = #f2f2f2
 color0 = #000000
 color1 = #cdaf95
 color2 = #a8ff60
diff --git a/data/theme/Rouge 2.colors b/data/theme/Rouge 2.colors
index 65dad4c49..271408274 100644
--- a/data/theme/Rouge 2.colors
+++ b/data/theme/Rouge 2.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #17182b
 cursor = #969e92
+cursor_foreground = #ffffff
 foreground = #a2a3aa
+highlight = #5d5d6b
+highlight_foreground = #dfe5ee
 color0 = #5d5d6b
 color1 = #c6797e
 color2 = #969e92
diff --git a/data/theme/Royal.colors b/data/theme/Royal.colors
index 3a31410da..1125b20ee 100644
--- a/data/theme/Royal.colors
+++ b/data/theme/Royal.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #100815
 cursor = #524966
+cursor_foreground = #100613
 foreground = #514968
+highlight = #1f1d2b
+highlight_foreground = #a593cd
 color0 = #241f2b
 color1 = #91284c
 color2 = #23801c
diff --git a/data/theme/Ryuuko.colors b/data/theme/Ryuuko.colors
index 019b964e8..25218f88f 100644
--- a/data/theme/Ryuuko.colors
+++ b/data/theme/Ryuuko.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #2c3941
 cursor = #ececec
+cursor_foreground = #002831
 foreground = #ececec
+highlight = #002831
+highlight_foreground = #819090
 color0 = #2c3941
 color1 = #865f5b
 color2 = #66907d
diff --git a/data/theme/Sakura.colors b/data/theme/Sakura.colors
index 9658d7b5f..5f0a080db 100644
--- a/data/theme/Sakura.colors
+++ b/data/theme/Sakura.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #18131e
 cursor = #ff65fd
+cursor_foreground = #24242e
 foreground = #dd7bdc
+highlight = #c05cbf
+highlight_foreground = #24242e
 color0 = #000000
 color1 = #d52370
 color2 = #41af1a
diff --git a/data/theme/Scarlet Protocol.colors b/data/theme/Scarlet Protocol.colors
index 838dbabf8..810f15210 100644
--- a/data/theme/Scarlet Protocol.colors
+++ b/data/theme/Scarlet Protocol.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #1c153d
 cursor = #76ff9f
+cursor_foreground = #ffffff
 foreground = #e41951
+highlight = #c1deff
+highlight_foreground = #000000
 color0 = #101116
 color1 = #ff0051
 color2 = #00dc84
diff --git a/data/theme/SeaShells.colors b/data/theme/SeaShells.colors
index a7bfb4f6c..e945eac0a 100644
--- a/data/theme/SeaShells.colors
+++ b/data/theme/SeaShells.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #09141b
 cursor = #fca02f
+cursor_foreground = #08131a
 foreground = #deb88d
+highlight = #1e4962
+highlight_foreground = #fee4ce
 color0 = #17384c
 color1 = #d15123
 color2 = #027c9b
diff --git a/data/theme/Seafoam Pastel.colors b/data/theme/Seafoam Pastel.colors
index 1dd158355..3b3235d0b 100644
--- a/data/theme/Seafoam Pastel.colors
+++ b/data/theme/Seafoam Pastel.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #243435
 cursor = #57647a
+cursor_foreground = #323232
 foreground = #d4e7d4
+highlight = #ffffff
+highlight_foreground = #9e8b13
 color0 = #757575
 color1 = #825d4d
 color2 = #728c62
diff --git a/data/theme/Seti.colors b/data/theme/Seti.colors
index 5e2533e1b..257302f40 100644
--- a/data/theme/Seti.colors
+++ b/data/theme/Seti.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #111213
 cursor = #e3bf21
+cursor_foreground = #e0be2e
 foreground = #cacecd
+highlight = #303233
+highlight_foreground = #cacecd
 color0 = #323232
 color1 = #c22832
 color2 = #8ec43d
diff --git a/data/theme/Shaman.colors b/data/theme/Shaman.colors
index 9f3bff57e..7bd034a1d 100644
--- a/data/theme/Shaman.colors
+++ b/data/theme/Shaman.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #001015
 cursor = #4afcd6
+cursor_foreground = #031413
 foreground = #405555
+highlight = #415555
+highlight_foreground = #5afad6
 color0 = #012026
 color1 = #b2302d
 color2 = #00a941
diff --git a/data/theme/Slate.colors b/data/theme/Slate.colors
index 1bc60f2b1..d4fad7ebb 100644
--- a/data/theme/Slate.colors
+++ b/data/theme/Slate.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #222222
 cursor = #87d3c4
+cursor_foreground = #323232
 foreground = #35b1d2
+highlight = #0f3754
+highlight_foreground = #2dffc0
 color0 = #222222
 color1 = #e2a8bf
 color2 = #81d778
diff --git a/data/theme/SleepyHollow.colors b/data/theme/SleepyHollow.colors
index 14a0785dd..c7c416e2c 100644
--- a/data/theme/SleepyHollow.colors
+++ b/data/theme/SleepyHollow.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #121214
 cursor = #af9a91
+cursor_foreground = #391a02
 foreground = #af9a91
+highlight = #575256
+highlight_foreground = #d2c7a9
 color0 = #572100
 color1 = #ba3934
 color2 = #91773f
diff --git a/data/theme/Smyck.colors b/data/theme/Smyck.colors
index 81ae27b16..58501739c 100644
--- a/data/theme/Smyck.colors
+++ b/data/theme/Smyck.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #1b1b1b
 cursor = #bbbbbb
+cursor_foreground = #ffffff
 foreground = #f7f7f7
+highlight = #207483
+highlight_foreground = #f7f7f7
 color0 = #000000
 color1 = #b84131
 color2 = #7da900
diff --git a/data/theme/Snazzy.colors b/data/theme/Snazzy.colors
index 2ece0da1c..c1e25d354 100644
--- a/data/theme/Snazzy.colors
+++ b/data/theme/Snazzy.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #1e1f29
 cursor = #e4e4e4
+cursor_foreground = #f6f6f6
 foreground = #ebece6
+highlight = #81aec6
+highlight_foreground = #000000
 color0 = #000000
 color1 = #fc4346
 color2 = #50fb7c
diff --git a/data/theme/SoftServer.colors b/data/theme/SoftServer.colors
index 9d6d31e2f..d848a6ffa 100644
--- a/data/theme/SoftServer.colors
+++ b/data/theme/SoftServer.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #242626
 cursor = #d2e0de
+cursor_foreground = #000000
 foreground = #99a3a2
+highlight = #7f8786
+highlight_foreground = #effffe
 color0 = #000000
 color1 = #a2686a
 color2 = #9aa56a
diff --git a/data/theme/Solarized Darcula.colors b/data/theme/Solarized Darcula.colors
index 081a7c1a6..b339319dc 100644
--- a/data/theme/Solarized Darcula.colors
+++ b/data/theme/Solarized Darcula.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #3d3f41
 cursor = #708284
+cursor_foreground = #002831
 foreground = #d2d8d9
+highlight = #214283
+highlight_foreground = #d2d8d9
 color0 = #25292a
 color1 = #f24840
 color2 = #629655
diff --git a/data/theme/Solarized Dark - Patched.colors b/data/theme/Solarized Dark - Patched.colors
index 0b5acde1a..733c010ba 100644
--- a/data/theme/Solarized Dark - Patched.colors
+++ b/data/theme/Solarized Dark - Patched.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #001e27
 cursor = #708284
+cursor_foreground = #002831
 foreground = #708284
+highlight = #002831
+highlight_foreground = #819090
 color0 = #002831
 color1 = #d11c24
 color2 = #738a05
diff --git a/data/theme/Solarized Dark Higher Contrast.colors b/data/theme/Solarized Dark Higher Contrast.colors
index 0daa86369..f9f5f3237 100644
--- a/data/theme/Solarized Dark Higher Contrast.colors
+++ b/data/theme/Solarized Dark Higher Contrast.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #001e27
 cursor = #f34b00
+cursor_foreground = #002831
 foreground = #9cc2c3
+highlight = #003748
+highlight_foreground = #7a8f8e
 color0 = #002831
 color1 = #d11c24
 color2 = #6cbe6c
diff --git a/data/theme/SpaceGray Eighties Dull.colors b/data/theme/SpaceGray Eighties Dull.colors
index a00ad01cb..c5b2166d4 100644
--- a/data/theme/SpaceGray Eighties Dull.colors
+++ b/data/theme/SpaceGray Eighties Dull.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #222222
 cursor = #bbbbbb
+cursor_foreground = #ffffff
 foreground = #c9c6bc
+highlight = #272e36
+highlight_foreground = #ffffff
 color0 = #15171c
 color1 = #b24a56
 color2 = #92b477
diff --git a/data/theme/SpaceGray Eighties.colors b/data/theme/SpaceGray Eighties.colors
index b7501b3b8..b33f75a6b 100644
--- a/data/theme/SpaceGray Eighties.colors
+++ b/data/theme/SpaceGray Eighties.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #222222
 cursor = #bbbbbb
+cursor_foreground = #ffffff
 foreground = #bdbaae
+highlight = #272e35
+highlight_foreground = #ffffff
 color0 = #15171c
 color1 = #ec5f67
 color2 = #81a764
diff --git a/data/theme/SpaceGray.colors b/data/theme/SpaceGray.colors
index a912af002..6a2f513b1 100644
--- a/data/theme/SpaceGray.colors
+++ b/data/theme/SpaceGray.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #20242d
 cursor = #b3b8c3
+cursor_foreground = #1d1f21
 foreground = #b3b8c3
+highlight = #16181e
+highlight_foreground = #b3b8c3
 color0 = #000000
 color1 = #b04b57
 color2 = #87b379
diff --git a/data/theme/Spacedust.colors b/data/theme/Spacedust.colors
index 89cde2721..4b5a57509 100644
--- a/data/theme/Spacedust.colors
+++ b/data/theme/Spacedust.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #0a1e24
 cursor = #708284
+cursor_foreground = #002831
 foreground = #ecf0c1
+highlight = #0a385c
+highlight_foreground = #ffffff
 color0 = #6e5346
 color1 = #e35b00
 color2 = #5cab96
diff --git a/data/theme/Spiderman.colors b/data/theme/Spiderman.colors
index a05a11a6f..421eff25b 100644
--- a/data/theme/Spiderman.colors
+++ b/data/theme/Spiderman.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #1b1d1e
 cursor = #2c3fff
+cursor_foreground = #000000
 foreground = #e3e3e3
+highlight = #070e50
+highlight_foreground = #f0272d
 color0 = #1b1d1e
 color1 = #e60813
 color2 = #e22928
diff --git a/data/theme/Spring.colors b/data/theme/Spring.colors
index 47c5a029a..1db97822b 100644
--- a/data/theme/Spring.colors
+++ b/data/theme/Spring.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #ffffff
 cursor = #4d4d4c
+cursor_foreground = #ffffff
 foreground = #4d4d4c
+highlight = #d6d6d6
+highlight_foreground = #4d4d4c
 color0 = #000000
 color1 = #ff4d83
 color2 = #1f8c3b
diff --git a/data/theme/Square.colors b/data/theme/Square.colors
index f808aa98d..f71953e66 100644
--- a/data/theme/Square.colors
+++ b/data/theme/Square.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #1a1a1a
 cursor = #fcfbcc
+cursor_foreground = #000000
 foreground = #acacab
+highlight = #4d4d4d
+highlight_foreground = #ffffff
 color0 = #050505
 color1 = #e9897c
 color2 = #b6377d
diff --git a/data/theme/Subliminal.colors b/data/theme/Subliminal.colors
index 8c07106c1..eba182174 100644
--- a/data/theme/Subliminal.colors
+++ b/data/theme/Subliminal.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #282c35
 cursor = #c7c7c7
+cursor_foreground = #ffffff
 foreground = #d4d4d4
+highlight = #484e5b
+highlight_foreground = #ffffff
 color0 = #7f7f7f
 color1 = #e15a60
 color2 = #a9cfa4
diff --git a/data/theme/Sundried.colors b/data/theme/Sundried.colors
index 62de86d89..c1bc4be32 100644
--- a/data/theme/Sundried.colors
+++ b/data/theme/Sundried.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #1a1818
 cursor = #ffffff
+cursor_foreground = #191717
 foreground = #c9c9c9
+highlight = #302b2a
+highlight_foreground = #c9c9c9
 color0 = #302b2a
 color1 = #a7463d
 color2 = #587744
diff --git a/data/theme/Symfonic.colors b/data/theme/Symfonic.colors
index 82781884b..67c452311 100644
--- a/data/theme/Symfonic.colors
+++ b/data/theme/Symfonic.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #000000
 cursor = #dc322f
+cursor_foreground = #ffffff
 foreground = #ffffff
+highlight = #073642
+highlight_foreground = #ffffff
 color0 = #000000
 color1 = #dc322f
 color2 = #56db3a
diff --git a/data/theme/Tango Adapted.colors b/data/theme/Tango Adapted.colors
index 84b20d862..f6bc43a66 100644
--- a/data/theme/Tango Adapted.colors
+++ b/data/theme/Tango Adapted.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #ffffff
 cursor = #000000
+cursor_foreground = #ffffff
 foreground = #000000
+highlight = #c1deff
+highlight_foreground = #000000
 color0 = #000000
 color1 = #ff0000
 color2 = #59d600
diff --git a/data/theme/Tango Half Adapted.colors b/data/theme/Tango Half Adapted.colors
index d0477765e..eca20f958 100644
--- a/data/theme/Tango Half Adapted.colors
+++ b/data/theme/Tango Half Adapted.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #ffffff
 cursor = #000000
+cursor_foreground = #ffffff
 foreground = #000000
+highlight = #c1deff
+highlight_foreground = #000000
 color0 = #000000
 color1 = #ff0000
 color2 = #4cc300
diff --git a/data/theme/Teerb.colors b/data/theme/Teerb.colors
index a10674f0d..874e22a97 100644
--- a/data/theme/Teerb.colors
+++ b/data/theme/Teerb.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #262626
 cursor = #e4c9af
+cursor_foreground = #000000
 foreground = #d0d0d0
+highlight = #4d4d4d
+highlight_foreground = #ffffff
 color0 = #1c1c1c
 color1 = #d68686
 color2 = #aed686
diff --git a/data/theme/Terminal Basic.colors b/data/theme/Terminal Basic.colors
index 8077a0c94..04c81a4e5 100644
--- a/data/theme/Terminal Basic.colors
+++ b/data/theme/Terminal Basic.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #ffffff
 cursor = #7f7f7f
+cursor_foreground = #000000
 foreground = #000000
+highlight = #a4c9ff
+highlight_foreground = #000000
 color0 = #000000
 color1 = #990000
 color2 = #00a600
diff --git a/data/theme/Thayer Bright.colors b/data/theme/Thayer Bright.colors
index 0e41bb7f1..67febdb4c 100644
--- a/data/theme/Thayer Bright.colors
+++ b/data/theme/Thayer Bright.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #1b1d1e
 cursor = #fc971f
+cursor_foreground = #000000
 foreground = #f8f8f8
+highlight = #4d4d4d
+highlight_foreground = #ffffff
 color0 = #1b1d1e
 color1 = #f92672
 color2 = #4df840
diff --git a/data/theme/The Hulk.colors b/data/theme/The Hulk.colors
index cd00e890e..8dfe798c0 100644
--- a/data/theme/The Hulk.colors
+++ b/data/theme/The Hulk.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #1b1d1e
 cursor = #16b61b
+cursor_foreground = #000000
 foreground = #b5b5b5
+highlight = #4d504c
+highlight_foreground = #0b6309
 color0 = #1b1d1e
 color1 = #269d1b
 color2 = #13ce30
diff --git a/data/theme/Tinacious Design (Dark).colors b/data/theme/Tinacious Design (Dark).colors
index 51dc6e866..d441eb7f0 100644
--- a/data/theme/Tinacious Design (Dark).colors
+++ b/data/theme/Tinacious Design (Dark).colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #1d1d26
 cursor = #cbcbf0
+cursor_foreground = #ffffff
 foreground = #cbcbf0
+highlight = #ff3399
+highlight_foreground = #ffffff
 color0 = #1d1d26
 color1 = #ff3399
 color2 = #00d364
diff --git a/data/theme/Tinacious Design (Light).colors b/data/theme/Tinacious Design (Light).colors
index 442e13e92..37a912f5d 100644
--- a/data/theme/Tinacious Design (Light).colors
+++ b/data/theme/Tinacious Design (Light).colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #f8f8ff
 cursor = #cbcbf0
+cursor_foreground = #ffffff
 foreground = #1d1d26
+highlight = #ff3399
+highlight_foreground = #ffffff
 color0 = #1d1d26
 color1 = #ff3399
 color2 = #00d364
diff --git a/data/theme/Tomorrow Night Blue.colors b/data/theme/Tomorrow Night Blue.colors
index dfc5c69a7..6f2c59fb9 100644
--- a/data/theme/Tomorrow Night Blue.colors
+++ b/data/theme/Tomorrow Night Blue.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #002451
 cursor = #ffffff
+cursor_foreground = #003f8e
 foreground = #ffffff
+highlight = #003f8e
+highlight_foreground = #ffffff
 color0 = #000000
 color1 = #ff9da4
 color2 = #d1f1a9
diff --git a/data/theme/Tomorrow Night Bright.colors b/data/theme/Tomorrow Night Bright.colors
index 88b7edbe0..078e7baaa 100644
--- a/data/theme/Tomorrow Night Bright.colors
+++ b/data/theme/Tomorrow Night Bright.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #000000
 cursor = #eaeaea
+cursor_foreground = #000000
 foreground = #eaeaea
+highlight = #424242
+highlight_foreground = #eaeaea
 color0 = #000000
 color1 = #d54e53
 color2 = #b9ca4a
diff --git a/data/theme/Tomorrow Night Burns.colors b/data/theme/Tomorrow Night Burns.colors
index f98181edd..f1c27a450 100644
--- a/data/theme/Tomorrow Night Burns.colors
+++ b/data/theme/Tomorrow Night Burns.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #151515
 cursor = #ff443e
+cursor_foreground = #708284
 foreground = #a1b0b8
+highlight = #b0bec5
+highlight_foreground = #2a2d32
 color0 = #252525
 color1 = #832e31
 color2 = #a63c40
diff --git a/data/theme/Tomorrow Night Eighties.colors b/data/theme/Tomorrow Night Eighties.colors
index e4569a432..69e160670 100644
--- a/data/theme/Tomorrow Night Eighties.colors
+++ b/data/theme/Tomorrow Night Eighties.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #2d2d2d
 cursor = #cccccc
+cursor_foreground = #2d2d2d
 foreground = #cccccc
+highlight = #515151
+highlight_foreground = #cccccc
 color0 = #000000
 color1 = #f2777a
 color2 = #99cc99
diff --git a/data/theme/Tomorrow Night.colors b/data/theme/Tomorrow Night.colors
index 041bf2738..0b160997a 100644
--- a/data/theme/Tomorrow Night.colors
+++ b/data/theme/Tomorrow Night.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #1d1f21
 cursor = #c5c8c6
+cursor_foreground = #1d1f21
 foreground = #c5c8c6
+highlight = #373b41
+highlight_foreground = #c5c8c6
 color0 = #000000
 color1 = #cc6666
 color2 = #b5bd68
diff --git a/data/theme/Tomorrow.colors b/data/theme/Tomorrow.colors
index 2f4810d53..cf20ee6ae 100644
--- a/data/theme/Tomorrow.colors
+++ b/data/theme/Tomorrow.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #ffffff
 cursor = #4d4d4c
+cursor_foreground = #ffffff
 foreground = #4d4d4c
+highlight = #d6d6d6
+highlight_foreground = #4d4d4c
 color0 = #000000
 color1 = #c82829
 color2 = #718c00
diff --git a/data/theme/ToyChest.colors b/data/theme/ToyChest.colors
index 42b10f430..abc28e9e8 100644
--- a/data/theme/ToyChest.colors
+++ b/data/theme/ToyChest.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #24364b
 cursor = #d5d5d5
+cursor_foreground = #141c25
 foreground = #31d07b
+highlight = #5f217a
+highlight_foreground = #d5d5d5
 color0 = #2c3f58
 color1 = #be2d26
 color2 = #1a9172
diff --git a/data/theme/Treehouse.colors b/data/theme/Treehouse.colors
index aa05a402b..44318e608 100644
--- a/data/theme/Treehouse.colors
+++ b/data/theme/Treehouse.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #191919
 cursor = #fac814
+cursor_foreground = #191919
 foreground = #786b53
+highlight = #786b53
+highlight_foreground = #fac800
 color0 = #321300
 color1 = #b2270e
 color2 = #44a900
diff --git a/data/theme/Twilight.colors b/data/theme/Twilight.colors
index b84f66fc9..8ac9e6675 100644
--- a/data/theme/Twilight.colors
+++ b/data/theme/Twilight.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #141414
 cursor = #ffffff
+cursor_foreground = #000000
 foreground = #ffffd4
+highlight = #313131
+highlight_foreground = #ffffd4
 color0 = #141414
 color1 = #c06d44
 color2 = #afb97a
diff --git a/data/theme/Ubuntu.colors b/data/theme/Ubuntu.colors
index b0be882a8..7232349c8 100644
--- a/data/theme/Ubuntu.colors
+++ b/data/theme/Ubuntu.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #300a24
 cursor = #bbbbbb
+cursor_foreground = #ffffff
 foreground = #eeeeec
+highlight = #b5d5ff
+highlight_foreground = #000000
 color0 = #2e3436
 color1 = #cc0000
 color2 = #4e9a06
diff --git a/data/theme/UltraViolent.colors b/data/theme/UltraViolent.colors
index f96357e74..c82d75668 100644
--- a/data/theme/UltraViolent.colors
+++ b/data/theme/UltraViolent.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #242728
 cursor = #c1c1c1
+cursor_foreground = #ffffff
 foreground = #c1c1c1
+highlight = #574c49
+highlight_foreground = #c3c7cb
 color0 = #242728
 color1 = #ff0090
 color2 = #b6ff00
diff --git a/data/theme/UnderTheSea.colors b/data/theme/UnderTheSea.colors
index eef0d1eb1..f001b428a 100644
--- a/data/theme/UnderTheSea.colors
+++ b/data/theme/UnderTheSea.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #011116
 cursor = #4afcd6
+cursor_foreground = #031413
 foreground = #ffffff
+highlight = #415555
+highlight_foreground = #4dffda
 color0 = #022026
 color1 = #b2302d
 color2 = #00a941
diff --git a/data/theme/Unikitty.colors b/data/theme/Unikitty.colors
index a2443f32a..156b839b6 100644
--- a/data/theme/Unikitty.colors
+++ b/data/theme/Unikitty.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #ff8cd9
 cursor = #bafc8b
+cursor_foreground = #202020
 foreground = #0b0b0b
+highlight = #3ea9fe
+highlight_foreground = #ffffff
 color0 = #0c0c0c
 color1 = #a80f20
 color2 = #bafc8b
diff --git a/data/theme/Urple.colors b/data/theme/Urple.colors
index 7198b2140..a6e71ac75 100644
--- a/data/theme/Urple.colors
+++ b/data/theme/Urple.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #1b1b23
 cursor = #a063eb
+cursor_foreground = #1b1b22
 foreground = #877a9b
+highlight = #a063eb
+highlight_foreground = #1b1b22
 color0 = #000000
 color1 = #b0425b
 color2 = #37a415
diff --git a/data/theme/Vaughn.colors b/data/theme/Vaughn.colors
index 837a5cad7..45836b88e 100644
--- a/data/theme/Vaughn.colors
+++ b/data/theme/Vaughn.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #25234f
 cursor = #ff5555
+cursor_foreground = #ffffff
 foreground = #dcdccc
+highlight = #b5d5ff
+highlight_foreground = #000000
 color0 = #25234f
 color1 = #705050
 color2 = #60b48a
diff --git a/data/theme/VibrantInk.colors b/data/theme/VibrantInk.colors
index dc1b6db67..c8d841274 100644
--- a/data/theme/VibrantInk.colors
+++ b/data/theme/VibrantInk.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #000000
 cursor = #ffffff
+cursor_foreground = #000000
 foreground = #ffffff
+highlight = #b5d5ff
+highlight_foreground = #000000
 color0 = #878787
 color1 = #ff6600
 color2 = #ccff04
diff --git a/data/theme/Violet Dark.colors b/data/theme/Violet Dark.colors
index 493b72e91..b466610e9 100644
--- a/data/theme/Violet Dark.colors
+++ b/data/theme/Violet Dark.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #1c1d1f
 cursor = #708284
+cursor_foreground = #1c1d1f
 foreground = #708284
+highlight = #595ab7
+highlight_foreground = #1c1d1f
 color0 = #56595c
 color1 = #c94c22
 color2 = #85981c
diff --git a/data/theme/Violet Light.colors b/data/theme/Violet Light.colors
index afc4cf398..b3b8b5165 100644
--- a/data/theme/Violet Light.colors
+++ b/data/theme/Violet Light.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #fcf4dc
 cursor = #536870
+cursor_foreground = #fcf4dc
 foreground = #536870
+highlight = #595ab7
+highlight_foreground = #fcf4dc
 color0 = #56595c
 color1 = #c94c22
 color2 = #85981c
diff --git a/data/theme/WarmNeon.colors b/data/theme/WarmNeon.colors
index 77a3c5796..b87635fcd 100644
--- a/data/theme/WarmNeon.colors
+++ b/data/theme/WarmNeon.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #404040
 cursor = #30ff24
+cursor_foreground = #3eef37
 foreground = #afdab6
+highlight = #b0ad21
+highlight_foreground = #ffffff
 color0 = #000000
 color1 = #e24346
 color2 = #39b13a
diff --git a/data/theme/Wez.colors b/data/theme/Wez.colors
index 72cfe77f0..47f98f520 100644
--- a/data/theme/Wez.colors
+++ b/data/theme/Wez.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #000000
 cursor = #53ae71
+cursor_foreground = #000000
 foreground = #b3b3b3
+highlight = #4d52f8
+highlight_foreground = #000000
 color0 = #000000
 color1 = #cc5555
 color2 = #55cc55
diff --git a/data/theme/Whimsy.colors b/data/theme/Whimsy.colors
index 3e612e0f2..db93e13ac 100644
--- a/data/theme/Whimsy.colors
+++ b/data/theme/Whimsy.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #29283b
 cursor = #b3b0d6
+cursor_foreground = #535178
 foreground = #b3b0d6
+highlight = #3d3c58
+highlight_foreground = #ffffff
 color0 = #535178
 color1 = #ef6487
 color2 = #5eca89
diff --git a/data/theme/WildCherry.colors b/data/theme/WildCherry.colors
index ebe2bdb12..7408c5cf4 100644
--- a/data/theme/WildCherry.colors
+++ b/data/theme/WildCherry.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #1f1726
 cursor = #dd00ff
+cursor_foreground = #ff00fe
 foreground = #dafaff
+highlight = #002831
+highlight_foreground = #e4ffff
 color0 = #000507
 color1 = #d94085
 color2 = #2ab250
diff --git a/data/theme/Wombat.colors b/data/theme/Wombat.colors
index 9226cfa91..9664eb7e2 100644
--- a/data/theme/Wombat.colors
+++ b/data/theme/Wombat.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #171717
 cursor = #bbbbbb
+cursor_foreground = #ffffff
 foreground = #dedacf
+highlight = #453b39
+highlight_foreground = #b6bbc0
 color0 = #000000
 color1 = #ff615a
 color2 = #b1e969
diff --git a/data/theme/Wryan.colors b/data/theme/Wryan.colors
index 617b84a74..c9154b5a7 100644
--- a/data/theme/Wryan.colors
+++ b/data/theme/Wryan.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #101010
 cursor = #9e9ecb
+cursor_foreground = #000000
 foreground = #999993
+highlight = #4d4d4d
+highlight_foreground = #ffffff
 color0 = #333333
 color1 = #8c4665
 color2 = #287373
diff --git a/data/theme/Zenburn.colors b/data/theme/Zenburn.colors
index 2a553f8b8..a3cfe4492 100644
--- a/data/theme/Zenburn.colors
+++ b/data/theme/Zenburn.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #3f3f3f
 cursor = #73635a
+cursor_foreground = #000000
 foreground = #dcdccc
+highlight = #21322f
+highlight_foreground = #c2d87a
 color0 = #4d4d4d
 color1 = #705050
 color2 = #60b48a
diff --git a/data/theme/ayu.colors b/data/theme/ayu.colors
index c31e50298..c987ab8fa 100644
--- a/data/theme/ayu.colors
+++ b/data/theme/ayu.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #0f1419
 cursor = #f29718
+cursor_foreground = #e6e1cf
 foreground = #e6e1cf
+highlight = #253340
+highlight_foreground = #e6e1cf
 color0 = #000000
 color1 = #ff3333
 color2 = #b8cc52
diff --git a/data/theme/ayu_light.colors b/data/theme/ayu_light.colors
index a62710871..eda8025d2 100644
--- a/data/theme/ayu_light.colors
+++ b/data/theme/ayu_light.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #fafafa
 cursor = #ff6a00
+cursor_foreground = #5c6773
 foreground = #5c6773
+highlight = #f0eee4
+highlight_foreground = #5c6773
 color0 = #000000
 color1 = #ff3333
 color2 = #86b300
diff --git a/data/theme/coffee_theme.colors b/data/theme/coffee_theme.colors
index 2069388cb..e2a5db6b3 100644
--- a/data/theme/coffee_theme.colors
+++ b/data/theme/coffee_theme.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #f5deb3
 cursor = #c7c7c7
+cursor_foreground = #fffc67
 foreground = #000000
+highlight = #c1deff
+highlight_foreground = #000000
 color0 = #000000
 color1 = #c91b00
 color2 = #00c200
diff --git a/data/theme/cyberpunk.colors b/data/theme/cyberpunk.colors
index c796b439c..8f167f35f 100644
--- a/data/theme/cyberpunk.colors
+++ b/data/theme/cyberpunk.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #332a57
 cursor = #21f6bc
+cursor_foreground = #ffffff
 foreground = #e5e5e5
+highlight = #c1deff
+highlight_foreground = #000000
 color0 = #000000
 color1 = #ff7092
 color2 = #00fbac
diff --git a/data/theme/deep.colors b/data/theme/deep.colors
index 31b55f457..8b48790d3 100644
--- a/data/theme/deep.colors
+++ b/data/theme/deep.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #090909
 cursor = #d0d0d0
+cursor_foreground = #151515
 foreground = #cdcdcd
+highlight = #780002
+highlight_foreground = #ececec
 color0 = #000000
 color1 = #d70005
 color2 = #1cd915
diff --git a/data/theme/idea.colors b/data/theme/idea.colors
index a21fe0dbe..c82e1b2d3 100644
--- a/data/theme/idea.colors
+++ b/data/theme/idea.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #202020
 cursor = #bbbbbb
+cursor_foreground = #ffffff
 foreground = #adadad
+highlight = #44475a
+highlight_foreground = #ffffff
 color0 = #adadad
 color1 = #fc5256
 color2 = #98b61c
diff --git a/data/theme/idleToes.colors b/data/theme/idleToes.colors
index cfd05e641..c34dd5c81 100644
--- a/data/theme/idleToes.colors
+++ b/data/theme/idleToes.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #323232
 cursor = #d6d6d6
+cursor_foreground = #000000
 foreground = #ffffff
+highlight = #5b5b5b
+highlight_foreground = #000000
 color0 = #323232
 color1 = #d25252
 color2 = #7fe173
diff --git a/data/theme/jubi.colors b/data/theme/jubi.colors
index a8d0f90bb..3a9195e64 100644
--- a/data/theme/jubi.colors
+++ b/data/theme/jubi.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #262b33
 cursor = #c3d3de
+cursor_foreground = #1e1b2e
 foreground = #c3d3de
+highlight = #5b5184
+highlight_foreground = #1e1b2e
 color0 = #3b3750
 color1 = #cf7b98
 color2 = #90a94b
diff --git a/data/theme/lovelace.colors b/data/theme/lovelace.colors
index b0b5df4b9..db15ed05d 100644
--- a/data/theme/lovelace.colors
+++ b/data/theme/lovelace.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #1d1f28
 cursor = #c574dd
+cursor_foreground = #ffffff
 foreground = #fdfdfd
+highlight = #c1deff
+highlight_foreground = #000000
 color0 = #282a36
 color1 = #f37f97
 color2 = #5adecd
diff --git a/data/theme/midnight-in-mojave.colors b/data/theme/midnight-in-mojave.colors
index b19623f4d..bd042357e 100644
--- a/data/theme/midnight-in-mojave.colors
+++ b/data/theme/midnight-in-mojave.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #1e1e1e
 cursor = #32d74b
+cursor_foreground = #1c1c1c
 foreground = #ffffff
+highlight = #4a504d
+highlight_foreground = #ffffff
 color0 = #1e1e1e
 color1 = #ff453a
 color2 = #32d74b
diff --git a/data/theme/nord.colors b/data/theme/nord.colors
index 65dd09094..15569d2c6 100644
--- a/data/theme/nord.colors
+++ b/data/theme/nord.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #2e3440
 cursor = #eceff4
+cursor_foreground = #282828
 foreground = #d8dee9
+highlight = #eceff4
+highlight_foreground = #4c566a
 color0 = #3b4252
 color1 = #bf616a
 color2 = #a3be8c
diff --git a/data/theme/primary.colors b/data/theme/primary.colors
index 202eed3a4..875a54317 100644
--- a/data/theme/primary.colors
+++ b/data/theme/primary.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #ffffff
 cursor = #000000
+cursor_foreground = #ffffff
 foreground = #000000
+highlight = #656565
+highlight_foreground = #eeeeee
 color0 = #000000
 color1 = #db4437
 color2 = #0f9d58
diff --git a/data/theme/purplepeter.colors b/data/theme/purplepeter.colors
index f4f52f7a8..5cbda6e80 100644
--- a/data/theme/purplepeter.colors
+++ b/data/theme/purplepeter.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #2a1a4a
 cursor = #c7c7c7
+cursor_foreground = #ffffff
 foreground = #ece7fa
+highlight = #8689c2
+highlight_foreground = #271c50
 color0 = #0a0520
 color1 = #ff796d
 color2 = #99b481
diff --git a/data/theme/rebecca.colors b/data/theme/rebecca.colors
index 7aa47c62c..ec3dda2b0 100644
--- a/data/theme/rebecca.colors
+++ b/data/theme/rebecca.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #292a44
 cursor = #b89bf9
+cursor_foreground = #292a44
 foreground = #e8e6ed
+highlight = #663399
+highlight_foreground = #f4f2f9
 color0 = #12131e
 color1 = #dd7755
 color2 = #04dbb5
diff --git a/data/theme/shades-of-purple.colors b/data/theme/shades-of-purple.colors
index 20c798d13..c147dc602 100644
--- a/data/theme/shades-of-purple.colors
+++ b/data/theme/shades-of-purple.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #1e1d40
 cursor = #fad000
+cursor_foreground = #fefff4
 foreground = #ffffff
+highlight = #b362ff
+highlight_foreground = #c2c2c2
 color0 = #000000
 color1 = #d90429
 color2 = #3ad900
diff --git a/data/theme/synthwave-everything.colors b/data/theme/synthwave-everything.colors
index 93f37bf1f..5dfc53b8b 100644
--- a/data/theme/synthwave-everything.colors
+++ b/data/theme/synthwave-everything.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #2a2139
 cursor = #72f1b8
+cursor_foreground = #1a1a1a
 foreground = #f0eff1
+highlight = #181521
+highlight_foreground = #f0eff1
 color0 = #fefefe
 color1 = #f97e72
 color2 = #72f1b8
diff --git a/data/theme/synthwave.colors b/data/theme/synthwave.colors
index 92afe1c76..9d5cde451 100644
--- a/data/theme/synthwave.colors
+++ b/data/theme/synthwave.colors
@@ -1,7 +1,10 @@
 [ssh_colors]
 background = #000000
 cursor = #19cde6
+cursor_foreground = #dad9c7
 foreground = #dad9c7
+highlight = #19cde6
+highlight_foreground = #000000
 color0 = #000000
 color1 = #f6188f
 color2 = #1ebb2b
diff --git a/data/ui/remmina_preferences.glade b/data/ui/remmina_preferences.glade
index 4a27e388c..836b84b96 100644
--- a/data/ui/remmina_preferences.glade
+++ b/data/ui/remmina_preferences.glade
@@ -1812,7 +1812,7 @@ It changes the connection name background colour, in the Remmina connection tool
               </packing>
             </child>
             <child>
-              <!-- n-columns=9 n-rows=17 -->
+              <!-- n-columns=9 n-rows=20 -->
               <object class="GtkGrid" id="grid_terminal">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
@@ -2056,7 +2056,7 @@ It changes the connection name background colour, in the Remmina connection tool
                   </object>
                   <packing>
                     <property name="left-attach">0</property>
-                    <property name="top-attach">16</property>
+                    <property name="top-attach">19</property>
                   </packing>
                 </child>
                 <child>
@@ -2071,7 +2071,7 @@ It changes the connection name background colour, in the Remmina connection tool
                   </object>
                   <packing>
                     <property name="left-attach">1</property>
-                    <property name="top-attach">16</property>
+                    <property name="top-attach">19</property>
                     <property name="width">8</property>
                   </packing>
                 </child>
@@ -2085,7 +2085,7 @@ It changes the connection name background colour, in the Remmina connection tool
                   </object>
                   <packing>
                     <property name="left-attach">0</property>
-                    <property name="top-attach">15</property>
+                    <property name="top-attach">18</property>
                   </packing>
                 </child>
                 <child>
@@ -2097,7 +2097,7 @@ It changes the connection name background colour, in the Remmina connection tool
                   </object>
                   <packing>
                     <property name="left-attach">1</property>
-                    <property name="top-attach">15</property>
+                    <property name="top-attach">18</property>
                   </packing>
                 </child>
                 <child>
@@ -2109,7 +2109,7 @@ It changes the connection name background colour, in the Remmina connection tool
                   </object>
                   <packing>
                     <property name="left-attach">2</property>
-                    <property name="top-attach">15</property>
+                    <property name="top-attach">18</property>
                   </packing>
                 </child>
                 <child>
@@ -2121,7 +2121,7 @@ It changes the connection name background colour, in the Remmina connection tool
                   </object>
                   <packing>
                     <property name="left-attach">3</property>
-                    <property name="top-attach">15</property>
+                    <property name="top-attach">18</property>
                   </packing>
                 </child>
                 <child>
@@ -2133,7 +2133,7 @@ It changes the connection name background colour, in the Remmina connection tool
                   </object>
                   <packing>
                     <property name="left-attach">4</property>
-                    <property name="top-attach">15</property>
+                    <property name="top-attach">18</property>
                   </packing>
                 </child>
                 <child>
@@ -2145,7 +2145,7 @@ It changes the connection name background colour, in the Remmina connection tool
                   </object>
                   <packing>
                     <property name="left-attach">5</property>
-                    <property name="top-attach">15</property>
+                    <property name="top-attach">18</property>
                   </packing>
                 </child>
                 <child>
@@ -2157,7 +2157,7 @@ It changes the connection name background colour, in the Remmina connection tool
                   </object>
                   <packing>
                     <property name="left-attach">6</property>
-                    <property name="top-attach">15</property>
+                    <property name="top-attach">18</property>
                   </packing>
                 </child>
                 <child>
@@ -2169,7 +2169,7 @@ It changes the connection name background colour, in the Remmina connection tool
                   </object>
                   <packing>
                     <property name="left-attach">7</property>
-                    <property name="top-attach">15</property>
+                    <property name="top-attach">18</property>
                   </packing>
                 </child>
                 <child>
@@ -2182,7 +2182,7 @@ It changes the connection name background colour, in the Remmina connection tool
                   </object>
                   <packing>
                     <property name="left-attach">8</property>
-                    <property name="top-attach">15</property>
+                    <property name="top-attach">18</property>
                   </packing>
                 </child>
                 <child>
@@ -2194,7 +2194,7 @@ It changes the connection name background colour, in the Remmina connection tool
                   </object>
                   <packing>
                     <property name="left-attach">1</property>
-                    <property name="top-attach">14</property>
+                    <property name="top-attach">17</property>
                   </packing>
                 </child>
                 <child>
@@ -2206,7 +2206,7 @@ It changes the connection name background colour, in the Remmina connection tool
                   </object>
                   <packing>
                     <property name="left-attach">2</property>
-                    <property name="top-attach">14</property>
+                    <property name="top-attach">17</property>
                   </packing>
                 </child>
                 <child>
@@ -2218,7 +2218,7 @@ It changes the connection name background colour, in the Remmina connection tool
                   </object>
                   <packing>
                     <property name="left-attach">3</property>
-                    <property name="top-attach">14</property>
+                    <property name="top-attach">17</property>
                   </packing>
                 </child>
                 <child>
@@ -2230,7 +2230,7 @@ It changes the connection name background colour, in the Remmina connection tool
                   </object>
                   <packing>
                     <property name="left-attach">4</property>
-                    <property name="top-attach">14</property>
+                    <property name="top-attach">17</property>
                   </packing>
                 </child>
                 <child>
@@ -2242,7 +2242,7 @@ It changes the connection name background colour, in the Remmina connection tool
                   </object>
                   <packing>
                     <property name="left-attach">5</property>
-                    <property name="top-attach">14</property>
+                    <property name="top-attach">17</property>
                   </packing>
                 </child>
                 <child>
@@ -2254,7 +2254,7 @@ It changes the connection name background colour, in the Remmina connection tool
                   </object>
                   <packing>
                     <property name="left-attach">6</property>
-                    <property name="top-attach">14</property>
+                    <property name="top-attach">17</property>
                   </packing>
                 </child>
                 <child>
@@ -2266,7 +2266,7 @@ It changes the connection name background colour, in the Remmina connection tool
                   </object>
                   <packing>
                     <property name="left-attach">7</property>
-                    <property name="top-attach">14</property>
+                    <property name="top-attach">17</property>
                   </packing>
                 </child>
                 <child>
@@ -2279,7 +2279,7 @@ It changes the connection name background colour, in the Remmina connection tool
                   </object>
                   <packing>
                     <property name="left-attach">8</property>
-                    <property name="top-attach">14</property>
+                    <property name="top-attach">17</property>
                   </packing>
                 </child>
                 <child>
@@ -2292,7 +2292,7 @@ It changes the connection name background colour, in the Remmina connection tool
                   </object>
                   <packing>
                     <property name="left-attach">0</property>
-                    <property name="top-attach">14</property>
+                    <property name="top-attach">17</property>
                   </packing>
                 </child>
                 <child>
@@ -2305,7 +2305,7 @@ It changes the connection name background colour, in the Remmina connection tool
                   </object>
                   <packing>
                     <property name="left-attach">0</property>
-                    <property name="top-attach">12</property>
+                    <property name="top-attach">14</property>
                   </packing>
                 </child>
                 <child>
@@ -2319,7 +2319,7 @@ It changes the connection name background colour, in the Remmina connection tool
                   </object>
                   <packing>
                     <property name="left-attach">1</property>
-                    <property name="top-attach">12</property>
+                    <property name="top-attach">14</property>
                     <property name="width">8</property>
                   </packing>
                 </child>
@@ -2481,17 +2481,86 @@ It changes the connection name background colour, in the Remmina connection tool
                   </object>
                   <packing>
                     <property name="left-attach">0</property>
+                    <property name="top-attach">16</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkColorButton" id="colorbutton_colorBD">
+                    <property name="visible">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">True</property>
+                    <property name="halign">start</property>
+                    <property name="margin-end">18</property>
+                    <property name="title" translatable="yes">Bold colour</property>
+                  </object>
+                  <packing>
+                    <property name="left-attach">1</property>
+                    <property name="top-attach">16</property>
+                    <property name="width">8</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label_terminal_highlight">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="halign">start</property>
+                    <property name="margin-start">18</property>
+                    <property name="label" translatable="yes">Highlight colour</property>
+                  </object>
+                  <packing>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">12</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label_terminal_highlight_foreground">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="halign">start</property>
+                    <property name="margin-start">18</property>
+                    <property name="label" translatable="yes">Highlight foreground colour</property>
+                  </object>
+                  <packing>
+                    <property name="left-attach">0</property>
                     <property name="top-attach">13</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkColorButton" id="colorbutton_bold">
+                  <object class="GtkLabel" id="label_terminal_cursor_foregorund">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="halign">start</property>
+                    <property name="margin-start">18</property>
+                    <property name="label" translatable="yes">Cursor foreground colour</property>
+                  </object>
+                  <packing>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">15</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkColorButton" id="colorbutton_highlight">
                     <property name="visible">True</property>
                     <property name="can-focus">True</property>
                     <property name="receives-default">True</property>
                     <property name="halign">start</property>
                     <property name="margin-end">18</property>
-                    <property name="title" translatable="yes">Cursor colour</property>
+                    <property name="title" translatable="yes">Highlight colour</property>
+                  </object>
+                  <packing>
+                    <property name="left-attach">1</property>
+                    <property name="top-attach">12</property>
+                    <property name="width">8</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkColorButton" id="colorbutton_highlight_foreground">
+                    <property name="visible">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">True</property>
+                    <property name="halign">start</property>
+                    <property name="margin-end">18</property>
+                    <property name="title" translatable="yes">Highlight foreground colour</property>
                   </object>
                   <packing>
                     <property name="left-attach">1</property>
@@ -2499,6 +2568,21 @@ It changes the connection name background colour, in the Remmina connection tool
                     <property name="width">8</property>
                   </packing>
                 </child>
+                <child>
+                  <object class="GtkColorButton" id="colorbutton_cursor_foreground">
+                    <property name="visible">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">True</property>
+                    <property name="halign">start</property>
+                    <property name="margin-end">18</property>
+                    <property name="title" translatable="yes">Cursor foreground colour</property>
+                  </object>
+                  <packing>
+                    <property name="left-attach">1</property>
+                    <property name="top-attach">15</property>
+                    <property name="width">8</property>
+                  </packing>
+                </child>
               </object>
               <packing>
                 <property name="position">6</property>
diff --git a/src/remmina_pref.c b/src/remmina_pref.c
index ae1165c0a..baddd0972 100644
--- a/src/remmina_pref.c
+++ b/src/remmina_pref.c
@@ -181,7 +181,10 @@ void remmina_pref_file_load_colors(GKeyFile *gkeyfile, RemminaColorPref *color_p
 	} colors[] = {
 		{ "background", &color_pref->background, "#d5ccba" },
 		{ "cursor",	&color_pref->cursor,	 "#45373c" },
-		{ "bold",	&color_pref->bold,	 "#45373c" },
+		{ "cursor_foreground",	&color_pref->cursor_foreground,	 "#d5ccba" },
+		{ "highlight",	&color_pref->highlight,	 "#45373c" },
+		{ "highlight_foreground",	&color_pref->highlight_foreground,	 "#d5ccba" },
+		{ "colorBD",	&color_pref->colorBD,	 "#45373c" },
 		{ "foreground", &color_pref->foreground, "#45373c" },
 		{ "color0",	&color_pref->color0,	 "#20111b" },
 		{ "color1",	&color_pref->color1,	 "#be100e" },
@@ -837,7 +840,10 @@ gboolean remmina_pref_save(void)
 	g_key_file_set_integer(gkeyfile, "remmina_pref", "vte_lines", remmina_pref.vte_lines);
 	g_key_file_set_string(gkeyfile, "ssh_colors", "background", remmina_pref.color_pref.background ? remmina_pref.color_pref.background : "");
 	g_key_file_set_string(gkeyfile, "ssh_colors", "cursor", remmina_pref.color_pref.cursor ? remmina_pref.color_pref.cursor : "");
-	g_key_file_set_string(gkeyfile, "ssh_colors", "bold", remmina_pref.color_pref.bold ? remmina_pref.color_pref.bold : "");
+	g_key_file_set_string(gkeyfile, "ssh_colors", "cursor_foreground", remmina_pref.color_pref.cursor_foreground ? remmina_pref.color_pref.cursor_foreground : "");
+	g_key_file_set_string(gkeyfile, "ssh_colors", "highlight", remmina_pref.color_pref.highlight ? remmina_pref.color_pref.highlight : "");
+	g_key_file_set_string(gkeyfile, "ssh_colors", "highlight_foreground", remmina_pref.color_pref.highlight_foreground ? remmina_pref.color_pref.highlight_foreground : "");
+	g_key_file_set_string(gkeyfile, "ssh_colors", "colorBD", remmina_pref.color_pref.colorBD ? remmina_pref.color_pref.colorBD : "");
 	g_key_file_set_string(gkeyfile, "ssh_colors", "foreground", remmina_pref.color_pref.foreground ? remmina_pref.color_pref.foreground : "");
 	g_key_file_set_string(gkeyfile, "ssh_colors", "color0", remmina_pref.color_pref.color0 ? remmina_pref.color_pref.color0 : "");
 	g_key_file_set_string(gkeyfile, "ssh_colors", "color1", remmina_pref.color_pref.color1 ? remmina_pref.color_pref.color1 : "");
diff --git a/src/remmina_pref.h b/src/remmina_pref.h
index 4b6385a2b..6edb4d63f 100644
--- a/src/remmina_pref.h
+++ b/src/remmina_pref.h
@@ -90,7 +90,10 @@ typedef struct _RemminaColorPref {
 	/* Color palette for VTE terminal */
 	gchar * background;
 	gchar * cursor;
-	gchar * bold;
+	gchar * cursor_foreground;
+	gchar * highlight;
+	gchar * highlight_foreground;
+	gchar * colorBD;
 	gchar * foreground;
 	gchar * color0;
 	gchar * color1;
diff --git a/src/remmina_pref_dialog.c b/src/remmina_pref_dialog.c
index 30722a182..2a298f915 100644
--- a/src/remmina_pref_dialog.c
+++ b/src/remmina_pref_dialog.c
@@ -340,8 +340,14 @@ void remmina_pref_on_dialog_destroy(GtkWidget *widget, gpointer user_data)
 	remmina_pref.color_pref.background = gdk_rgba_to_string(&color);
 	gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(remmina_pref_dialog->colorbutton_cursor), &color);
 	remmina_pref.color_pref.cursor = gdk_rgba_to_string(&color);
-	gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(remmina_pref_dialog->colorbutton_bold), &color);
-	remmina_pref.color_pref.bold = gdk_rgba_to_string(&color);
+	gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(remmina_pref_dialog->colorbutton_cursor_foreground), &color);
+	remmina_pref.color_pref.cursor_foreground = gdk_rgba_to_string(&color);
+	gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(remmina_pref_dialog->colorbutton_highlight), &color);
+	remmina_pref.color_pref.highlight = gdk_rgba_to_string(&color);
+	gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(remmina_pref_dialog->colorbutton_highlight_foreground), &color);
+	remmina_pref.color_pref.highlight_foreground = gdk_rgba_to_string(&color);
+	gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(remmina_pref_dialog->colorbutton_colorBD), &color);
+	remmina_pref.color_pref.colorBD = gdk_rgba_to_string(&color);
 	gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(remmina_pref_dialog->colorbutton_color0), &color);
 	remmina_pref.color_pref.color0 = gdk_rgba_to_string(&color);
 	gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(remmina_pref_dialog->colorbutton_color1), &color);
@@ -549,9 +555,16 @@ static void remmina_pref_dialog_init(void)
 	/* Cursor color option */
 	gdk_rgba_parse(&color, remmina_pref.color_pref.cursor);
 	gtk_color_chooser_set_rgba(GTK_COLOR_CHOOSER(remmina_pref_dialog->colorbutton_cursor), &color);
+	gdk_rgba_parse(&color, remmina_pref.color_pref.cursor_foreground);
+	gtk_color_chooser_set_rgba(GTK_COLOR_CHOOSER(remmina_pref_dialog->colorbutton_cursor_foreground), &color);
+	/* Highlight color option */
+	gdk_rgba_parse(&color, remmina_pref.color_pref.highlight);
+	gtk_color_chooser_set_rgba(GTK_COLOR_CHOOSER(remmina_pref_dialog->colorbutton_highlight), &color);
+	gdk_rgba_parse(&color, remmina_pref.color_pref.highlight_foreground);
+	gtk_color_chooser_set_rgba(GTK_COLOR_CHOOSER(remmina_pref_dialog->colorbutton_highlight_foreground), &color);
 	/* Bold color option */
-	gdk_rgba_parse(&color, remmina_pref.color_pref.bold);
-	gtk_color_chooser_set_rgba(GTK_COLOR_CHOOSER(remmina_pref_dialog->colorbutton_bold), &color);
+	gdk_rgba_parse(&color, remmina_pref.color_pref.colorBD);
+	gtk_color_chooser_set_rgba(GTK_COLOR_CHOOSER(remmina_pref_dialog->colorbutton_colorBD), &color);
 	/* 16 colors */
 	gdk_rgba_parse(&color, remmina_pref.color_pref.color0);
 	gtk_color_chooser_set_rgba(GTK_COLOR_CHOOSER(remmina_pref_dialog->colorbutton_color0), &color);
@@ -589,7 +602,10 @@ static void remmina_pref_dialog_init(void)
 #if !VTE_CHECK_VERSION(0, 38, 0)
 	/* Disable color scheme buttons if old version of VTE */
 	gtk_widget_set_sensitive(GTK_WIDGET(remmina_pref_dialog->colorbutton_cursor), FALSE);
-	gtk_widget_set_sensitive(GTK_WIDGET(remmina_pref_dialog->colorbutton_bold), FALSE);
+	gtk_widget_set_sensitive(GTK_WIDGET(remmina_pref_dialog->colorbutton_cursor_foreground), FALSE);
+	gtk_widget_set_sensitive(GTK_WIDGET(remmina_pref_dialog->colorbutton_highlight), FALSE);
+	gtk_widget_set_sensitive(GTK_WIDGET(remmina_pref_dialog->colorbutton_highlight_foreground), FALSE);
+	gtk_widget_set_sensitive(GTK_WIDGET(remmina_pref_dialog->colorbutton_colorBD), FALSE);
 	gtk_widget_set_sensitive(GTK_WIDGET(remmina_pref_dialog->colorbutton_color0), FALSE);
 	gtk_widget_set_sensitive(GTK_WIDGET(remmina_pref_dialog->colorbutton_color1), FALSE);
 	gtk_widget_set_sensitive(GTK_WIDGET(remmina_pref_dialog->colorbutton_color2), FALSE);
@@ -753,8 +769,11 @@ GtkDialog* remmina_pref_dialog_new(gint default_tab, GtkWindow *parent)
 	remmina_pref_dialog->colorbutton_background = GTK_COLOR_BUTTON(GET_OBJECT("colorbutton_background"));
 	remmina_pref_dialog->label_terminal_cursor_color = GTK_LABEL(GET_OBJECT("label_terminal_cursor_color"));
 	remmina_pref_dialog->colorbutton_cursor = GTK_COLOR_BUTTON(GET_OBJECT("colorbutton_cursor"));
+	remmina_pref_dialog->colorbutton_cursor_foreground = GTK_COLOR_BUTTON(GET_OBJECT("colorbutton_cursor_foreground"));
+	remmina_pref_dialog->colorbutton_highlight = GTK_COLOR_BUTTON(GET_OBJECT("colorbutton_highlight"));
+	remmina_pref_dialog->colorbutton_highlight_foreground = GTK_COLOR_BUTTON(GET_OBJECT("colorbutton_highlight_foreground"));
 	remmina_pref_dialog->label_terminal_bold_color = GTK_LABEL(GET_OBJECT("label_terminal_bold_color"));
-	remmina_pref_dialog->colorbutton_bold = GTK_COLOR_BUTTON(GET_OBJECT("colorbutton_bold"));
+	remmina_pref_dialog->colorbutton_colorBD = GTK_COLOR_BUTTON(GET_OBJECT("colorbutton_colorBD"));
 	remmina_pref_dialog->label_terminal_normal_colors = GTK_LABEL(GET_OBJECT("label_terminal_normal_colors"));
 	remmina_pref_dialog->colorbutton_color0 = GTK_COLOR_BUTTON(GET_OBJECT("colorbutton_color0"));
 	remmina_pref_dialog->colorbutton_color1 = GTK_COLOR_BUTTON(GET_OBJECT("colorbutton_color1"));
diff --git a/src/remmina_pref_dialog.h b/src/remmina_pref_dialog.h
index 7d3ea0676..f777f0f08 100644
--- a/src/remmina_pref_dialog.h
+++ b/src/remmina_pref_dialog.h
@@ -125,7 +125,10 @@ typedef struct _RemminaPrefDialog {
 	GtkLabel *		label_terminal_normal_colors;
 	GtkLabel *		label_terminal_bright_colors;
 	GtkColorButton *	colorbutton_cursor;
-	GtkColorButton *	colorbutton_bold;
+	GtkColorButton *	colorbutton_cursor_foreground;
+	GtkColorButton *	colorbutton_highlight;
+	GtkColorButton *	colorbutton_highlight_foreground;
+	GtkColorButton *	colorbutton_colorBD;
 	GtkColorButton *	colorbutton_color0;
 	GtkColorButton *	colorbutton_color1;
 	GtkColorButton *	colorbutton_color2;
diff --git a/src/remmina_ssh_plugin.c b/src/remmina_ssh_plugin.c
index 901d5e973..dda05f968 100644
--- a/src/remmina_ssh_plugin.c
+++ b/src/remmina_ssh_plugin.c
@@ -891,7 +891,10 @@ remmina_plugin_ssh_init(RemminaProtocolWidget *gp)
 #if VTE_CHECK_VERSION(0, 38, 0)
 	GdkRGBA cp[PALETTE_SIZE];
 	GdkRGBA cursor_color;
-	GdkRGBA bold_color;
+	GdkRGBA cursor_foreground;
+	GdkRGBA highlight;
+	GdkRGBA highlight_foreground;
+	GdkRGBA colorBD;
 
 	/*
 	 * custom colors reside inside of the 'theme' subdir of the remmina config folder (.config/remmina/theme)
@@ -944,7 +947,10 @@ remmina_plugin_ssh_init(RemminaProtocolWidget *gp)
 		gdk_rgba_parse(&foreground_color, color_pref.foreground);
 		gdk_rgba_parse(&background_color, color_pref.background);
 		gdk_rgba_parse(&cursor_color, color_pref.cursor);
-		gdk_rgba_parse(&bold_color, color_pref.bold);
+		gdk_rgba_parse(&cursor_foreground, color_pref.cursor_foreground);
+		gdk_rgba_parse(&highlight, color_pref.highlight);
+		gdk_rgba_parse(&highlight_foreground, color_pref.highlight_foreground);
+		gdk_rgba_parse(&colorBD, color_pref.colorBD);
 
 		gdk_rgba_parse(&cp[0], color_pref.color0);
 		gdk_rgba_parse(&cp[1], color_pref.color1);
@@ -978,49 +984,70 @@ remmina_plugin_ssh_init(RemminaProtocolWidget *gp)
 			gdk_rgba_parse(&foreground_color, "#ffffff");
 			gdk_rgba_parse(&background_color, "#000000");
 			gdk_rgba_parse(&cursor_color, "#ffffff");
-			gdk_rgba_parse(&bold_color, "#ffffff");
+			gdk_rgba_parse(&cursor_foreground, "#00000");
+			gdk_rgba_parse(&highlight, "#ffffff");
+			gdk_rgba_parse(&highlight_foreground, "#00000");
+			gdk_rgba_parse(&colorBD, "#ffffff");
 			remminavte.palette = linux_palette;
 			break;
 		case TANGO:
-			gdk_rgba_parse(&foreground_color, "#eeeeec");
-			gdk_rgba_parse(&background_color, "#2e3436");
-			gdk_rgba_parse(&cursor_color, "#8ae234");
-			gdk_rgba_parse(&bold_color, "#eeeeec");
+			gdk_rgba_parse(&foreground_color, "#ffffff");
+			gdk_rgba_parse(&background_color, "#000000");
+			gdk_rgba_parse(&cursor_color, "#000000");
+			gdk_rgba_parse(&cursor_foreground, "#ffffff");
+			gdk_rgba_parse(&highlight, "#ffffff");
+			gdk_rgba_parse(&highlight_foreground, "#00000");
+			gdk_rgba_parse(&colorBD, "#000000");
 			remminavte.palette = tango_palette;
 			break;
 		case GRUVBOX:
-			gdk_rgba_parse(&foreground_color, "#ebdbb2");
-			gdk_rgba_parse(&background_color, "#282828");
-			gdk_rgba_parse(&cursor_color, "#d3869b");
-			gdk_rgba_parse(&bold_color, "#ffffff");
+			gdk_rgba_parse(&foreground_color, "#e6d4a3");
+			gdk_rgba_parse(&background_color, "#1e1e1e");
+			gdk_rgba_parse(&cursor_color, "#e6d4a3");
+			gdk_rgba_parse(&cursor_foreground, "#e6d4a3");
+			gdk_rgba_parse(&highlight, "#e6d4a3");
+			gdk_rgba_parse(&highlight_foreground, "#1e1e1e");
+			gdk_rgba_parse(&colorBD, "#ffffff");
 			remminavte.palette = gruvbox_palette;
 			break;
 		case SOLARIZED_DARK:
 			gdk_rgba_parse(&foreground_color, "#839496");
 			gdk_rgba_parse(&background_color, "#002b36");
 			gdk_rgba_parse(&cursor_color, "#93a1a1");
-			gdk_rgba_parse(&bold_color, "#819090");
+			gdk_rgba_parse(&cursor_foreground, "#839496");
+			gdk_rgba_parse(&highlight, "#839496");
+			gdk_rgba_parse(&highlight_foreground, "#002b36");
+			gdk_rgba_parse(&colorBD, "#819090");
 			remminavte.palette = solarized_dark_palette;
 			break;
 		case SOLARIZED_LIGHT:
 			gdk_rgba_parse(&foreground_color, "#657b83");
 			gdk_rgba_parse(&background_color, "#fdf6e3");
 			gdk_rgba_parse(&cursor_color, "#586e75");
-			gdk_rgba_parse(&bold_color, "#475b62");
+			gdk_rgba_parse(&cursor_foreground, "#657b83");
+			gdk_rgba_parse(&highlight, "#657b83");
+			gdk_rgba_parse(&highlight_foreground, "#fdf6e3");
+			gdk_rgba_parse(&colorBD, "#475b62");
 			remminavte.palette = solarized_light_palette;
 			break;
 		case XTERM:
 			gdk_rgba_parse(&foreground_color, "#000000");
 			gdk_rgba_parse(&background_color, "#ffffff");
 			gdk_rgba_parse(&cursor_color, "#000000");
-			gdk_rgba_parse(&bold_color, "#000000");
+			gdk_rgba_parse(&cursor_foreground, "#ffffff");
+			gdk_rgba_parse(&highlight, "#000000");
+			gdk_rgba_parse(&highlight_foreground, "#ffffff");
+			gdk_rgba_parse(&colorBD, "#000000");
 			remminavte.palette = xterm_palette;
 			break;
 		case CUSTOM:
 			gdk_rgba_parse(&foreground_color, remmina_pref.color_pref.foreground);
 			gdk_rgba_parse(&background_color, remmina_pref.color_pref.background);
 			gdk_rgba_parse(&cursor_color, remmina_pref.color_pref.cursor);
-			gdk_rgba_parse(&bold_color, remmina_pref.color_pref.bold);
+			gdk_rgba_parse(&cursor_foreground, remmina_pref.color_pref.cursor_foreground);
+			gdk_rgba_parse(&highlight, remmina_pref.color_pref.highlight);
+			gdk_rgba_parse(&highlight_foreground, remmina_pref.color_pref.highlight_foreground);
+			gdk_rgba_parse(&colorBD, remmina_pref.color_pref.colorBD);
 
 			gdk_rgba_parse(&cp[0], remmina_pref.color_pref.color0);
 			gdk_rgba_parse(&cp[1], remmina_pref.color_pref.color1);
@@ -1058,7 +1085,10 @@ remmina_plugin_ssh_init(RemminaProtocolWidget *gp)
 	vte_terminal_set_color_foreground(VTE_TERMINAL(vte), &foreground_color);
 	vte_terminal_set_color_background(VTE_TERMINAL(vte), &background_color);
 	vte_terminal_set_color_cursor(VTE_TERMINAL(vte), &cursor_color);
-	vte_terminal_set_color_bold(VTE_TERMINAL(vte), &bold_color);
+	vte_terminal_set_color_cursor_foreground(VTE_TERMINAL(vte), &cursor_foreground);
+	vte_terminal_set_color_highlight(VTE_TERMINAL(vte), &highlight);
+	vte_terminal_set_color_highlight_foreground(VTE_TERMINAL(vte), &highlight_foreground);
+	vte_terminal_set_color_bold(VTE_TERMINAL(vte), &colorBD);
 
 #else
 	/* VTE <= 2.90 doesn’t support GdkRGBA so we must convert GdkRGBA to GdkColor */