diff --git a/oliver_screen/main/index.html b/oliver_screen/main/index.html
deleted file mode 100644
index e69de29..0000000
diff --git a/oliver_screen/templates/500.html b/oliver_screen/templates/500.html
new file mode 100644
index 0000000..35e9109
--- /dev/null
+++ b/oliver_screen/templates/500.html
@@ -0,0 +1 @@
+LOL!
diff --git a/oliver_screen/templates/public/index.html b/oliver_screen/templates/public/index.html
index 622b9a8..96444cf 100644
--- a/oliver_screen/templates/public/index.html
+++ b/oliver_screen/templates/public/index.html
@@ -3,18 +3,18 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
     <head>
     <title>Current track</title>
-        <link rel="stylesheet"  type="text/css" href="/static/screen.css" />
-        <script type="text/javascript" src="/static/jquery-1.5.2.min.js"></script>
-        <script type="text/javascript" src="/static/jquery.timers-1.2.js"></script>
+        <link rel="stylesheet"  type="text/css" href="/oliver/static/screen.css" />
+        <script type="text/javascript" src="/oliver/static/jquery-1.5.2.min.js"></script>
+        <script type="text/javascript" src="/oliver/static/jquery.timers-1.2.js"></script>
         <script type="text/javascript">
             /* Function that updates the capacities */
             var get_last_track = function() {
                 $( '#last_track' ).load(
-                    '/tracks/last');
+                    '/oliver/tracks/last');
             };
             var get_now_playing = function() {
                 $( '#now_playing' ).load(
-                    '/tracks/now_playing/');
+                    '/oliver/tracks/now_playing/');
             };
             /* Initial update */
             $( document ).ready( get_last_track );
@@ -45,7 +45,7 @@
 	</head>
 
 	<body>
-    <div id="spinner"><img src="/static/spinner.gif"/></div>
+    <div id="spinner"><img src="/oliver/static/spinner.gif"/></div>
 	<div id="container">
         <div id="content">
             <div id="now_playing"></div>
diff --git a/oliver_screen/templates/public/now_playing.html b/oliver_screen/templates/public/now_playing.html
index 13e18d1..e473e3f 100644
--- a/oliver_screen/templates/public/now_playing.html
+++ b/oliver_screen/templates/public/now_playing.html
@@ -1,7 +1,7 @@
 {% if now_playing %}
     <img src="{{ now_playing.image}}" class="now_playing" /><br />
-    <img src="/static/eq.gif" /> {{ now_playing.artist}} - {{ now_playing.title }} ♪♫<br />
+    <img src="/oliver/static/eq.gif" /> {{ now_playing.artist}} - {{ now_playing.title }} ♪♫<br />
 {% else %}
-    <img src="/static/no_music_makes_me_sick_by_sakgaa.jpg" /><br />
+    <img src="/oliver/static/no_music_makes_me_sick_by_sakgaa.jpg" /><br />
     :[
 {% endif %}