From e288abed87470f94811f9c159b2a326b6e73a09d Mon Sep 17 00:00:00 2001
From: David Cser <123732243+dcser123@users.noreply.github.com>
Date: Sun, 28 Apr 2024 21:43:19 +0100
Subject: [PATCH 1/5] Update highlight.R

---
 R/highlight.R | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/R/highlight.R b/R/highlight.R
index 4083db4cda..582ffd5680 100644
--- a/R/highlight.R
+++ b/R/highlight.R
@@ -30,7 +30,7 @@ hilight_source = function(x, format, options) {
 
 highlight_header = function() {
   set_header(highlight.extra = paste(c(
-    sprintf('\\let\\hl%s\\hlstd', c('esc', 'pps', 'lin')),
+    sprintf('\\let\\hl%s\\hldef', c('esc', 'pps', 'lin')),
     sprintf('\\let\\hl%s\\hlcom', c('slc', 'ppc'))
   ), collapse = ' '))
 }

From 0bd524efe13122fa4edb17722dd869a2156bc1ff Mon Sep 17 00:00:00 2001
From: dcser123 <zctqdcs@ucl.ac.uk>
Date: Sun, 28 Apr 2024 22:05:28 +0100
Subject: [PATCH 2/5] update themes to be consistent with A.S highlight

---
 inst/themes/acid.css              | 4 ++--
 inst/themes/aiseered.css          | 4 ++--
 inst/themes/andes.css             | 4 ++--
 inst/themes/anotherdark.css       | 4 ++--
 inst/themes/autumn.css            | 4 ++--
 inst/themes/baycomb.css           | 4 ++--
 inst/themes/bclear.css            | 4 ++--
 inst/themes/biogoo.css            | 4 ++--
 inst/themes/bipolar.css           | 4 ++--
 inst/themes/blacknblue.css        | 4 ++--
 inst/themes/bluegreen.css         | 4 ++--
 inst/themes/breeze.css            | 4 ++--
 inst/themes/bright.css            | 4 ++--
 inst/themes/camo.css              | 4 ++--
 inst/themes/candy.css             | 4 ++--
 inst/themes/clarity.css           | 4 ++--
 inst/themes/dante.css             | 4 ++--
 inst/themes/darkblue.css          | 4 ++--
 inst/themes/darkbone.css          | 4 ++--
 inst/themes/darkness.css          | 4 ++--
 inst/themes/darkslategray.css     | 4 ++--
 inst/themes/darkspectrum.css      | 4 ++--
 inst/themes/default.css           | 4 ++--
 inst/themes/denim.css             | 4 ++--
 inst/themes/dusk.css              | 4 ++--
 inst/themes/earendel.css          | 4 ++--
 inst/themes/easter.css            | 4 ++--
 inst/themes/edit-anjuta.css       | 4 ++--
 inst/themes/edit-eclipse.css      | 4 ++--
 inst/themes/edit-emacs.css        | 4 ++--
 inst/themes/edit-flashdevelop.css | 4 ++--
 inst/themes/edit-gedit.css        | 4 ++--
 inst/themes/edit-jedit.css        | 4 ++--
 inst/themes/edit-kwrite.css       | 4 ++--
 inst/themes/edit-matlab.css       | 4 ++--
 inst/themes/edit-msvs2008.css     | 4 ++--
 inst/themes/edit-nedit.css        | 4 ++--
 inst/themes/edit-vim-dark.css     | 4 ++--
 inst/themes/edit-vim.css          | 4 ++--
 inst/themes/edit-xcode.css        | 4 ++--
 inst/themes/ekvoli.css            | 4 ++--
 inst/themes/fine_blue.css         | 4 ++--
 inst/themes/freya.css             | 4 ++--
 inst/themes/fruit.css             | 4 ++--
 inst/themes/golden.css            | 4 ++--
 inst/themes/greenlcd.css          | 4 ++--
 inst/themes/greyscale0.css        | 4 ++--
 inst/themes/greyscale1.css        | 4 ++--
 inst/themes/greyscale2.css        | 4 ++--
 inst/themes/kellys.css            | 4 ++--
 inst/themes/leo.css               | 4 ++--
 inst/themes/lucretia.css          | 4 ++--
 inst/themes/manxome.css           | 4 ++--
 inst/themes/maroloccio.css        | 4 ++--
 inst/themes/matrix.css            | 4 ++--
 inst/themes/moe.css               | 4 ++--
 inst/themes/molokai.css           | 4 ++--
 inst/themes/moria.css             | 4 ++--
 inst/themes/navajo-night.css      | 4 ++--
 inst/themes/navy.css              | 4 ++--
 inst/themes/neon.css              | 4 ++--
 inst/themes/night.css             | 4 ++--
 inst/themes/nightshimmer.css      | 4 ++--
 inst/themes/nuvola.css            | 4 ++--
 inst/themes/olive.css             | 4 ++--
 inst/themes/orion.css             | 4 ++--
 inst/themes/oxygenated.css        | 4 ++--
 inst/themes/pablo.css             | 4 ++--
 inst/themes/peaksea.css           | 4 ++--
 inst/themes/print.css             | 4 ++--
 inst/themes/rand01.css            | 4 ++--
 inst/themes/rdark.css             | 4 ++--
 inst/themes/relaxedgreen.css      | 4 ++--
 inst/themes/rootwater.css         | 4 ++--
 inst/themes/seashell.css          | 4 ++--
 inst/themes/solarized-dark.css    | 4 ++--
 inst/themes/solarized-light.css   | 4 ++--
 inst/themes/tabula.css            | 4 ++--
 inst/themes/tcsoft.css            | 4 ++--
 inst/themes/vampire.css           | 4 ++--
 inst/themes/whitengrey.css        | 4 ++--
 inst/themes/xoria256.css          | 4 ++--
 inst/themes/zellner.css           | 4 ++--
 inst/themes/zenburn.css           | 4 ++--
 inst/themes/zmrok.css             | 4 ++--
 85 files changed, 170 insertions(+), 170 deletions(-)

diff --git a/inst/themes/acid.css b/inst/themes/acid.css
index efcd2905d7..6e3b1ad3d7 100644
--- a/inst/themes/acid.css
+++ b/inst/themes/acid.css
@@ -5,7 +5,7 @@
   color: #800080;
   font-weight: bold;
 }
-.str {
+.sng {
   color: #a68500;
 }
 .com {
@@ -15,7 +15,7 @@
   color: #ff0080;
   font-weight: bold;
 }
-.std {
+.def {
   color: #000000;
 }
 .kwa {
diff --git a/inst/themes/aiseered.css b/inst/themes/aiseered.css
index 76b2ba210b..304f69bc8b 100644
--- a/inst/themes/aiseered.css
+++ b/inst/themes/aiseered.css
@@ -4,7 +4,7 @@
 .num {
   color: #88ddee;
 }
-.str {
+.sng {
   color: #ffcc88;
 }
 .com {
@@ -14,7 +14,7 @@
 .opt {
   color: #ffcc33;
 }
-.std {
+.def {
   color: #f08080;
 }
 .kwa {
diff --git a/inst/themes/andes.css b/inst/themes/andes.css
index 4b5be38bc5..9ea4fd3694 100644
--- a/inst/themes/andes.css
+++ b/inst/themes/andes.css
@@ -4,7 +4,7 @@
 .num {
   color: #dfaf87;
 }
-.str {
+.sng {
   color: #ffff77;
 }
 .com {
@@ -13,7 +13,7 @@
 .opt {
   color: #ff00cc;
 }
-.std {
+.def {
   color: #f0f0f0;
 }
 .kwa {
diff --git a/inst/themes/anotherdark.css b/inst/themes/anotherdark.css
index f70c97a4f0..0d46a8558d 100644
--- a/inst/themes/anotherdark.css
+++ b/inst/themes/anotherdark.css
@@ -4,7 +4,7 @@
 .num {
   color: #ffa0a0;
 }
-.str {
+.sng {
   color: #ffa0a0;
 }
 .com {
@@ -13,7 +13,7 @@
 .opt {
   color: #dedede;
 }
-.std {
+.def {
   color: #dedede;
 }
 .kwa {
diff --git a/inst/themes/autumn.css b/inst/themes/autumn.css
index 075f798cd9..b7a041a5b0 100644
--- a/inst/themes/autumn.css
+++ b/inst/themes/autumn.css
@@ -4,7 +4,7 @@
 .num {
   color: #00884c;
 }
-.str {
+.sng {
   color: #00884c;
 }
 .com {
@@ -13,7 +13,7 @@
 .opt {
   color: #404040;
 }
-.std {
+.def {
   color: #404040;
 }
 .kwa {
diff --git a/inst/themes/baycomb.css b/inst/themes/baycomb.css
index 79c9934c0b..8b48f527a2 100644
--- a/inst/themes/baycomb.css
+++ b/inst/themes/baycomb.css
@@ -4,7 +4,7 @@
 .num {
   color: #4580b4;
 }
-.str {
+.sng {
   color: #5c78f0;
 }
 .com {
@@ -13,7 +13,7 @@
 .opt {
   color: #b0b0b0;
 }
-.std {
+.def {
   color: #a0b4e0;
 }
 .kwa {
diff --git a/inst/themes/bclear.css b/inst/themes/bclear.css
index 31e3577199..b0117acdfd 100644
--- a/inst/themes/bclear.css
+++ b/inst/themes/bclear.css
@@ -4,7 +4,7 @@
 .num {
   color: #1094a0;
 }
-.str {
+.sng {
   color: #1094a0;
 }
 .com {
@@ -13,7 +13,7 @@
 .opt {
   color: #323232;
 }
-.std {
+.def {
   color: #323232;
 }
 .kwa {
diff --git a/inst/themes/biogoo.css b/inst/themes/biogoo.css
index a7139dc530..0be25aed90 100644
--- a/inst/themes/biogoo.css
+++ b/inst/themes/biogoo.css
@@ -4,7 +4,7 @@
 .num {
   color: #b85d00;
 }
-.str {
+.sng {
   color: #d10000;
 }
 .com {
@@ -13,7 +13,7 @@
 .opt {
   color: #000000;
 }
-.std {
+.def {
   color: #000000;
 }
 .kwa {
diff --git a/inst/themes/bipolar.css b/inst/themes/bipolar.css
index da9433ea42..2bc7cc13b9 100644
--- a/inst/themes/bipolar.css
+++ b/inst/themes/bipolar.css
@@ -4,7 +4,7 @@
 .num {
   color: #0083c9;
 }
-.str {
+.sng {
   color: #eba236;
 }
 .com {
@@ -14,7 +14,7 @@
 .opt {
   color: #e3d922;
 }
-.std {
+.def {
   color: #d62b9a;
 }
 .kwa {
diff --git a/inst/themes/blacknblue.css b/inst/themes/blacknblue.css
index fc46156fd4..bcefdaddd8 100644
--- a/inst/themes/blacknblue.css
+++ b/inst/themes/blacknblue.css
@@ -4,7 +4,7 @@
 .num {
   color: #cc3366;
 }
-.str {
+.sng {
   color: #cfc631;
 }
 .com {
@@ -14,7 +14,7 @@
 .opt {
   color: #ccc6c6;
 }
-.std {
+.def {
   color: #22a0d6;
 }
 .kwa {
diff --git a/inst/themes/bluegreen.css b/inst/themes/bluegreen.css
index 036db3dfde..5fd86b90c0 100644
--- a/inst/themes/bluegreen.css
+++ b/inst/themes/bluegreen.css
@@ -5,7 +5,7 @@
   color: #72A5E4;
   font-weight: bold;
 }
-.str {
+.sng {
   color: #72A5E4;
   font-weight: bold;
 }
@@ -16,7 +16,7 @@
 .opt {
   color: #ffffff;
 }
-.std {
+.def {
   color: #ffffff;
 }
 .kwa {
diff --git a/inst/themes/breeze.css b/inst/themes/breeze.css
index 5d66696935..d6394954ce 100644
--- a/inst/themes/breeze.css
+++ b/inst/themes/breeze.css
@@ -4,7 +4,7 @@
 .num {
   color: #60ffff;
 }
-.str {
+.sng {
   color: #60ffff;
 }
 .com {
@@ -13,7 +13,7 @@
 .opt {
   color: #ffffff;
 }
-.std {
+.def {
   color: #ffffff;
 }
 .kwa {
diff --git a/inst/themes/bright.css b/inst/themes/bright.css
index ed43cf5573..2dd47bfe16 100644
--- a/inst/themes/bright.css
+++ b/inst/themes/bright.css
@@ -4,7 +4,7 @@
 .num {
   color: #32ba06;
 }
-.str {
+.sng {
   color: #1861a7;
 }
 .com {
@@ -13,7 +13,7 @@
 .opt {
   color: #555555;
 }
-.std {
+.def {
   color: #330066;
 }
 .kwa {
diff --git a/inst/themes/camo.css b/inst/themes/camo.css
index e359616270..0ba630bd8d 100644
--- a/inst/themes/camo.css
+++ b/inst/themes/camo.css
@@ -4,7 +4,7 @@
 .num {
   color: #d2691e;
 }
-.str {
+.sng {
   color: #ffe4b5;
 }
 .com {
@@ -13,7 +13,7 @@
 .opt {
   color: #ffe4c4;
 }
-.std {
+.def {
   color: #ffe4c4;
 }
 .kwa {
diff --git a/inst/themes/candy.css b/inst/themes/candy.css
index 2efd558a50..ce79f1e391 100644
--- a/inst/themes/candy.css
+++ b/inst/themes/candy.css
@@ -4,7 +4,7 @@
 .num {
   color: #90d0ff;
 }
-.str {
+.sng {
   color: #90d0ff;
 }
 .com {
@@ -14,7 +14,7 @@
 .opt {
   color: #f0f0f8;
 }
-.std {
+.def {
   color: #f0f0f8;
 }
 .kwa {
diff --git a/inst/themes/clarity.css b/inst/themes/clarity.css
index 3fe29b5a71..826a476e36 100644
--- a/inst/themes/clarity.css
+++ b/inst/themes/clarity.css
@@ -4,7 +4,7 @@
 .num {
   color: #b3ee3a;
 }
-.str {
+.sng {
   color: #cccccc;
 }
 .com {
@@ -13,7 +13,7 @@
 .opt {
   color: #b2dfee;
 }
-.std {
+.def {
   color: #b2dfee;
 }
 .kwa {
diff --git a/inst/themes/dante.css b/inst/themes/dante.css
index 7bb0e24278..cb4fb2e3ce 100644
--- a/inst/themes/dante.css
+++ b/inst/themes/dante.css
@@ -4,7 +4,7 @@
 .num {
   color: #ee0000;
 }
-.str {
+.sng {
   color: #cd2626;
 }
 .com {
@@ -13,7 +13,7 @@
 .opt {
   color: #cdaf96;
 }
-.std {
+.def {
   color: #cdaf96;
 }
 .kwa {
diff --git a/inst/themes/darkblue.css b/inst/themes/darkblue.css
index fffe5488c6..253a0ccbc2 100644
--- a/inst/themes/darkblue.css
+++ b/inst/themes/darkblue.css
@@ -4,7 +4,7 @@
 .num {
   color: #42cad9;
 }
-.str {
+.sng {
   color: #ffa0a0;
 }
 .com {
@@ -13,7 +13,7 @@
 .opt {
   color: #bababa;
 }
-.std {
+.def {
   color: #ffffff;
 }
 .kwa {
diff --git a/inst/themes/darkbone.css b/inst/themes/darkbone.css
index c931ad9fd6..64ae92e0c2 100644
--- a/inst/themes/darkbone.css
+++ b/inst/themes/darkbone.css
@@ -4,7 +4,7 @@
 .num {
   color: #d0e080;
 }
-.str {
+.sng {
   color: #d0e080;
 }
 .com {
@@ -13,7 +13,7 @@
 .opt {
   color: #cccccc;
 }
-.std {
+.def {
   color: #a0a0c0;
 }
 .kwa {
diff --git a/inst/themes/darkness.css b/inst/themes/darkness.css
index 2f536351b1..781befef19 100644
--- a/inst/themes/darkness.css
+++ b/inst/themes/darkness.css
@@ -4,7 +4,7 @@
 .num {
   color: #619de7;
 }
-.str {
+.sng {
   color: #abab00;
   font-weight: bold;
 }
@@ -14,7 +14,7 @@
 .opt {
   color: #ff00ff;
 }
-.std {
+.def {
   color: #ffffff;
 }
 .kwa {
diff --git a/inst/themes/darkslategray.css b/inst/themes/darkslategray.css
index e58d48bde9..077fc9a890 100644
--- a/inst/themes/darkslategray.css
+++ b/inst/themes/darkslategray.css
@@ -4,7 +4,7 @@
 .num {
   color: #ff6347;
 }
-.str {
+.sng {
   color: #7fffd4;
 }
 .com {
@@ -13,7 +13,7 @@
 .opt {
   color: #f5deb3;
 }
-.std {
+.def {
   color: #f5deb3;
 }
 .kwa {
diff --git a/inst/themes/darkspectrum.css b/inst/themes/darkspectrum.css
index 62ad656df5..273cc20c3d 100644
--- a/inst/themes/darkspectrum.css
+++ b/inst/themes/darkspectrum.css
@@ -4,7 +4,7 @@
 .num {
   color: #fce94f;
 }
-.str {
+.sng {
   color: #fce94f;
 }
 .com {
@@ -13,7 +13,7 @@
 .opt {
   color: #efefef;
 }
-.std {
+.def {
   color: #efefef;
 }
 .kwa {
diff --git a/inst/themes/default.css b/inst/themes/default.css
index e19f5875b7..f58f2b63dd 100644
--- a/inst/themes/default.css
+++ b/inst/themes/default.css
@@ -4,7 +4,7 @@
 .num {
   color: #AF0F91;
 }
-.str {
+.sng {
   color: #317ECC;
 }
 .com {
@@ -14,7 +14,7 @@
 .opt {
   color: #000000;
 }
-.std {
+.def {
   color: #585858;
 }
 .kwa {
diff --git a/inst/themes/denim.css b/inst/themes/denim.css
index 3afbe50d50..917a24201c 100644
--- a/inst/themes/denim.css
+++ b/inst/themes/denim.css
@@ -4,7 +4,7 @@
 .num {
   color: #33FF33;
 }
-.str {
+.sng {
   color: #CCCC99;
 }
 .com {
@@ -13,7 +13,7 @@
 .opt {
   color: #FFFFFF;
 }
-.std {
+.def {
   color: #FFFFFF;
 }
 .kwa {
diff --git a/inst/themes/dusk.css b/inst/themes/dusk.css
index 812b8f6f5a..8c22de8fd3 100644
--- a/inst/themes/dusk.css
+++ b/inst/themes/dusk.css
@@ -4,7 +4,7 @@
 .num {
   color: #cdb7b5;
 }
-.str {
+.sng {
   color: #9ac0cd;
 }
 .com {
@@ -13,7 +13,7 @@
 .opt {
   color: #fffff0;
 }
-.std {
+.def {
   color: #fffff0;
 }
 .kwa {
diff --git a/inst/themes/earendel.css b/inst/themes/earendel.css
index 922d9741e9..32b5431b53 100644
--- a/inst/themes/earendel.css
+++ b/inst/themes/earendel.css
@@ -4,7 +4,7 @@
 .num {
   color: #a8660d;
 }
-.str {
+.sng {
   color: #a8660d;
 }
 .com {
@@ -13,7 +13,7 @@
 .opt {
   color: #000000;
 }
-.std {
+.def {
   color: #000000;
 }
 .kwa {
diff --git a/inst/themes/easter.css b/inst/themes/easter.css
index de48a134bc..aa9da3afba 100644
--- a/inst/themes/easter.css
+++ b/inst/themes/easter.css
@@ -4,7 +4,7 @@
 .num {
   color: #e11a70;
 }
-.str {
+.sng {
   color: #ca4be3;
 }
 .com {
@@ -14,7 +14,7 @@
 .opt {
   color: #fa4700;
 }
-.std {
+.def {
   color: #2C7B34;
 }
 .kwa {
diff --git a/inst/themes/edit-anjuta.css b/inst/themes/edit-anjuta.css
index e343eaa9cf..b3f97af145 100644
--- a/inst/themes/edit-anjuta.css
+++ b/inst/themes/edit-anjuta.css
@@ -4,7 +4,7 @@
 .num {
   color: #008800;
 }
-.str {
+.sng {
   color: #ddbb00;
 }
 .com {
@@ -14,7 +14,7 @@
 .opt {
   color: #000000;
 }
-.std {
+.def {
   color: #000000;
 }
 .kwa {
diff --git a/inst/themes/edit-eclipse.css b/inst/themes/edit-eclipse.css
index 2f8bf52c39..ec12832d83 100644
--- a/inst/themes/edit-eclipse.css
+++ b/inst/themes/edit-eclipse.css
@@ -4,7 +4,7 @@
 .num {
   color: #000000;
 }
-.str {
+.sng {
   color: #0000ff;
 }
 .com {
@@ -13,7 +13,7 @@
 .opt {
   color: #000000;
 }
-.std {
+.def {
   color: #000000;
 }
 .kwa {
diff --git a/inst/themes/edit-emacs.css b/inst/themes/edit-emacs.css
index ccede44ae7..ceba9489be 100644
--- a/inst/themes/edit-emacs.css
+++ b/inst/themes/edit-emacs.css
@@ -4,7 +4,7 @@
 .num {
   color: #000000;
 }
-.str {
+.sng {
   color: #bd8d8b;
 }
 .com {
@@ -14,7 +14,7 @@
 .opt {
   color: #000000;
 }
-.std {
+.def {
   color: #000000;
 }
 .kwa {
diff --git a/inst/themes/edit-flashdevelop.css b/inst/themes/edit-flashdevelop.css
index c9a8567150..632859fbd3 100644
--- a/inst/themes/edit-flashdevelop.css
+++ b/inst/themes/edit-flashdevelop.css
@@ -5,7 +5,7 @@
   color: #0000ff;
   font-weight: bold;
 }
-.str {
+.sng {
   color: #a31515;
 }
 .com {
@@ -14,7 +14,7 @@
 .opt {
   color: #000000;
 }
-.std {
+.def {
   color: #000000;
 }
 .kwa {
diff --git a/inst/themes/edit-gedit.css b/inst/themes/edit-gedit.css
index 4a0be8f02b..0427c07b1b 100644
--- a/inst/themes/edit-gedit.css
+++ b/inst/themes/edit-gedit.css
@@ -4,7 +4,7 @@
 .num {
   color: #FF00FF;
 }
-.str {
+.sng {
   color: #FF00FF;
 }
 .com {
@@ -13,7 +13,7 @@
 .opt {
   color: #3A3935;
 }
-.std {
+.def {
   color: #3A3935;
 }
 .kwa {
diff --git a/inst/themes/edit-jedit.css b/inst/themes/edit-jedit.css
index 3dda5a529a..728224f8f4 100644
--- a/inst/themes/edit-jedit.css
+++ b/inst/themes/edit-jedit.css
@@ -4,7 +4,7 @@
 .num {
   color: #ff0000;
 }
-.str {
+.sng {
   color: #ff00cc;
 }
 .com {
@@ -14,7 +14,7 @@
   color: #000000;
   font-weight: bold;
 }
-.std {
+.def {
   color: #000000;
 }
 .kwa {
diff --git a/inst/themes/edit-kwrite.css b/inst/themes/edit-kwrite.css
index c8c679b547..fa956ea520 100644
--- a/inst/themes/edit-kwrite.css
+++ b/inst/themes/edit-kwrite.css
@@ -4,7 +4,7 @@
 .num {
   color: #B07E00;
 }
-.str {
+.sng {
   color: #BF0303;
 }
 .com {
@@ -14,7 +14,7 @@
 .opt {
   color: #000000;
 }
-.std {
+.def {
   color: #000000;
 }
 .kwa {
diff --git a/inst/themes/edit-matlab.css b/inst/themes/edit-matlab.css
index 2e90e8b85c..ff92e67cf9 100644
--- a/inst/themes/edit-matlab.css
+++ b/inst/themes/edit-matlab.css
@@ -4,7 +4,7 @@
 .num {
   color: #000000;
 }
-.str {
+.sng {
   color: #800000;
 }
 .com {
@@ -13,7 +13,7 @@
 .opt {
   color: #000000;
 }
-.std {
+.def {
   color: #000000;
 }
 .kwa {
diff --git a/inst/themes/edit-msvs2008.css b/inst/themes/edit-msvs2008.css
index dc00ee6d5d..f445299302 100644
--- a/inst/themes/edit-msvs2008.css
+++ b/inst/themes/edit-msvs2008.css
@@ -4,7 +4,7 @@
 .num {
   color: #000000;
 }
-.str {
+.sng {
   color: #a31515;
 }
 .com {
@@ -13,7 +13,7 @@
 .opt {
   color: #000000;
 }
-.std {
+.def {
   color: #000000;
 }
 .kwa {
diff --git a/inst/themes/edit-nedit.css b/inst/themes/edit-nedit.css
index f53fbbaf3a..4c4d7faa09 100644
--- a/inst/themes/edit-nedit.css
+++ b/inst/themes/edit-nedit.css
@@ -4,7 +4,7 @@
 .num {
   color: #006400;
 }
-.str {
+.sng {
   color: #006400;
 }
 .com {
@@ -15,7 +15,7 @@
   color: #000000;
   font-weight: bold;
 }
-.std {
+.def {
   color: #000000;
 }
 .kwa {
diff --git a/inst/themes/edit-vim-dark.css b/inst/themes/edit-vim-dark.css
index df016760e2..ce6a510c8a 100644
--- a/inst/themes/edit-vim-dark.css
+++ b/inst/themes/edit-vim-dark.css
@@ -4,7 +4,7 @@
 .num {
   color: #ff0000;
 }
-.str {
+.sng {
   color: #ff0000;
 }
 .com {
@@ -13,7 +13,7 @@
 .opt {
   color: #ffffff;
 }
-.std {
+.def {
   color: #ffffff;
 }
 .kwa {
diff --git a/inst/themes/edit-vim.css b/inst/themes/edit-vim.css
index 596e0b2b9c..6b01be3538 100644
--- a/inst/themes/edit-vim.css
+++ b/inst/themes/edit-vim.css
@@ -4,7 +4,7 @@
 .num {
   color: #ff0000;
 }
-.str {
+.sng {
   color: #ff0000;
 }
 .com {
@@ -13,7 +13,7 @@
 .opt {
   color: #000000;
 }
-.std {
+.def {
   color: #000000;
 }
 .kwa {
diff --git a/inst/themes/edit-xcode.css b/inst/themes/edit-xcode.css
index a7c56ad78e..3451ab1574 100644
--- a/inst/themes/edit-xcode.css
+++ b/inst/themes/edit-xcode.css
@@ -4,7 +4,7 @@
 .num {
   color: #2300ff;
 }
-.str {
+.sng {
   color: #c00000;
 }
 .com {
@@ -13,7 +13,7 @@
 .opt {
   color: #000000;
 }
-.std {
+.def {
   color: #000000;
 }
 .kwa {
diff --git a/inst/themes/ekvoli.css b/inst/themes/ekvoli.css
index 425adab75d..83e4242fa4 100644
--- a/inst/themes/ekvoli.css
+++ b/inst/themes/ekvoli.css
@@ -5,7 +5,7 @@
   color: #87c6f0;
   font-style: italic;
 }
-.str {
+.sng {
   color: #87c6f0;
   font-style: italic;
 }
@@ -16,7 +16,7 @@
 .opt {
   color: #dedede;
 }
-.std {
+.def {
   color: #dedede;
 }
 .kwa {
diff --git a/inst/themes/fine_blue.css b/inst/themes/fine_blue.css
index 96db88f7d9..c6551635d7 100644
--- a/inst/themes/fine_blue.css
+++ b/inst/themes/fine_blue.css
@@ -4,7 +4,7 @@
 .num {
   color: #2020ff;
 }
-.str {
+.sng {
   color: #2020ff;
 }
 .com {
@@ -14,7 +14,7 @@
 .opt {
   color: #404048;
 }
-.std {
+.def {
   color: #404048;
 }
 .kwa {
diff --git a/inst/themes/freya.css b/inst/themes/freya.css
index f1e8366081..2dc9169c70 100644
--- a/inst/themes/freya.css
+++ b/inst/themes/freya.css
@@ -4,7 +4,7 @@
 .num {
   color: #afe091;
 }
-.str {
+.sng {
   color: #afe091;
 }
 .com {
@@ -13,7 +13,7 @@
 .opt {
   color: #dcdccc;
 }
-.std {
+.def {
   color: #dcdccc;
 }
 .kwa {
diff --git a/inst/themes/fruit.css b/inst/themes/fruit.css
index 8bc7c3d0c7..20deabf7eb 100644
--- a/inst/themes/fruit.css
+++ b/inst/themes/fruit.css
@@ -4,7 +4,7 @@
 .num {
   color: #8016ff;
 }
-.str {
+.sng {
   color: #ff6633;
 }
 .com {
@@ -13,7 +13,7 @@
 .opt {
   color: #404040;
 }
-.std {
+.def {
   color: #404040;
 }
 .kwa {
diff --git a/inst/themes/golden.css b/inst/themes/golden.css
index d9254d568a..a2742668de 100644
--- a/inst/themes/golden.css
+++ b/inst/themes/golden.css
@@ -4,7 +4,7 @@
 .num {
   color: #ffffff;
 }
-.str {
+.sng {
   color: #ff0000;
 }
 .com {
@@ -14,7 +14,7 @@
 .opt {
   color: #ababab;
 }
-.std {
+.def {
   color: #ddbb00;
 }
 .kwa {
diff --git a/inst/themes/greenlcd.css b/inst/themes/greenlcd.css
index aa1ac0171a..183dbf30f6 100644
--- a/inst/themes/greenlcd.css
+++ b/inst/themes/greenlcd.css
@@ -4,7 +4,7 @@
 .num {
   color: #3399cc;
 }
-.str {
+.sng {
   color: #dfdfdf;
 }
 .com {
@@ -14,7 +14,7 @@
 .opt {
   color: #2fe7a9;
 }
-.std {
+.def {
   color: #00bb00;
 }
 .kwa {
diff --git a/inst/themes/greyscale0.css b/inst/themes/greyscale0.css
index 58c39f3655..b0110710e8 100644
--- a/inst/themes/greyscale0.css
+++ b/inst/themes/greyscale0.css
@@ -4,7 +4,7 @@
 .num {
   color: #333333;
 }
-.str {
+.sng {
   color: #333333;
 }
 .com {
@@ -14,7 +14,7 @@
 .opt {
   color: #1A1A1A;
 }
-.std {
+.def {
   color: #1A1A1A;
 }
 .kwa {
diff --git a/inst/themes/greyscale1.css b/inst/themes/greyscale1.css
index cd681f9ecb..b5bc4ce304 100644
--- a/inst/themes/greyscale1.css
+++ b/inst/themes/greyscale1.css
@@ -4,7 +4,7 @@
 .num {
   color: #4D4D4D;
 }
-.str {
+.sng {
   color: #4D4D4D;
 }
 .com {
@@ -14,7 +14,7 @@
 .opt {
   color: #1A1A1A;
 }
-.std {
+.def {
   color: #1A1A1A;
 }
 .kwa {
diff --git a/inst/themes/greyscale2.css b/inst/themes/greyscale2.css
index 018304718e..a05b913b20 100644
--- a/inst/themes/greyscale2.css
+++ b/inst/themes/greyscale2.css
@@ -4,7 +4,7 @@
 .num {
   color: #666666;
 }
-.str {
+.sng {
   color: #666666;
 }
 .com {
@@ -14,7 +14,7 @@
 .opt {
   color: #1A1A1A;
 }
-.std {
+.def {
   color: #1A1A1A;
 }
 .kwa {
diff --git a/inst/themes/kellys.css b/inst/themes/kellys.css
index 95531f1396..b6808f6ea5 100644
--- a/inst/themes/kellys.css
+++ b/inst/themes/kellys.css
@@ -4,7 +4,7 @@
 .num {
   color: #d1c79e;
 }
-.str {
+.sng {
   color: #d1c79e;
 }
 .com {
@@ -13,7 +13,7 @@
 .opt {
   color: #e1e0e5;
 }
-.std {
+.def {
   color: #e1e0e5;
 }
 .kwa {
diff --git a/inst/themes/leo.css b/inst/themes/leo.css
index bf095d8a33..ce17a8b9b9 100644
--- a/inst/themes/leo.css
+++ b/inst/themes/leo.css
@@ -4,7 +4,7 @@
 .num {
   color: #ff875f;
 }
-.str {
+.sng {
   color: #ffd7d7;
 }
 .com {
@@ -14,7 +14,7 @@
 .opt {
   color: #ffffff;
 }
-.std {
+.def {
   color: #ffffff;
 }
 .kwa {
diff --git a/inst/themes/lucretia.css b/inst/themes/lucretia.css
index c6e9ca310e..982bf7fd99 100644
--- a/inst/themes/lucretia.css
+++ b/inst/themes/lucretia.css
@@ -4,7 +4,7 @@
 .num {
   color: #63759C;
 }
-.str {
+.sng {
   color: #E7F3B5;
 }
 .com {
@@ -13,7 +13,7 @@
 .opt {
   color: #6A7969;
 }
-.std {
+.def {
   color: #de9d7c;
 }
 .kwa {
diff --git a/inst/themes/manxome.css b/inst/themes/manxome.css
index e73f2fa47f..0096865572 100644
--- a/inst/themes/manxome.css
+++ b/inst/themes/manxome.css
@@ -4,7 +4,7 @@
 .num {
   color: #00ffff;
 }
-.str {
+.sng {
   color: #00ffff;
 }
 .com {
@@ -13,7 +13,7 @@
 .opt {
   color: #ffff00;
 }
-.std {
+.def {
   color: #cccccc;
 }
 .kwa {
diff --git a/inst/themes/maroloccio.css b/inst/themes/maroloccio.css
index 3b0e2ce1c0..8949d621e3 100644
--- a/inst/themes/maroloccio.css
+++ b/inst/themes/maroloccio.css
@@ -4,7 +4,7 @@
 .num {
   color: #8b8b00;
 }
-.str {
+.sng {
   color: #5B5BD0;
 }
 .com {
@@ -13,7 +13,7 @@
 .opt {
   color: #8b9aaa;
 }
-.std {
+.def {
   color: #8b9aaa;
 }
 .kwa {
diff --git a/inst/themes/matrix.css b/inst/themes/matrix.css
index f2bc84c8a9..4e1e4eaa70 100644
--- a/inst/themes/matrix.css
+++ b/inst/themes/matrix.css
@@ -4,7 +4,7 @@
 .num {
   color: #55ff55;
 }
-.str {
+.sng {
   color: #ccff33;
 }
 .com {
@@ -13,7 +13,7 @@
 .opt {
   color: #44cc44;
 }
-.std {
+.def {
   color: #44cc44;
 }
 .kwa {
diff --git a/inst/themes/moe.css b/inst/themes/moe.css
index fb1e15e0e0..4ad0916ad7 100644
--- a/inst/themes/moe.css
+++ b/inst/themes/moe.css
@@ -4,7 +4,7 @@
 .num {
   color: #880022;
 }
-.str {
+.sng {
   color: #aa4400;
 }
 .com {
@@ -14,7 +14,7 @@
   color: #000000;
   font-weight: bold;
 }
-.std {
+.def {
   color: #000000;
 }
 .kwa {
diff --git a/inst/themes/molokai.css b/inst/themes/molokai.css
index 8cac200577..9541c16760 100644
--- a/inst/themes/molokai.css
+++ b/inst/themes/molokai.css
@@ -4,7 +4,7 @@
 .num {
   color: #AE81FF;
 }
-.str {
+.sng {
   color: #E6DB74;
 }
 .com {
@@ -13,7 +13,7 @@
 .opt {
   color: #F8F8F2;
 }
-.std {
+.def {
   color: #F8F8F2;
 }
 .kwa {
diff --git a/inst/themes/moria.css b/inst/themes/moria.css
index d07d435384..80912fb6df 100644
--- a/inst/themes/moria.css
+++ b/inst/themes/moria.css
@@ -4,7 +4,7 @@
 .num {
   color: #87df71;
 }
-.str {
+.sng {
   color: #87df71;
 }
 .com {
@@ -13,7 +13,7 @@
 .opt {
   color: #d0d0d0;
 }
-.std {
+.def {
   color: #d0d0d0;
 }
 .kwa {
diff --git a/inst/themes/navajo-night.css b/inst/themes/navajo-night.css
index 27963add6b..48992281df 100644
--- a/inst/themes/navajo-night.css
+++ b/inst/themes/navajo-night.css
@@ -4,7 +4,7 @@
 .num {
   color: #3fffa7;
 }
-.str {
+.sng {
   color: #3fffa7;
 }
 .com {
@@ -13,7 +13,7 @@
 .opt {
   color: #ffffff;
 }
-.std {
+.def {
   color: #ffffff;
 }
 .kwa {
diff --git a/inst/themes/navy.css b/inst/themes/navy.css
index 99474fbce2..40bc7400d8 100644
--- a/inst/themes/navy.css
+++ b/inst/themes/navy.css
@@ -4,7 +4,7 @@
 .num {
   color: #f87ff4;
 }
-.str {
+.sng {
   color: #ff7f66;
 }
 .com {
@@ -14,7 +14,7 @@
 .opt {
   color: #ffffff;
 }
-.std {
+.def {
   color: #008bff;
 }
 .kwa {
diff --git a/inst/themes/neon.css b/inst/themes/neon.css
index 083578c315..891bd97ac3 100644
--- a/inst/themes/neon.css
+++ b/inst/themes/neon.css
@@ -4,7 +4,7 @@
 .num {
   color: #92d4ff;
 }
-.str {
+.sng {
   color: #92d4ff;
 }
 .com {
@@ -13,7 +13,7 @@
 .opt {
   color: #f0f0f0;
 }
-.std {
+.def {
   color: #f0f0f0;
 }
 .kwa {
diff --git a/inst/themes/night.css b/inst/themes/night.css
index 9c89587800..766d074a2a 100644
--- a/inst/themes/night.css
+++ b/inst/themes/night.css
@@ -4,7 +4,7 @@
 .num {
   color: #b8b8c8;
 }
-.str {
+.sng {
   color: #f0f0f8;
 }
 .com {
@@ -13,7 +13,7 @@
 .opt {
   color: #f0f0f8;
 }
-.std {
+.def {
   color: #f0f0f8;
 }
 .kwa {
diff --git a/inst/themes/nightshimmer.css b/inst/themes/nightshimmer.css
index 0e72ce5d07..082655a418 100644
--- a/inst/themes/nightshimmer.css
+++ b/inst/themes/nightshimmer.css
@@ -4,7 +4,7 @@
 .num {
   color: #00ffff;
 }
-.str {
+.sng {
   color: #00ffff;
 }
 .com {
@@ -13,7 +13,7 @@
 .opt {
   color: #e0eee0;
 }
-.std {
+.def {
   color: #e0eee0;
 }
 .kwa {
diff --git a/inst/themes/nuvola.css b/inst/themes/nuvola.css
index 6240986dd0..6352a00ea5 100644
--- a/inst/themes/nuvola.css
+++ b/inst/themes/nuvola.css
@@ -4,7 +4,7 @@
 .num {
   color: #00C226;
 }
-.str {
+.sng {
   color: #B91F49;
 }
 .com {
@@ -13,7 +13,7 @@
 .opt {
   color: #000000;
 }
-.std {
+.def {
   color: #000000;
 }
 .kwa {
diff --git a/inst/themes/olive.css b/inst/themes/olive.css
index c1d719eec2..4e640b1437 100644
--- a/inst/themes/olive.css
+++ b/inst/themes/olive.css
@@ -4,7 +4,7 @@
 .num {
   color: #ffddad;
 }
-.str {
+.sng {
   color: #afff2f;
 }
 .com {
@@ -13,7 +13,7 @@
 .opt {
   color: #D9D9C3;
 }
-.std {
+.def {
   color: #D9D9C3;
 }
 .kwa {
diff --git a/inst/themes/orion.css b/inst/themes/orion.css
index 7c3c801e0d..ea04661d63 100644
--- a/inst/themes/orion.css
+++ b/inst/themes/orion.css
@@ -4,7 +4,7 @@
 .num {
   color: #9C928C;
 }
-.str {
+.sng {
   color: #635D63;
 }
 .com {
@@ -13,7 +13,7 @@
 .opt {
   color: #7B94AD;
 }
-.std {
+.def {
   color: #C4B1A8;
 }
 .kwa {
diff --git a/inst/themes/oxygenated.css b/inst/themes/oxygenated.css
index 1ae5efe5d4..9d5718523f 100644
--- a/inst/themes/oxygenated.css
+++ b/inst/themes/oxygenated.css
@@ -4,7 +4,7 @@
 .num {
   color: #0099CC;
 }
-.str {
+.sng {
   color: #FFCC00;
   font-weight: bold;
 }
@@ -15,7 +15,7 @@
   color: #ff0099;
   font-weight: bold;
 }
-.std {
+.def {
   color: #FFFF66;
   font-weight: bold;
 }
diff --git a/inst/themes/pablo.css b/inst/themes/pablo.css
index ce42530c7a..fbf1cb5e5e 100644
--- a/inst/themes/pablo.css
+++ b/inst/themes/pablo.css
@@ -4,7 +4,7 @@
 .num {
   color: #00ffff;
 }
-.str {
+.sng {
   color: #00ffff;
 }
 .com {
@@ -13,7 +13,7 @@
 .opt {
   color: #ff0000;
 }
-.std {
+.def {
   color: #ffffff;
 }
 .kwa {
diff --git a/inst/themes/peaksea.css b/inst/themes/peaksea.css
index 1829bec6d8..bcd28bf493 100644
--- a/inst/themes/peaksea.css
+++ b/inst/themes/peaksea.css
@@ -4,7 +4,7 @@
 .num {
   color: #907000;
 }
-.str {
+.sng {
   color: #007068;
 }
 .com {
@@ -13,7 +13,7 @@
 .opt {
   color: #000000;
 }
-.std {
+.def {
   color: #000000;
 }
 .kwa {
diff --git a/inst/themes/print.css b/inst/themes/print.css
index 0d98f73cfd..b90be6699d 100644
--- a/inst/themes/print.css
+++ b/inst/themes/print.css
@@ -4,7 +4,7 @@
 .num {
   color: #000000;
 }
-.str {
+.sng {
   color: #000000;
 }
 .com {
@@ -15,7 +15,7 @@
   color: #000000;
   font-weight: bold;
 }
-.std {
+.def {
   color: #000000;
 }
 .kwa {
diff --git a/inst/themes/rand01.css b/inst/themes/rand01.css
index 8b70bb1158..55fb151b2c 100644
--- a/inst/themes/rand01.css
+++ b/inst/themes/rand01.css
@@ -4,7 +4,7 @@
 .num {
   color: #0da344;
 }
-.str {
+.sng {
   color: #2b83ba;
 }
 .com {
@@ -14,7 +14,7 @@
 .opt {
   color: #0000de;
 }
-.std {
+.def {
   color: #121b28;
 }
 .kwa {
diff --git a/inst/themes/rdark.css b/inst/themes/rdark.css
index c56e60aa8d..d51dc3fbfe 100644
--- a/inst/themes/rdark.css
+++ b/inst/themes/rdark.css
@@ -4,7 +4,7 @@
 .num {
   color: #8ae234;
 }
-.str {
+.sng {
   color: #8ae234;
 }
 .com {
@@ -13,7 +13,7 @@
 .opt {
   color: #babdb6;
 }
-.std {
+.def {
   color: #babdb6;
 }
 .kwa {
diff --git a/inst/themes/relaxedgreen.css b/inst/themes/relaxedgreen.css
index 6bcd8fee26..798745b01f 100644
--- a/inst/themes/relaxedgreen.css
+++ b/inst/themes/relaxedgreen.css
@@ -4,7 +4,7 @@
 .num {
   color: #0099dd;
 }
-.str {
+.sng {
   color: #0099dd;
 }
 .com {
@@ -13,7 +13,7 @@
 .opt {
   color: #aaaaaa;
 }
-.std {
+.def {
   color: #aaaaaa;
 }
 .kwa {
diff --git a/inst/themes/rootwater.css b/inst/themes/rootwater.css
index a2c7687774..66ecf15e90 100644
--- a/inst/themes/rootwater.css
+++ b/inst/themes/rootwater.css
@@ -4,7 +4,7 @@
 .num {
   color: #77dd88;
 }
-.str {
+.sng {
   color: #77dd88;
 }
 .com {
@@ -13,7 +13,7 @@
 .opt {
   color: #babdb6;
 }
-.std {
+.def {
   color: #babdb6;
 }
 .kwa {
diff --git a/inst/themes/seashell.css b/inst/themes/seashell.css
index ab48f30783..913af15e51 100644
--- a/inst/themes/seashell.css
+++ b/inst/themes/seashell.css
@@ -4,7 +4,7 @@
 .num {
   color: #ff1493;
 }
-.str {
+.sng {
   color: #ff1493;
 }
 .com {
@@ -13,7 +13,7 @@
 .opt {
   color: #676767;
 }
-.std {
+.def {
   color: #000000;
 }
 .kwa {
diff --git a/inst/themes/solarized-dark.css b/inst/themes/solarized-dark.css
index bc0dac24f5..c184f88202 100644
--- a/inst/themes/solarized-dark.css
+++ b/inst/themes/solarized-dark.css
@@ -4,7 +4,7 @@
 .num {
   color: #dc322f;
 }
-.str {
+.sng {
   color: #dc322f;
 }
 .com {
@@ -13,7 +13,7 @@
 .opt {
   color: #93a1a1;
 }
-.std {
+.def {
   color: #839496;
 }
 .kwa {
diff --git a/inst/themes/solarized-light.css b/inst/themes/solarized-light.css
index 80ffe2feae..bdba1ad531 100644
--- a/inst/themes/solarized-light.css
+++ b/inst/themes/solarized-light.css
@@ -4,7 +4,7 @@
 .num {
   color: #dc322f;
 }
-.str {
+.sng {
   color: #dc322f;
 }
 .com {
@@ -13,7 +13,7 @@
 .opt {
   color: #586e75;
 }
-.std {
+.def {
   color: #657b83;
 }
 .kwa {
diff --git a/inst/themes/tabula.css b/inst/themes/tabula.css
index ce2f637469..80f127e900 100644
--- a/inst/themes/tabula.css
+++ b/inst/themes/tabula.css
@@ -4,7 +4,7 @@
 .num {
   color: #00A7F7;
 }
-.str {
+.sng {
   color: #00DF00;
 }
 .com {
@@ -13,7 +13,7 @@
 .opt {
   color: #71D289;
 }
-.std {
+.def {
   color: #71D289;
 }
 .kwa {
diff --git a/inst/themes/tcsoft.css b/inst/themes/tcsoft.css
index c42c3a27fb..9fd46911d4 100644
--- a/inst/themes/tcsoft.css
+++ b/inst/themes/tcsoft.css
@@ -4,7 +4,7 @@
 .num {
   color: #666666;
 }
-.str {
+.sng {
   color: #666666;
 }
 .com {
@@ -14,7 +14,7 @@
 .opt {
   color: #000000;
 }
-.std {
+.def {
   color: #000000;
 }
 .kwa {
diff --git a/inst/themes/vampire.css b/inst/themes/vampire.css
index e552cbed2a..11dc00254f 100644
--- a/inst/themes/vampire.css
+++ b/inst/themes/vampire.css
@@ -4,7 +4,7 @@
 .num {
   color: #aaff00;
 }
-.str {
+.sng {
   color: #bb00ff;
 }
 .com {
@@ -14,7 +14,7 @@
 .opt {
   color: #F3E651;
 }
-.std {
+.def {
   color: #ff0000;
 }
 .kwa {
diff --git a/inst/themes/whitengrey.css b/inst/themes/whitengrey.css
index 216594d6de..93b9446ffc 100644
--- a/inst/themes/whitengrey.css
+++ b/inst/themes/whitengrey.css
@@ -4,7 +4,7 @@
 .num {
   color: #bb00ff;
 }
-.str {
+.sng {
   color: #008800;
 }
 .com {
@@ -14,7 +14,7 @@
 .opt {
   color: #696969;
 }
-.std {
+.def {
   color: #696969;
 }
 .kwa {
diff --git a/inst/themes/xoria256.css b/inst/themes/xoria256.css
index 2bd527f87b..6a1c91891c 100644
--- a/inst/themes/xoria256.css
+++ b/inst/themes/xoria256.css
@@ -4,7 +4,7 @@
 .num {
   color: #dfaf87;
 }
-.str {
+.sng {
   color: #ffffaf;
 }
 .com {
@@ -13,7 +13,7 @@
 .opt {
   color: #d0d0d0;
 }
-.std {
+.def {
   color: #d0d0d0;
 }
 .kwa {
diff --git a/inst/themes/zellner.css b/inst/themes/zellner.css
index 4d37dee0f8..dacb02a3fd 100644
--- a/inst/themes/zellner.css
+++ b/inst/themes/zellner.css
@@ -4,7 +4,7 @@
 .num {
   color: #ff0066;
 }
-.str {
+.sng {
   color: #ff00ff;
 }
 .com {
@@ -13,7 +13,7 @@
 .opt {
   color: #000000;
 }
-.std {
+.def {
   color: #000000;
 }
 .kwa {
diff --git a/inst/themes/zenburn.css b/inst/themes/zenburn.css
index ec4220787a..42cc6552d4 100644
--- a/inst/themes/zenburn.css
+++ b/inst/themes/zenburn.css
@@ -5,7 +5,7 @@
   color: #dca3a3;
   font-weight: bold;
 }
-.str {
+.sng {
   color: #cc9393;
 }
 .com {
@@ -15,7 +15,7 @@
 .opt {
   color: #dcdccc;
 }
-.std {
+.def {
   color: #dcdccc;
 }
 .kwa {
diff --git a/inst/themes/zmrok.css b/inst/themes/zmrok.css
index deff5219f6..de445ab516 100644
--- a/inst/themes/zmrok.css
+++ b/inst/themes/zmrok.css
@@ -4,7 +4,7 @@
 .num {
   color: #FACE43;
 }
-.str {
+.sng {
   color: #D9FF77;
 }
 .com {
@@ -13,7 +13,7 @@
 .opt {
   color: #F8F8F8;
 }
-.std {
+.def {
   color: #F8F8F8;
 }
 .kwa {

From 22cfafc44ece4709a26d20d94b78014f5ca1a11b Mon Sep 17 00:00:00 2001
From: Yihui Xie <xie@yihui.name>
Date: Thu, 23 May 2024 15:22:00 -0500
Subject: [PATCH 3/5] use the dev version of highr

---
 DESCRIPTION | 1 +
 1 file changed, 1 insertion(+)

diff --git a/DESCRIPTION b/DESCRIPTION
index 44a69e4e65..db64333c5c 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -198,3 +198,4 @@ Collate:
     'utils-vignettes.R'
     'zzz.R'
 RoxygenNote: 7.3.1
+Remotes: yihui/highr

From 2feacf9ee339d4867b7399e07c6715ac13e7c0dc Mon Sep 17 00:00:00 2001
From: Yihui Xie <xie@yihui.name>
Date: Thu, 23 May 2024 15:46:00 -0500
Subject: [PATCH 4/5] more std->def, str->sng

---
 R/themes.R | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/R/themes.R b/R/themes.R
index ee7875058c..593b7b76bf 100644
--- a/R/themes.R
+++ b/R/themes.R
@@ -66,7 +66,7 @@ theme_to_header_latex = function(theme) {
 
   # get background and foreground colors
   background = css_out$background$color
-  foreground = css_out$std$color
+  foreground = css_out$def$color
 
   # write latex highlight header
   fgheader = color_def(foreground, 'fgcolor')
@@ -114,8 +114,8 @@ theme2list = function(theme.file) {
 
 # mapping between CSS class and Highlight theme elements
 cls2thm = c(
-  background = 'Canvas', num = 'Number', str = 'String', com = 'BlockComment',
-  opt = 'Operator', std = 'Default',
+  background = 'Canvas', num = 'Number', sng = 'String', com = 'BlockComment',
+  opt = 'Operator', def = 'Default',
   kwa = 'Keyword1', kwb = 'Keyword2', kwc = 'Keyword3', kwd = 'Keyword4'
 )
 

From 573fc0189e4e9cbe830b3748c74b83c404044a2e Mon Sep 17 00:00:00 2001
From: Yihui Xie <xie@yihui.name>
Date: Thu, 23 May 2024 15:58:56 -0500
Subject: [PATCH 5/5] add news

---
 NEWS.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/NEWS.md b/NEWS.md
index 8091b160b2..cf7ad7b198 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -6,6 +6,10 @@
 
 - `write_bib()` now escapes all non-escaped "&" in the bibliography by default. Previously, it only escaped the title field of the package citation. You can disable the escape with the argument `tweak = FALSE` (thanks, @HedvigS #2335, @atusy #2342).
 
+## MINOR CHANGES
+
+- The syntax highlighting LaTeX commands for Rnw documents, `\hlstr` and `\hlstd`, were renamed to `\hlsng` and `\hldef`, respectively, to maintain consistency with Andrew Simon's highlight package (thanks, @dcser123, #2341).
+
 # CHANGES IN knitr VERSION 1.46
 
 ## NEW FEATURES