diff --git a/libs/Console/DauxCommand.php b/libs/Console/DauxCommand.php
index 6fc39ec..ec19c8e 100644
--- a/libs/Console/DauxCommand.php
+++ b/libs/Console/DauxCommand.php
@@ -14,6 +14,9 @@ class DauxCommand extends SymfonyCommand
             ->addOption('value', null, InputOption::VALUE_IS_ARRAY | InputOption::VALUE_REQUIRED, 'Set different configuration values')
             ->addOption('source', 's', InputOption::VALUE_REQUIRED, 'Where to take the documentation from')
             ->addOption('processor', 'p', InputOption::VALUE_REQUIRED, 'Manipulations on the tree');
+
+        // HTML Format only
+        $this->addOption('themes', 't', InputOption::VALUE_REQUIRED, 'Set a different themes directory');
     }
 
     private function setValue(&$array, $key, $value)
diff --git a/libs/Console/Generate.php b/libs/Console/Generate.php
index 947a3ab..1ad2335 100755
--- a/libs/Console/Generate.php
+++ b/libs/Console/Generate.php
@@ -24,8 +24,6 @@ class Generate extends DauxCommand
             // Confluence format only
             ->addOption('delete', null, InputOption::VALUE_NONE, 'Delete pages not linked to a documentation page (confluence)')
 
-            // HTML Format only
-            ->addOption('themes', 't', InputOption::VALUE_REQUIRED, 'Set a different themes directory')
             ->addOption('destination', 'd', InputOption::VALUE_REQUIRED, $description, 'static')
             ->addOption('search', null, InputOption::VALUE_NONE, 'Generate full text search');
     }
diff --git a/libs/Server/ExtensionMimeTypeGuesser.php b/libs/Server/ExtensionMimeTypeGuesser.php
new file mode 100644
index 0000000..cfd83e4
--- /dev/null
+++ b/libs/Server/ExtensionMimeTypeGuesser.php
@@ -0,0 +1,25 @@
+<?php namespace Todaymade\Daux\Server;
+
+use Symfony\Component\HttpFoundation\File\MimeType\MimeTypeGuesserInterface;
+
+/**
+ * Guesses the mime type using the file's extension
+ */
+class ExtensionMimeTypeGuesser implements MimeTypeGuesserInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function guess($path)
+    {
+        $extension = pathinfo($path,PATHINFO_EXTENSION);
+
+        if ($extension == "css") {
+            return "text/css";
+        }
+
+        if ($extension == "js") {
+            return "application/javascript";
+        }
+    }
+}
diff --git a/libs/Server/Server.php b/libs/Server/Server.php
index 3702b41..cd9758a 100755
--- a/libs/Server/Server.php
+++ b/libs/Server/Server.php
@@ -4,6 +4,7 @@ use Symfony\Component\Console\Output\NullOutput;
 use Symfony\Component\HttpFoundation\BinaryFileResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpFoundation\File\MimeType\MimeTypeGuesser;
 use Todaymade\Daux\Daux;
 use Todaymade\Daux\DauxHelper;
 use Todaymade\Daux\Exception;
@@ -93,6 +94,9 @@ class Server
      * @return Response
      */
     public function createResponse(Page $page) {
+
+        MimeTypeGuesser::getInstance()->register(new ExtensionMimeTypeGuesser);
+
         if ($page instanceof RawPage) {
             return new BinaryFileResponse($page->getFile());
         }