diff --git a/core/autoload/editor.el b/core/autoload/editor.el
index dd5fd583f..e81ee77bf 100644
--- a/core/autoload/editor.el
+++ b/core/autoload/editor.el
@@ -195,6 +195,6 @@ for function signatures or notes. Run again to clear the header line."
           (concat (propertize (format nlinum-format (line-number-at-pos beg))
                               'face 'font-lock-comment-face)
                   (let ((content (buffer-substring beg end)))
-                    (setq content (s-replace "\n" " " content))
+                    (setq content (replace-regexp-in-string "\n" " " content t t))
                     (setq content (replace-regexp-in-string "\\s-+" " " content))
                     content)))))
diff --git a/modules/feature/version-control/autoload.el b/modules/feature/version-control/autoload.el
index 911f219ed..1d29ecf9f 100644
--- a/modules/feature/version-control/autoload.el
+++ b/modules/feature/version-control/autoload.el
@@ -17,7 +17,7 @@ Fallback to repository root."
       (error
        (setq url (shell-command-to-string "hub browse -u --"))
        (setq url (if url
-                     (concat (s-trim url) "/"
+                     (concat (string-trim url) "/"
                              (file-relative-name (buffer-file-name)
                                                  (doom-project-root))
                              (when (use-region-p)
diff --git a/modules/lang/web/autoload/html.el b/modules/lang/web/autoload/html.el
index 35c8b7411..e14bfe241 100644
--- a/modules/lang/web/autoload/html.el
+++ b/modules/lang/web/autoload/html.el
@@ -18,8 +18,9 @@ character.")
   (interactive "<!><r>")
   (mapc (lambda (rep)
           (let ((from (elt rep (if decode-p 0 1)))
-                (to   (elt rep (if decode-p 1 0))))
-            (when (s-contains-p from text)
+                (to   (elt rep (if decode-p 1 0)))
+                (case-fold-search t))
+            (when (string-match-p (regexp-quote from) text)
               (setq text (s-replace from to text)))))
         +web-entities-list)
     text)
diff --git a/modules/tools/electric-indent/config.el b/modules/tools/electric-indent/config.el
index bf2c9a1be..7c0165480 100644
--- a/modules/tools/electric-indent/config.el
+++ b/modules/tools/electric-indent/config.el
@@ -26,7 +26,7 @@ trigger electric indentation."
         (chars (plist-get plist :chars))
         (words (plist-get plist :words)))
     (when (or chars words)
-      (let ((fn-name (intern (format "doom--electric-%s" (s-join "-" (mapcar #'symbol-name modes))))))
+      (let ((fn-name (intern (format "doom--electric-%s" (string-join (mapcar #'symbol-name modes) "-")))))
         `(progn
            (defun ,fn-name ()
              (electric-indent-local-mode +1)
diff --git a/modules/tools/rotate-text/config.el b/modules/tools/rotate-text/config.el
index c1230e668..9f7096aab 100644
--- a/modules/tools/rotate-text/config.el
+++ b/modules/tools/rotate-text/config.el
@@ -14,7 +14,7 @@
         (words    (plist-get plist :words))
         (patterns (plist-get plist :patterns)))
     (when (or symbols words patterns)
-      (let ((fn-name (intern (format "doom--rotate-%s" (s-join "-" (mapcar #'symbol-name modes))))))
+      (let ((fn-name (intern (format "doom--rotate-%s" (string-join (mapcar #'symbol-name modes) "-")))))
         `(progn
            (defun ,fn-name ()
              (require 'rotate-text)