diff --git a/readme.org b/readme.org
index 181f61f..1b87026 100644
--- a/readme.org
+++ b/readme.org
@@ -18,7 +18,7 @@ emacs even only early-init does exist.
 
 *** Common face definitions
 
-#+begin_src emacs-lisp :tangle ~/.emacs.d/lisp/themes/r2849-faces.el :mkdirp true
+#+begin_src emacs-lisp :tangle lisp/themes/r2849-faces.el :mkdirp true
   ;;; -*- lexical-binding: t -*-
   ;;; Do not edit by hand! It is generated from readme.org.
   
@@ -47,7 +47,7 @@ emacs even only early-init does exist.
 
 *** Assembly mode face definitions
 
-#+begin_src emacs-lisp :tangle ~/.emacs.d/lisp/themes/r2849-faces.el
+#+begin_src emacs-lisp :tangle lisp/themes/r2849-faces.el
   ;; -------------------------------------------------------------------------------------------------
   ;; assembly mode face definitions
   ;; -------------------------------------------------------------------------------------------------
@@ -114,13 +114,13 @@ emacs even only early-init does exist.
 #+end_src
 
 *** Provide face
-#+begin_src emacs-lisp :tangle ~/.emacs.d/lisp/themes/r2849-faces.el
+#+begin_src emacs-lisp :tangle lisp/themes/r2849-faces.el
   (provide 'r2849-faces)
 #+end_src
 
 ** Default theme
 
-#+begin_src emacs-lisp :tangle "~/.emacs.d/lisp/themes/r2849-theme.el" :mkdirp yes
+#+begin_src emacs-lisp :tangle lisp/themes/r2849-theme.el :mkdirp yes
     ;;; -*- lexical-binding: t -*-
     ;;; Do not edit by hand! It is generated from readme.org.
 
@@ -263,13 +263,13 @@ and =package-user-dir=.
   (add-to-list 'default-frame-alist '(width  . 160))
 
   ;;; Include paths
-  (add-to-list 'load-path (expand-file-name "~/.emacs.d/lisp"               ))
-  (add-to-list 'load-path (expand-file-name "~/.emacs.d/lisp/themes"        ))
-  (add-to-list 'load-path (expand-file-name "~/.emacs.d/lisp/progmodes" ))
+  (add-to-list 'load-path (substitute-in-file-name "$XDG_CONFIG_HOME/emacs/lisp"           ))
+  (add-to-list 'load-path (substitute-in-file-name "$XDG_CONFIG_HOME/emacs/lisp/themes"    ))
+  (add-to-list 'load-path (substitute-in-file-name "$XDG_CONFIG_HOME/emacs/lisp/progmodes" ))
 
   ;;; Theme paths
   (add-to-list 'custom-theme-load-path 
-               (expand-file-name "~/.emacs.d/lisp/themes"))
+               (substitute-in-file-name "$XDG_CONFIG_HOME/emacs/lisp/themes"))
 
   ;;; tab-bar-mode is incompatible with perspective (as of 2023-05) so do not enable it.
   ;;; (setq tab-bar-format '(tab-bar-format-global))