diff --git a/conf.d/ranger/rifle.conf b/conf.d/ranger/rifle.conf
index 37a0b94..21d0788 100644
--- a/conf.d/ranger/rifle.conf
+++ b/conf.d/ranger/rifle.conf
@@ -48,39 +48,6 @@
 # Note: When using rifle in ranger, there is an additional flag "c" for
 # only running the current file even if you have marked multiple files.
 
-#-------------------------------------------
-# Websites
-#-------------------------------------------
-# Rarely installed browsers get higher priority; It is assumed that if you
-# install a rare browser, you probably use it.  Firefox/konqueror/w3m on the
-# other hand are often only installed as fallback browsers.
-ext x?html?, has surf,             X, flag f = surf -- file://"$1"
-ext x?html?, has vimprobable,      X, flag f = vimprobable -- "$@"
-ext x?html?, has vimprobable2,     X, flag f = vimprobable2 -- "$@"
-ext x?html?, has qutebrowser,      X, flag f = qutebrowser -- "$@"
-ext x?html?, has dwb,              X, flag f = dwb -- "$@"
-ext x?html?, has jumanji,          X, flag f = jumanji -- "$@"
-ext x?html?, has luakit,           X, flag f = luakit -- "$@"
-ext x?html?, has uzbl,             X, flag f = uzbl -- "$@"
-ext x?html?, has uzbl-tabbed,      X, flag f = uzbl-tabbed -- "$@"
-ext x?html?, has uzbl-browser,     X, flag f = uzbl-browser -- "$@"
-ext x?html?, has uzbl-core,        X, flag f = uzbl-core -- "$@"
-ext x?html?, has midori,           X, flag f = midori -- "$@"
-ext x?html?, has chromium-browser, X, flag f = chromium-browser -- "$@"
-ext x?html?, has chromium,         X, flag f = chromium -- "$@"
-ext x?html?, has google-chrome,    X, flag f = google-chrome -- "$@"
-ext x?html?, has opera,            X, flag f = opera -- "$@"
-ext x?html?, has firefox,          X, flag f = firefox -- "$@"
-ext x?html?, has seamonkey,        X, flag f = seamonkey -- "$@"
-ext x?html?, has iceweasel,        X, flag f = iceweasel -- "$@"
-ext x?html?, has epiphany,         X, flag f = epiphany -- "$@"
-ext x?html?, has konqueror,        X, flag f = konqueror -- "$@"
-ext x?html?, has elinks,            terminal = elinks "$@"
-ext x?html?, has links2,            terminal = links2 "$@"
-ext x?html?, has links,             terminal = links "$@"
-ext x?html?, has lynx,              terminal = lynx -- "$@"
-ext x?html?, has w3m,               terminal = w3m "$@"
-
 #-------------------------------------------
 # Misc
 #-------------------------------------------
@@ -173,8 +140,41 @@ mime ^text, ext tex|asy, has texmaker,  X, flag f = texmaker -- "$@"
 # Define the "editor" for text files as last action
 mime ^text,  label editor = ${VISUAL:-$EDITOR} -- "$@"
 mime ^text,  label pager  = "$PAGER" -- "$@"
-!mime ^text, label editor, ext xml|json|csv|tex|py|pl|rb|js|sh|php = ${VISUAL:-$EDITOR} -- "$@"
-!mime ^text, label pager,  ext xml|json|csv|tex|py|pl|rb|js|sh|php = "$PAGER" -- "$@"
+!mime ^text, label editor, ext xml|json|csv|tex|py|pl|rb|js|sh|php|htm|html|xhtml = ${VISUAL:-$EDITOR} -- "$@"
+!mime ^text, label pager,  ext xml|json|csv|tex|py|pl|rb|js|sh|php|htm|html|xhtml = "$PAGER" -- "$@"
+
+#-------------------------------------------
+# Websites
+#-------------------------------------------
+# Rarely installed browsers get higher priority; It is assumed that if you
+# install a rare browser, you probably use it.  Firefox/konqueror/w3m on the
+# other hand are often only installed as fallback browsers.
+ext x?html?, has surf,             X, flag f = surf -- file://"$1"
+ext x?html?, has vimprobable,      X, flag f = vimprobable -- "$@"
+ext x?html?, has vimprobable2,     X, flag f = vimprobable2 -- "$@"
+ext x?html?, has qutebrowser,      X, flag f = qutebrowser -- "$@"
+ext x?html?, has dwb,              X, flag f = dwb -- "$@"
+ext x?html?, has jumanji,          X, flag f = jumanji -- "$@"
+ext x?html?, has luakit,           X, flag f = luakit -- "$@"
+ext x?html?, has uzbl,             X, flag f = uzbl -- "$@"
+ext x?html?, has uzbl-tabbed,      X, flag f = uzbl-tabbed -- "$@"
+ext x?html?, has uzbl-browser,     X, flag f = uzbl-browser -- "$@"
+ext x?html?, has uzbl-core,        X, flag f = uzbl-core -- "$@"
+ext x?html?, has midori,           X, flag f = midori -- "$@"
+ext x?html?, has chromium-browser, X, flag f = chromium-browser -- "$@"
+ext x?html?, has chromium,         X, flag f = chromium -- "$@"
+ext x?html?, has google-chrome,    X, flag f = google-chrome -- "$@"
+ext x?html?, has opera,            X, flag f = opera -- "$@"
+ext x?html?, has firefox,          X, flag f = firefox -- "$@"
+ext x?html?, has seamonkey,        X, flag f = seamonkey -- "$@"
+ext x?html?, has iceweasel,        X, flag f = iceweasel -- "$@"
+ext x?html?, has epiphany,         X, flag f = epiphany -- "$@"
+ext x?html?, has konqueror,        X, flag f = konqueror -- "$@"
+ext x?html?, has elinks,            terminal = elinks "$@"
+ext x?html?, has links2,            terminal = links2 "$@"
+ext x?html?, has links,             terminal = links "$@"
+ext x?html?, has lynx,              terminal = lynx -- "$@"
+ext x?html?, has w3m,               terminal = w3m "$@"
 
 #-------------------------------------------
 # Image Viewing: