diff --git a/funcs.el b/funcs.el
index 9d2c5e5..6825c8c 100644
--- a/funcs.el
+++ b/funcs.el
@@ -201,78 +201,75 @@ corresponding runes during org-mode export"
     (conlanging//replace-string-by-char t-text conlanging//matter-latin-to-runes)))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-                                        ;              Eittlanda              ;
+                                        ;              Eittlandic              ;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(defvar conlanging//eittlanda-latin-to-latex '((", *" . "\\\\tripledot")
-                                               ("\\. *" . "\\\\tripledot")
-                                               (" +" . ":")
-                                               ("hv" . "x")
-                                               ("ø" . "\\\\o")
-                                               ("œ" . "\\\\oO")
-                                               ("v" . "w")
-                                               ("ó" . "v")
-                                               ("ń" . "\\\\ndot"))
+(defvar conlanging//eittlandic-latin-to-latex '((", *\\|\\. *" . "\\\\tripledot")
+                                                (" +"          . ":")
+                                                ("hv"          . "x")
+                                                ("í"           . "i")
+                                                ("é"           . "\\\\e")
+                                                ("ę\\|æ"       . "æ")
+                                                ("ý"           . "y")
+                                                ("œ"           . "ø")
+                                                ("ú"           . "u")
+                                                ("ó"           . "o")
+                                                ("á\\|ǫ"       . "a")
+                                                ("j"           . "i"))
   "Equivalence between the Eittlandic orthography in the Latin
 script and the LaTeX code for the Runic script. The first element
 of a pair is the Latin script orthography, the second is the
 Runic LaTeX code equivalent.")
 
-(defvar conlanging//eittlanda-latin-to-runes '((", *" . "⁝")
-                                               ("\\. *" . "⁝")
-                                               (" +" . "᛬")
-                                               (":" . "᛬")
-                                               ("hv" . "ᛪ")
-                                               ("i" . "ᛁ")
-                                               ("y" . "ᛦ")
-                                               ("u" . "ᚢ")
-                                               ("e" . "ᛂ")
-                                               ("ø" . "ᚯ")
-                                               ("o" . "ᚮ")
-                                               ("œ" . "ᚰ")
-                                               ("ó" . "ᚤ")
-                                               ("æ" . "ᛅ")
-                                               ("a" . "ᛆ")
-                                               ("m" . "ᛘ")
-                                               ("n" . "ᚾ")
-                                               ("ń" . "ᛀ")
-                                               ("p" . "ᛔ")
-                                               ("b" . "ᛒ")
-                                               ("t" . "ᛐ")
-                                               ("d" . "ᛑ")
-                                               ("k" . "ᚴ")
-                                               ("g" . "ᚵ")
-                                               ("f" . "ᚠ")
-                                               ("þ" . "ᚦ")
-                                               ("ð" . "ᚧ")
-                                               ("s" . "ᛋ")
-                                               ("h" . "ᚼ")
-                                               ("v" . "ᚥ")
-                                               ("r" . "ᚱ")
-                                               ("l" . "ᛚ"))
+(defvar conlanging//eittlandic-latin-to-runes '((", *\\|\\. *"   . "⁝")
+                                                (" +\\|:"        . "᛬")
+                                                ("hv"            . "ᛪ")
+                                                ("i\\|í\\|j"     . "ᛁ")
+                                                ("é"             . "ᛂ")
+                                                ("e\\|ę\\|æ"     . "ᛅ")
+                                                ("y\\|ý"         . "ᛦ")
+                                                ("ø\\|œ"         . "ᚯ")
+                                                ("u\\|ú\\|v\\|w" . "ᚢ")
+                                                ("o\\|ó"         . "ᚮ")
+                                                ("a\\|á\\|ǫ"     . "ᛆ")
+                                                ("p"             . "ᛔ")
+                                                ("b"             . "ᛒ")
+                                                ("f"             . "ᚠ")
+                                                ("t"             . "ᛐ")
+                                                ("d"             . "ᛑ")
+                                                ("þ"             . "ᚦ")
+                                                ("ð"             . "ᚧ")
+                                                ("s"             . "ᛋ")
+                                                ("k"             . "ᚴ")
+                                                ("g"             . "ᚵ")
+                                                ("h"             . "ᚼ")
+                                                ("m"             . "ᛘ")
+                                                ("n"             . "ᚿ")
+                                                ("r"             . "ᚱ")
+                                                ("l"             . "ᛚ"))
   "Equivalence between the Eittlandic orthography in the Latin
  script and the Runic script. The first element of a pair is the
  Latin script orthography, the second is the Runic equivalent.")
 
-(defun conlanging/eittlanda-to-runes ()
+(defun conlanging/eittlandic-to-runes ()
   "Replaces transliterated Eittlandic with its runic writing system"
   (interactive)
-  (conlanging//replace-char-by-table conlanging//eittlanda-latin-to-runes))
+  (conlanging//replace-char-by-table conlanging//eittlandic-latin-to-runes))
 
-(defun conlanging/eittlanda-to-latex ()
+(defun conlanging/eittlandic-to-latex ()
   "Replaces transliterated Eittlandic with its corresponding runes"
   (interactive)
-  (conlanging//replace-char-by-table conlanging//eittlanda-latin-to-latex))
+  (conlanging//replace-char-by-table conlanging//eittlandic-latin-to-latex))
 
-(defun conlanging/eittlanda-org-export-runes (t-text)
+(defun conlanging/eittlandic-org-export-runes (t-text)
   "Replaces  transliterated  Eittlandic  with  its  corresponding
 runes during org-mode export"
   (interactive)
   (if (org-export-derived-backend-p org-export-current-backend
                                     'latex)
       (concat "\\textarm{"
-              (conlanging//replace-string-by-char t-text conlanging//eittlanda-latin-to-latex)
+              (conlanging//replace-string-by-char t-text conlanging//eittlandic-latin-to-latex)
               "}")
-    (conlanging//replace-string-by-char t-text conlanging//eittlanda-latin-to-runes)))
+    (conlanging//replace-string-by-char t-text conlanging//eittlandic-latin-to-runes)))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
                                         ;                    Ñyqy             ;