diff --git a/main.lua b/main.lua
index 7604c096..86d44ade 100644
--- a/main.lua
+++ b/main.lua
@@ -359,6 +359,13 @@ for i=1,#MODES do
         MODES[m.name],MODES[i]=MODES[i]
     end
 end
+for _,v in next,fs.getDirectoryItems('parts/modes')do
+    if isSafeFile('parts/modes/'..v)and not MODES[v:sub(1,-5)]then
+        local M={name=v:sub(1,-5)}
+        TABLE.complete(require('parts.modes.'..M.name),M)
+        MODES[M.name]=M
+    end
+end
 
 --Update data
 do
diff --git a/parts/modes.lua b/parts/modes.lua
index dd2c2bd0..97f5ebe5 100644
--- a/parts/modes.lua
+++ b/parts/modes.lua
@@ -117,9 +117,4 @@ return{
     {name='ultra',         x=-1000,     y=-600,     size=40,shape=1,icon="ultra"},
     {name='infinite',      x=-1000,     y=-400,     size=40,shape=1,icon='infinite'},
     {name='infinite_dig',  x=-800,      y=-400,     size=40,shape=1,icon="dig"},
-
-    --Special
-    {name='custom_puzzle'},
-    {name='custom_clear'},
-    {name="netBattle"},
 }