diff --git a/uno/modules/dev/rest.org b/uno/modules/dev/rest.org
index 8f63985..8856548 100644
--- a/uno/modules/dev/rest.org
+++ b/uno/modules/dev/rest.org
@@ -32,7 +32,7 @@ Define REST dev package.
       "Send HTTP request raw for restclient without losing focus."
       (interactive)
       (restclient-http-send-current t t))
-    (push '("\\.http\\'" . restclient-mode) auto-mode-alist))
+    (push '("\\.http$" . restclient-mode) auto-mode-alist))
 
   (use-package company-restclient
     :after (uno-dev-rest restclient)
diff --git a/uno/modules/lang/image.org b/uno/modules/lang/image.org
new file mode 100644
index 0000000..73c52a0
--- /dev/null
+++ b/uno/modules/lang/image.org
@@ -0,0 +1,38 @@
+#+TITLE: Language - Image
+#+AUTHOR: Juan Placencia
+
+* Package
+
+Define image language package.
+
+#+BEGIN_SRC emacs-lisp
+  (use-package emacs
+    :after uno-lang
+    :config
+    (provide 'uno-lang-image))
+#+END_SRC
+
+* Default Behavior
+
+- Open image as image first.
+- Add keybinds
+
+#+BEGIN_SRC emacs-lisp
+  (use-package emacs
+    :after uno-lang-image
+    :hook
+    (image-mode . uno/lang/image/check-type)
+    :general
+    (uno-mode-leader-define
+      :definer 'minor-mode
+      :keymaps 'image-minor-mode
+      uno-mode-leader-key '(image-toggle-display :which-key "Toggle preview"))
+    :init
+    (defun uno/lang/image/check-type ()
+      "Add support for text-based images."
+      (when (member (image-type-from-buffer) '(svg))
+        (uno-mode-leader-define
+          :keymaps 'local
+          uno-mode-leader-key '(image-toggle-display :which-key "Toggle preview"))))
+    (push '("\\.svg$" . image-mode-as-text) auto-mode-alist))
+#+END_SRC
diff --git a/uno/modules/lang/js/ts.org b/uno/modules/lang/js/ts.org
index 344ff58..0e1ea76 100644
--- a/uno/modules/lang/js/ts.org
+++ b/uno/modules/lang/js/ts.org
@@ -22,7 +22,7 @@ Define TypeScript JavaScript language package.
     :after (uno-lang-js-ts web-mode)
     :init
     (define-derived-mode typescript-tsx-mode web-mode "typescript-tsx")
-    (push '("\\.tsx\\'" . typescript-tsx-mode) auto-mode-alist))
+    (push '("\\.tsx$" . typescript-tsx-mode) auto-mode-alist))
 
   (use-package emacs
     :after (uno-lang-js-ts ligature typescript-mode)