diff --git a/src/sampleconf/mimeconf b/src/sampleconf/mimeconf
index ebcd41cb..c6824950 100644
--- a/src/sampleconf/mimeconf
+++ b/src/sampleconf/mimeconf
@@ -107,6 +107,7 @@ text/rtf = exec unrtf --nopict --html;mimetype=text/html
 text/x-c = internal
 text/x-c++ = internal
 text/x-c+ = internal
+text/x-csv = internal text/plain
 text/x-fictionbook = exec rclfb2
 text/x-gaim-log = exec rclgaim
 text/x-html-sidux-man = exec rclsiduxman
@@ -138,73 +139,78 @@ application/pdf = pdf
 application/postscript = postscript
 application/vnd.ms-excel = spreadsheet
 application/vnd.ms-powerpoint = presentation
-application/vnd.openxmlformats-officedocument.wordprocessingml.document = \
-  wordprocessing
-application/vnd.openxmlformats-officedocument.wordprocessingml.template = \
-  wordprocessing
-application/vnd.openxmlformats-officedocument.presentationml.template = \
- presentation
-application/vnd.openxmlformats-officedocument.presentationml.presentation = \
- presentation
-application/vnd.openxmlformats-officedocument.spreadsheetml.sheet = \
- spreadsheet
-application/vnd.openxmlformats-officedocument.spreadsheetml.template =\
- spreadsheet
+application/vnd.openxmlformats-officedocument.presentationml.presentation = presentation
+application/vnd.openxmlformats-officedocument.presentationml.template = presentation
+application/vnd.openxmlformats-officedocument.spreadsheetml.sheet = spreadsheet
+application/vnd.openxmlformats-officedocument.spreadsheetml.template = spreadsheet
+application/vnd.openxmlformats-officedocument.wordprocessingml.document = wordprocessing
+application/vnd.openxmlformats-officedocument.wordprocessingml.template = wordprocessing
 application/vnd.sun.xml.calc = spreadsheet
 application/vnd.sun.xml.calc.template = spreadsheet
 application/vnd.sun.xml.draw = drawing
 application/vnd.sun.xml.draw.template = drawing
 application/vnd.sun.xml.impress = presentation
 application/vnd.sun.xml.impress.template = presentation
+application/vnd.sun.xml.math  = wordprocessing
 application/vnd.sun.xml.writer = wordprocessing
 application/vnd.sun.xml.writer.global = wordprocessing
 application/vnd.sun.xml.writer.template = wordprocessing
 application/vnd.wordperfect = wordprocessing
 application/x-abiword = wordprocessing
+application/x-awk = source
+application/x-chm = document
 application/x-dia-diagram = drawing
 application/x-dvi = document
 application/x-flac = sownd
 application/x-fsdirectory = folder
+application/x-gnuinfo = document
 application/x-gnumeric = spreadsheet
 application/x-kword = wordprocessing
 application/x-lyx = wordprocessing
+application/x-mimehtml = message
 application/x-okular-notes = document
-application/x-scribus = document
-application/x-gnuinfo = document
-application/x-tex = wordprocessing
-text/x-tex = wordprocessing
-application/xml = document
-text/xml = document
-application/x-awk = source
 application/x-perl = source
+application/x-rar = archive
+application/x-scribus = document
+application/x-scribus = wordprocessing
 application/x-shellscript = source
+application/x-tar = archive
+application/x-tex = wordprocessing
+application/x-webarchive = archive
+application/xml = document
+application/zip = archive
 audio/mpeg = sownd
 audio/x-karaoke = sownd
 image/bmp = image
 image/gif = image
 image/jpeg = image
 image/png = image
+image/svg+xml = drawing
 image/tiff = image
 image/vnd.djvu = document
-image/svg+xml = drawing
 image/x-xcf = image
 image/x-xpmi = image
 message/rfc822 = message
 text/html = html
 text/plain = txt
+text/rtf = wordprocessing
 text/x-c = source
-text/x-c++ = source
 text/x-c+ = source
+text/x-c++ = source
+text/x-csv = txt
 text/x-fictionbook = document
 text/x-html-aptosid-man = aptosid-book
 text/x-html-sidux-man = sidux-book
 text/x-ini = txt
 text/x-mail = message
 text/x-man = document
-application/x-chm = document
-text/x-purple-log = pidgin
+text/x-perl = source
 text/x-purple-html-log = pidgin
+text/x-purple-log = pidgin
 text/x-python = text-x-python
+text/x-shellscript = source
+text/x-tex = wordprocessing
+text/xml = document
 
 [categories]
 # Categories group mime types by "kind". They can be used from the query
@@ -237,6 +243,7 @@ text = \
       application/x-tex \
       application/xml \
       text/xml \
+      text/x-csv \
       text/x-tex \
       image/vnd.djvu \
       text/calendar \
diff --git a/src/sampleconf/mimemap b/src/sampleconf/mimemap
index 05e7f38f..bae5ad63 100644
--- a/src/sampleconf/mimemap
+++ b/src/sampleconf/mimemap
@@ -4,7 +4,7 @@
 .txt = text/plain
 .text = text/plain
 .ini = text/x-ini
-.csv = text/plain
+.csv = text/x-csv
 
 # Source files. 
 # Defining them with specific types allows using a specific ext viewer (in 
@@ -16,6 +16,7 @@
 .c   = text/x-c
 .cc  = text/x-c
 .cxx = text/x-c
+.f   = text/x-fortran
 .py  = text/x-python
 .awk = application/x-awk
 .pl = application/x-perl
diff --git a/src/sampleconf/mimeview b/src/sampleconf/mimeview
index 6934f17e..d5bae09d 100644
--- a/src/sampleconf/mimeview
+++ b/src/sampleconf/mimeview
@@ -50,6 +50,7 @@ application/vnd.sun.xml.writer = libreoffice %f
 application/vnd.sun.xml.writer.global = libreoffice %f
 application/vnd.sun.xml.writer.template = libreoffice %f
 application/vnd.wordperfect = libreoffice %f
+text/rtf = libreoffice %f
 
 application/x-chm = kchmviewer %f
 application/x-dia-diagram = dia %f
@@ -60,6 +61,7 @@ application/x-gnumeric = gnumeric %f
 application/x-flac = rhythmbox %f
 audio/mpeg = rhythmbox %f
 application/ogg = rhythmbox %f
+audio/x-karaoke = kmid %f
 
 image/jpeg = gwenview %f
 image/png = gwenview %f
@@ -74,19 +76,45 @@ image/x-xpmi = gwenview %f
 
 message/rfc822 = thunderbird -file %f
 text/x-mail = thunderbird -file %f
+application/x-mimehtml = thunderbird -file %f
+
+text/calendar = evolution %f
+
+application/x-okular-notes = okular %f
+
+application/x-rar = ark %f
+application/x-tar = ark %f
+application/zip = ark %f
+
+application/x-awk = emacsclient  %f
+application/x-perl = emacsclient  %f
+text/x-perl = emacsclient  %f
+application/x-shellscript = emacsclient  %f
+text/x-shellscript = emacsclient  %f
 
-application/x-tex = emacsclient  %f
-text/x-tex = emacsclient  %f
 # Or firefox -remote "openFile(%u)"
 text/html = firefox %u
 text/html|gnuinfo = rclshowinfo %F %(title)
+application/x-webarchive = konqueror %f
+
+text/x-fictionbook = calibre %f
+
+application/x-tex = emacsclient  %f
+application/xml = emacsclient  %f
+text/xml = emacsclient  %f
+text/x-tex = emacsclient  %f
 text/plain = emacsclient  %f
+text/x-awk = emacsclient  %f
 text/x-c = emacsclient  %f
 text/x-c+ = emacsclient  %f
 text/x-c++ = emacsclient  %f
+text/x-csv = libreoffice %f
 text/x-html-sidux-man = konqueror %f
 text/x-html-aptosid-man = iceweasel %f
 text/x-chm-html = openchm %f %i
 text/x-ini = emacsclient  %f
 text/x-man = xterm -u8 -e "groff -T ascii -man %f | more"
 text/x-python = idle %f
+text/x-gaim-log = emacsclient  %f
+text/x-purple-html-log = emacsclient  %f
+text/x-purple-log = emacsclient  %f