diff --git a/css/fonts/ShareTech.woff2 b/fonts/ShareTech.woff2
similarity index 100%
rename from css/fonts/ShareTech.woff2
rename to fonts/ShareTech.woff2
diff --git a/css/fonts/ShareTechMono.woff2 b/fonts/ShareTechMono.woff2
similarity index 100%
rename from css/fonts/ShareTechMono.woff2
rename to fonts/ShareTechMono.woff2
diff --git a/css/images/bg.jpg b/images/bg.jpg
similarity index 100%
rename from css/images/bg.jpg
rename to images/bg.jpg
diff --git a/index.php b/index.php
index ce60be7..ea3320b 100644
--- a/index.php
+++ b/index.php
@@ -4,8 +4,8 @@
         <meta charset="utf-8" />
         <title>Webtris</title>
         <link rel="icon" type="image/png" href="favicon.png">
-        <link rel="stylesheet" type="text/css" href="css/style.css" />
-        <script type="text/javascript" src="js/webtris.js"></script>
+        <link rel="stylesheet" type="text/css" href="style.css" />
+        <script type="text/javascript" src="webtris.js"></script>
     </head>
     <body>
         <header>
@@ -79,8 +79,8 @@
                 <div></div>
                 <select id="themeSelect" onchange="themeChanged()">
 <?php
-    foreach(scandir("css/themes") as $theme) {
-        if (!in_array($theme,array(".","..")))
+    foreach(scandir("themes") as $theme) {
+        if (pathinfo ($theme, PATHINFO_EXTENSION) == "css")
             echo "                    <option>" . pathinfo($theme, PATHINFO_FILENAME) . "</option>\n";
     }
 ?>
diff --git a/css/style.css b/style.css
similarity index 100%
rename from css/style.css
rename to style.css
diff --git a/css/themes/images.css b/themes/images.css
similarity index 59%
rename from css/themes/images.css
rename to themes/images.css
index 11b6694..b1df3a3 100644
--- a/css/themes/images.css
+++ b/themes/images.css
@@ -11,41 +11,40 @@
 }
 
 .mino {
-    border: 1px inset transparent;
+    border: 1px inset rgba(128, 128, 128, 0.3);
     border-radius: 0;
 }
 
 .I-mino {
-    background-image: url(../images/blue_block.png);
+    background-image: url(images/blue_block.png);
 }
 
 .J-mino {
-    background-image: url(../images/peach_block.png);
+    background-image: url(images/navy_block.png);
 }
 
 .L-mino {
-    background-image: url(../images/yellow_block.png);
+    background-image: url(images/peach_block.png);
 }
 
 .O-mino {
-    background-image: url(../images/peach_block.png);
+    background-image: url(images/yellow_block.png);
 }
 
 .S-mino {
-    background-image: url(../images/green_block.png);
+    background-image: url(images/green_block.png);
 }
 
 .T-mino {
-    background-image: url(../images/purple_block.png);
+    background-image: url(images/purple_block.png);
 }
 
 .Z-mino {
-    background-image: url(../images/pink_block.png);
+    background-image: url(images/pink_block.png);
 }
 
 .locked-mino {
     background: white;
-    background: rgba(255, 255, 255, 0.8);
     border-radius: 1px;
 }
 
diff --git a/css/images/blue_block.png b/themes/images/blue_block.png
similarity index 100%
rename from css/images/blue_block.png
rename to themes/images/blue_block.png
diff --git a/css/images/green_block.png b/themes/images/green_block.png
similarity index 100%
rename from css/images/green_block.png
rename to themes/images/green_block.png
diff --git a/css/images/navy_block.png b/themes/images/navy_block.png
similarity index 100%
rename from css/images/navy_block.png
rename to themes/images/navy_block.png
diff --git a/css/images/peach_block.png b/themes/images/peach_block.png
similarity index 100%
rename from css/images/peach_block.png
rename to themes/images/peach_block.png
diff --git a/css/images/pink_block.png b/themes/images/pink_block.png
similarity index 100%
rename from css/images/pink_block.png
rename to themes/images/pink_block.png
diff --git a/css/images/purple_block.png b/themes/images/purple_block.png
similarity index 100%
rename from css/images/purple_block.png
rename to themes/images/purple_block.png
diff --git a/css/images/yellow_block.png b/themes/images/yellow_block.png
similarity index 100%
rename from css/images/yellow_block.png
rename to themes/images/yellow_block.png
diff --git a/css/themes/light-relief.css b/themes/light-relief.css
similarity index 100%
rename from css/themes/light-relief.css
rename to themes/light-relief.css
diff --git a/css/themes/light-solid.css b/themes/light-solid.css
similarity index 100%
rename from css/themes/light-solid.css
rename to themes/light-solid.css
diff --git a/css/themes/tetris-effect.css b/themes/tetris-effect.css
similarity index 100%
rename from css/themes/tetris-effect.css
rename to themes/tetris-effect.css
diff --git a/css/themes/vivid-relief.css b/themes/vivid-relief.css
similarity index 100%
rename from css/themes/vivid-relief.css
rename to themes/vivid-relief.css
diff --git a/css/themes/vivid-solid.css b/themes/vivid-solid.css
similarity index 100%
rename from css/themes/vivid-solid.css
rename to themes/vivid-solid.css
diff --git a/js/webtris.js b/webtris.js
similarity index 99%
rename from js/webtris.js
rename to webtris.js
index 52ddb5d..4eaea2b 100644
--- a/js/webtris.js
+++ b/webtris.js
@@ -937,7 +937,7 @@ function loadTheme() {
     link.id   = "theme";
     link.rel  = 'stylesheet'
     link.type = 'text/css'
-    link.href = 'css/themes/' + theme+ '.css'
+    link.href = 'themes/' + theme+ '.css'
     link.media = 'all'
     document.getElementsByTagName('head')[0].appendChild(link);
 }
