diff --git a/main.lua b/main.lua
index 42c1b828..521a100a 100644
--- a/main.lua
+++ b/main.lua
@@ -294,39 +294,42 @@ IMG.init{
     },
 }
 SKIN.load{
-    {name="crystal_scf",           path='media/image/skin/crystal_scf.png'},
-    {name="matte_mrz",             path='media/image/skin/matte_mrz.png'},
-    {name="shiny_chno",            path='media/image/skin/shiny_chno.png'},
-    {name="contrast_mrz",          path='media/image/skin/contrast_mrz.png'},
-    {name="polkadots_scf",         path='media/image/skin/polkadots_scf.png'},
-    {name="toy_scf",               path='media/image/skin/toy_scf.png'},
-    {name="smooth_mrz",            path='media/image/skin/smooth_mrz.png'},
-    {name="simple_scf",            path='media/image/skin/simple_scf.png'},
-    {name="glass_scf",             path='media/image/skin/glass_scf.png'},
-    {name="penta_scf",             path='media/image/skin/penta_scf.png'},
-    {name="bubble_scf",            path='media/image/skin/bubble_scf.png'},
-    {name="minoes_scf",            path='media/image/skin/minoes_scf.png'},
-    {name="pure_mrz",              path='media/image/skin/pure_mrz.png'},
-    {name="bright_scf",            path='media/image/skin/bright_scf.png'},
-    {name="glow_mrz",              path='media/image/skin/glow_mrz.png'},
-    {name="plastic_mrz",           path='media/image/skin/plastic_mrz.png'},
-    {name="paper_mrz",             path='media/image/skin/paper_mrz.png'},
-    {name="yinyang_scf",           path='media/image/skin/yinyang_scf.png'},
-    {name="cartooncup_earety",     path='media/image/skin/cartooncup_earety.png'},
-    {name="jelly_miya",            path='media/image/skin/jelly_miya.png'},
-    {name="guidetris_xmiao_lusisi",path='media/image/skin/guidetris_xmiao_lusisi.png'},
-    {name="brick_notypey",         path='media/image/skin/brick_notypey.png'},
-    {name="gem_notypey",           path='media/image/skin/gem_notypey.png'},
-    {name="classic",               path='media/image/skin/classic_unknown.png'},
-    {name="ball_shaw",             path='media/image/skin/ball_shaw.png'},
-    {name="retro_notypey",         path='media/image/skin/retro_notypey.png'},
-    {name="pixel_chno",            path='media/image/skin/pixel_chno.png'},
-    {name="pastel_chno",           path='media/image/skin/pastel_chno.png'},
-    {name="letters_chno",          path='media/image/skin/letters_chno.png'},
-    {name="kanji_chno",            path='media/image/skin/kanji_chno.png'},
-    {name="textbone_mrz",          path='media/image/skin/textbone_mrz.png'},
-    {name="coloredbone_mrz",       path='media/image/skin/coloredbone_mrz.png'},
-    {name="wtf",                   path='media/image/skin/wtf_mrz.png'},
+    {name="Arcade (Asriel)",           path='media/image/skin/asriel/arcade.png'},
+    {name="Cardboard (Asriel, slimenergy)",           path='media/image/skin/asriel/cardboard.png'},
+    {name="Template (Asriel)",           path='media/image/skin/asriel/template.png'},
+    {name="Crystal (Scf)",           path='media/image/skin/scf/crystal.png'},
+    {name="Matte (MrZ)",             path='media/image/skin/mrz/matte.png'},
+    {name="Shiny (CHNO)",            path='media/image/skin/chno/shiny.png'},
+    {name="Contrast (MrZ)",          path='media/image/skin/mrz/contrast.png'},
+    {name="Polkadots (Scf)",         path='media/image/skin/scf/polkadots.png'},
+    {name="Toy (Scf)",               path='media/image/skin/scf/toy.png'},
+    {name="Smooth (MrZ)",            path='media/image/skin/mrz/smooth.png'},
+    {name="Simple (Scf)",            path='media/image/skin/scf/simple.png'},
+    {name="Glass (Scf)",             path='media/image/skin/scf/glass.png'},
+    {name="Penta (Scf)",             path='media/image/skin/scf/penta.png'},
+    {name="Bubble (Scf)",            path='media/image/skin/scf/bubble.png'},
+    {name="Minoes (Scf)",            path='media/image/skin/scf/minoes.png'},
+    {name="pure (MrZ)",              path='media/image/skin/mrz/pure.png'},
+    {name="bright (Scf)",            path='media/image/skin/scf/bright.png'},
+    {name="Glow (MrZ)",              path='media/image/skin/mrz/glow.png'},
+    {name="Plastic (MrZ)",           path='media/image/skin/mrz/plastic.png'},
+    {name="paper (MrZ)",             path='media/image/skin/mrz/paper.png'},
+    {name="Yinyang (Scf)",           path='media/image/skin/scf/yinyang.png'},
+    {name="Cartooncup (Earety)",     path='media/image/skin/earety/cartooncup.png'},
+    {name="Jelly (Miya)",            path='media/image/skin/miya/jelly.png'},
+    {name="guidetris (xmiao, lusisi)",path='media/image/skin/guidetris_xmiao_lusisi.png'},
+    {name="brick (Notypey)",         path='media/image/skin/notypey/brick.png'},
+    {name="Gem (Notypey)",           path='media/image/skin/notypey/gem.png'},
+    {name="Classic",               path='media/image/skin/unknown/classic.png'},
+    {name="Ball (Shaw)",             path='media/image/skin/shaw/ball.png'},
+    {name="Retro (Notypey)",         path='media/image/skin/notypey/retro.png'},
+    {name="Pixel (CHNO)",            path='media/image/skin/chno/pixel.png'},
+    {name="Pastel (CHNO)",           path='media/image/skin/chno/pastel.png'},
+    {name="Letters (CHNO)",          path='media/image/skin/chno/letters.png'},
+    {name="Kanji (CHNO)",            path='media/image/skin/chno/kanji.png'},
+    {name="Textbone (MrZ)",          path='media/image/skin/mrz/textbone.png'},
+    {name="Coloredbone (MrZ)",       path='media/image/skin/mrz/coloredbone.png'},
+    {name="WTF (MrZ)",                   path='media/image/skin/mrz/wtf.png'},
 }
 
 -- Initialize sound libs
diff --git a/media/image/skin/asriel/arcade.png b/media/image/skin/asriel/arcade.png
new file mode 100755
index 00000000..1af2600c
Binary files /dev/null and b/media/image/skin/asriel/arcade.png differ
diff --git a/media/image/skin/asriel/cardboard.png b/media/image/skin/asriel/cardboard.png
new file mode 100644
index 00000000..f0385efd
Binary files /dev/null and b/media/image/skin/asriel/cardboard.png differ
diff --git a/media/image/skin/kanji_chno.png b/media/image/skin/chno/kanji.png
similarity index 100%
rename from media/image/skin/kanji_chno.png
rename to media/image/skin/chno/kanji.png
diff --git a/media/image/skin/letters_chno.png b/media/image/skin/chno/letters.png
similarity index 100%
rename from media/image/skin/letters_chno.png
rename to media/image/skin/chno/letters.png
diff --git a/media/image/skin/pastel_chno.png b/media/image/skin/chno/pastel.png
similarity index 100%
rename from media/image/skin/pastel_chno.png
rename to media/image/skin/chno/pastel.png
diff --git a/media/image/skin/pixel_chno.png b/media/image/skin/chno/pixel.png
similarity index 100%
rename from media/image/skin/pixel_chno.png
rename to media/image/skin/chno/pixel.png
diff --git a/media/image/skin/shiny_chno.png b/media/image/skin/chno/shiny.png
similarity index 100%
rename from media/image/skin/shiny_chno.png
rename to media/image/skin/chno/shiny.png
diff --git a/media/image/skin/cartooncup_earety.png b/media/image/skin/earety/cartooncup.png
similarity index 100%
rename from media/image/skin/cartooncup_earety.png
rename to media/image/skin/earety/cartooncup.png
diff --git a/media/image/skin/jelly_miya.png b/media/image/skin/miya/jelly.png
similarity index 100%
rename from media/image/skin/jelly_miya.png
rename to media/image/skin/miya/jelly.png
diff --git a/media/image/skin/coloredbone_mrz.png b/media/image/skin/mrz/coloredbone.png
similarity index 100%
rename from media/image/skin/coloredbone_mrz.png
rename to media/image/skin/mrz/coloredbone.png
diff --git a/media/image/skin/contrast_mrz.png b/media/image/skin/mrz/contrast.png
similarity index 100%
rename from media/image/skin/contrast_mrz.png
rename to media/image/skin/mrz/contrast.png
diff --git a/media/image/skin/glow_mrz.png b/media/image/skin/mrz/glow.png
similarity index 100%
rename from media/image/skin/glow_mrz.png
rename to media/image/skin/mrz/glow.png
diff --git a/media/image/skin/matte_mrz.png b/media/image/skin/mrz/matte.png
similarity index 100%
rename from media/image/skin/matte_mrz.png
rename to media/image/skin/mrz/matte.png
diff --git a/media/image/skin/paper_mrz.png b/media/image/skin/mrz/paper.png
similarity index 100%
rename from media/image/skin/paper_mrz.png
rename to media/image/skin/mrz/paper.png
diff --git a/media/image/skin/plastic_mrz.png b/media/image/skin/mrz/plastic.png
similarity index 100%
rename from media/image/skin/plastic_mrz.png
rename to media/image/skin/mrz/plastic.png
diff --git a/media/image/skin/pure_mrz.png b/media/image/skin/mrz/pure.png
similarity index 100%
rename from media/image/skin/pure_mrz.png
rename to media/image/skin/mrz/pure.png
diff --git a/media/image/skin/smooth_mrz.png b/media/image/skin/mrz/smooth.png
similarity index 100%
rename from media/image/skin/smooth_mrz.png
rename to media/image/skin/mrz/smooth.png
diff --git a/media/image/skin/textbone_mrz.png b/media/image/skin/mrz/textbone.png
similarity index 100%
rename from media/image/skin/textbone_mrz.png
rename to media/image/skin/mrz/textbone.png
diff --git a/media/image/skin/wtf_mrz.png b/media/image/skin/mrz/wtf.png
similarity index 100%
rename from media/image/skin/wtf_mrz.png
rename to media/image/skin/mrz/wtf.png
diff --git a/media/image/skin/brick_notypey.png b/media/image/skin/notypey/brick.png
similarity index 100%
rename from media/image/skin/brick_notypey.png
rename to media/image/skin/notypey/brick.png
diff --git a/media/image/skin/gem_notypey.png b/media/image/skin/notypey/gem.png
similarity index 100%
rename from media/image/skin/gem_notypey.png
rename to media/image/skin/notypey/gem.png
diff --git a/media/image/skin/retro_notypey.png b/media/image/skin/notypey/retro.png
similarity index 100%
rename from media/image/skin/retro_notypey.png
rename to media/image/skin/notypey/retro.png
diff --git a/media/image/skin/bright_scf.png b/media/image/skin/scf/bright.png
similarity index 100%
rename from media/image/skin/bright_scf.png
rename to media/image/skin/scf/bright.png
diff --git a/media/image/skin/bubble_scf.png b/media/image/skin/scf/bubble.png
similarity index 100%
rename from media/image/skin/bubble_scf.png
rename to media/image/skin/scf/bubble.png
diff --git a/media/image/skin/crystal_scf.png b/media/image/skin/scf/crystal.png
similarity index 100%
rename from media/image/skin/crystal_scf.png
rename to media/image/skin/scf/crystal.png
diff --git a/media/image/skin/glass_scf.png b/media/image/skin/scf/glass.png
similarity index 100%
rename from media/image/skin/glass_scf.png
rename to media/image/skin/scf/glass.png
diff --git a/media/image/skin/minoes_scf.png b/media/image/skin/scf/minoes.png
similarity index 100%
rename from media/image/skin/minoes_scf.png
rename to media/image/skin/scf/minoes.png
diff --git a/media/image/skin/penta_scf.png b/media/image/skin/scf/penta.png
similarity index 100%
rename from media/image/skin/penta_scf.png
rename to media/image/skin/scf/penta.png
diff --git a/media/image/skin/polkadots_scf.png b/media/image/skin/scf/polkadots.png
similarity index 100%
rename from media/image/skin/polkadots_scf.png
rename to media/image/skin/scf/polkadots.png
diff --git a/media/image/skin/simple_scf.png b/media/image/skin/scf/simple.png
similarity index 100%
rename from media/image/skin/simple_scf.png
rename to media/image/skin/scf/simple.png
diff --git a/media/image/skin/toy_scf.png b/media/image/skin/scf/toy.png
similarity index 100%
rename from media/image/skin/toy_scf.png
rename to media/image/skin/scf/toy.png
diff --git a/media/image/skin/yinyang_scf.png b/media/image/skin/scf/yinyang.png
similarity index 100%
rename from media/image/skin/yinyang_scf.png
rename to media/image/skin/scf/yinyang.png
diff --git a/media/image/skin/ball_shaw.png b/media/image/skin/shaw/ball.png
similarity index 100%
rename from media/image/skin/ball_shaw.png
rename to media/image/skin/shaw/ball.png
diff --git a/media/image/skin/classic_unknown.png b/media/image/skin/unknown/classic.png
similarity index 100%
rename from media/image/skin/classic_unknown.png
rename to media/image/skin/unknown/classic.png