diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
new file mode 100644
index 0000000..84cd4d0
--- /dev/null
+++ b/.github/workflows/python.yml
@@ -0,0 +1,65 @@
+name: Python Package
+
+on:
+  push:
+    branches:
+      - '*'
+    tags:
+      - '*'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    name: Wheel
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+          submodules: 'recursive'
+
+      - name: Set up Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: "3.9"
+     
+      - name: Install Python packages
+        run: python -m pip install --upgrade build pip
+
+      - name: build wheel
+        run: python -m build --wheel
+
+      - name: build sdist
+        run: python -m build --sdist
+      
+      - name: Store the packages
+        uses: actions/upload-artifact@v2
+        with:
+          name: python-package-distributions
+          path: dist
+
+  pypi:
+    runs-on: 'ubuntu-latest'
+    needs:
+      - build
+
+    steps:
+      - name: Download all the dists
+        uses: actions/download-artifact@v2
+        with:
+          name: python-package-distributions
+          path: dist/
+
+      - name: Publish 📦 to TestPyPI
+        if: ${{ github.ref == 'refs/heads/patcher' }}
+        uses: pypa/gh-action-pypi-publish@master
+        with:
+          password: ${{ secrets.testpypi_password }}
+          repository_url: https://test.pypi.org/legacy/
+      
+      - name: Publish 📦 to PyPI
+        if: ${{ startsWith(github.ref, 'refs/tags/') }}
+        uses: pypa/gh-action-pypi-publish@master
+        with:
+          password: ${{ secrets.pypi_password }}
diff --git a/.gitignore b/.gitignore
index ffa747e..05931d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,21 @@
 data/*
 notes/*
 
-pre-edited-cs/Doukutsu\.exe\.blbkp
+pre_edited_cs/Doukutsu\.exe\.blbkp
 
-pre-edited-cs/Profile*
+pre_edited_cs/Profile*
 
-pre-edited-cs/window\.rect
+pre_edited_cs/window\.rect
 
 *Copy/
+
+venv/
+
+build/
+
+dist/
+
+cave_story_randomizer.egg-info/
+
+*/__pycache__
+caver/version.py
diff --git a/CaveStoryRandomizer.ico b/CaveStoryRandomizer.ico
deleted file mode 100644
index 91347b2..0000000
Binary files a/CaveStoryRandomizer.ico and /dev/null differ
diff --git a/README.md b/README.md
index 5955c13..1c27eb5 100644
--- a/README.md
+++ b/README.md
@@ -1,52 +1,3 @@
 # Cave Story Randomizer [Open Mode]
 
-The Cave Story Randomizer shuffles the location of every item in Cave Story, creating a new experience each time you play! The randomizer has logic in place to ensure that you can always reach every item and finish the game. Get started by heading to the [releases page](https://github.com/cave-story-randomizer/cave-story-randomizer/releases) and downloading the most recent version! If you find yourself stuck, wanting to talk about the hilarious location you found the panties in, or just plain enjoying the game please consider joining our [official Discord server](https://discord.gg/7zUdPEn) and hanging out!
-
-## Main differences
-Note that there are a few key differences from the vanilla game in order to improve the playing experience:
-
-- All 5 teleporter locations in Arthur's House are active from the beginning of the game
-- All other teleporters from the vanilla game are active and linked to one another at all times
-- A teleporter between Sand Zone (near the Storehouse) and Labyrinth I has been placed and can be activated in one of two ways:
-   1. Defeating Toroko+
-   2. Using the teleporter from the Labyrinth I side
-- Most cutscenes have been abridged or skipped entirely
-- Jellyfish Juice can be used an infinite number of times
-- You can carry as many as 5 puppies at once: Jenka will only accept them once you've collected all 5
-  - By the way, all 5 puppies will be located somewhere in the Sand Zone
-- Certain items that are received from NPCs have been placed in chests:
-  - Labyrinth B (Fallen Booster)
-  - Labyrinth Shop
-    - One requiring the Machine Gun to open
-    - One requiring the Fireball to open
-    - One requiring the Spur to open
-  - Jail no. 1
-  - Storage? (Ma Pignon)
-    - This chest requires saving Curly in the Waterway to open
-- If you don't have Curly's Air Tank after defeating the Core, the water will not rise and you may leave without dying
-- Curly cannot be left behind permanently in the Core; the shutter will never close once the boss has been defeated
-- The jump in the Waterway to save Curly has been made much easier
-- Ironhead will always give you his item on defeat (but there's still a special surprise if you defeat him without taking damage!)
-- Kazuma will only open the door between Egg no. 0 and the Outer Wall if you save him in Grasstown
-- Kazuma's door can be blown down from both the outside and the inside
-- Entering the Throne Room to complete the game requires doing three things:
-  1. Saving Sue in the Egg Corridor
-  2. Obtaining the Booster 2.0
-  3. Obtaining the Iron Bond
-
-## Help me!
-If you find yourself stuck, here are a few common pitfalls:
-- Remember that the Jellyfish Juice can quench more than one fireplace
-- The Graveyard can only be accessed if you obtain the Silver Locket and see Toroko get kidnapped
-- The Hermit Gunsmith will wake up and give you an item if you defeat the Core and show him his gun
-- The western side of the Labyrinth can be accessed without flight if you defeat Toroko+
-- The Plantation can be accessed without the Teleporter Room Key if you save Kazuma and teleport in or climb the Outer Wall
-- The Waterway can be accessed without the Cure-All by using the teleporter in the Labyrinth Shop
-- There may be a required item in the Last Cave (Hidden) as a reward for defeating the Red Demon
-
-If you're still stuck, join our [official Discord server](https://discord.gg/7zUdPEn) and ask for help in there!
-
-## Credits
-- Original Cave Story Randomizer by shru: https://shru.itch.io/cave-story-randomizer
-- Font: https://datagoblin.itch.io/monogram
-- Icon: Bubbler (@Ethan#6397)
+A patcher for randomizing Cave Story. If you want to play, check out [Randovania](https://github.com/randovania/randovania)!
diff --git a/__pyinstaller/__init__.py b/__pyinstaller/__init__.py
new file mode 100644
index 0000000..aefa2e0
--- /dev/null
+++ b/__pyinstaller/__init__.py
@@ -0,0 +1,18 @@
+import os
+
+
+# Functions
+# =========
+#
+# .. _get_hook_dirs:
+#
+# get_hook_dirs
+# -------------
+#
+# Tell PyInstaller where to find hooks provided by this distribution;
+# this is referenced by the :ref:`hook registration <hook_registration>`.
+# This function returns a list containing only the path to this
+# directory, which is the location of these hooks.
+
+def get_hook_dirs():
+    return [os.path.dirname(__file__)]
\ No newline at end of file
diff --git a/__pyinstaller/hook-caver.py b/__pyinstaller/hook-caver.py
new file mode 100644
index 0000000..40f586e
--- /dev/null
+++ b/__pyinstaller/hook-caver.py
@@ -0,0 +1,5 @@
+from PyInstaller.utils.hooks import collect_data_files
+
+# https://pyinstaller.readthedocs.io/en/stable/hooks.html#provide-hooks-with-package
+
+datas = collect_data_files('caver', excludes=['__pyinstaller'])
\ No newline at end of file
diff --git a/__pyinstaller/hook-pre_edited_cs.py b/__pyinstaller/hook-pre_edited_cs.py
new file mode 100644
index 0000000..a6387ab
--- /dev/null
+++ b/__pyinstaller/hook-pre_edited_cs.py
@@ -0,0 +1,5 @@
+from PyInstaller.utils.hooks import collect_data_files
+
+# https://pyinstaller.readthedocs.io/en/stable/hooks.html#provide-hooks-with-package
+
+datas = collect_data_files('pre_edited_cs', excludes=['__pyinstaller'])
\ No newline at end of file
diff --git a/pre-edited-cs/data/tsc_def.txt b/caver/__init__.py
similarity index 100%
rename from pre-edited-cs/data/tsc_def.txt
rename to caver/__init__.py
diff --git a/caver/patcher.py b/caver/patcher.py
new file mode 100644
index 0000000..3c64fa3
--- /dev/null
+++ b/caver/patcher.py
@@ -0,0 +1,126 @@
+from pathlib import Path
+from typing import Callable, Optional
+from lupa import LuaRuntime
+import logging
+import shutil
+import textwrap
+import sys
+
+import pre_edited_cs
+
+
+CSVERSION = 4
+
+class CaverException(Exception):
+    pass
+
+def get_path() -> Path:
+    if getattr(sys, "frozen", False):
+        file_dir = Path(getattr(sys, "_MEIPASS"))
+    else:
+        file_dir = Path(__file__).parent.parent
+    return file_dir.joinpath("caver")
+
+def patch_files(patch_data: dict, output_dir: Path, progress_update: Callable[[str, float], None]):
+    progress_update("Copying base files...", -1)
+    ensure_base_files_exist(output_dir)
+
+    total = len(patch_data["maps"].keys()) + len(patch_data["other_tsc"].keys()) + 2
+
+    lua_file = get_path().joinpath("tsc_file.lua").read_text()
+    TscFile = LuaRuntime().execute(lua_file)
+
+    for i, (mapname, mapdata) in enumerate(patch_data["maps"].items()):
+        progress_update(f"Patching {mapname}...", i/total)
+        patch_map(mapname, mapdata, TscFile, output_dir)
+    
+    for filename, scripts in patch_data["other_tsc"].items():
+        i += 1
+        progress_update(f"Patching {filename}.tsc...", i/total)
+        patch_other(filename, scripts, TscFile, output_dir)
+
+    i += 1
+    progress_update("Copying MyChar...", i/total)
+    patch_mychar(patch_data["mychar"], output_dir)
+
+    i += 1
+    progress_update("Copying hash...", i/total)
+    patch_hash(patch_data["hash"], output_dir)
+
+def ensure_base_files_exist(output_dir: Path):
+    internal_copy = pre_edited_cs.get_path()
+
+    version = output_dir.joinpath("data", "Stage", "_version.txt")
+    keep_existing_files = version.exists() and int(version.read_text()) >= CSVERSION
+
+    def should_ignore(path: str, names: list[str]):
+        base = ["__init__.py", "__pycache__", "ScriptSource", "__pyinstaller"]
+        if keep_existing_files:
+            p = Path(path)
+            base.extend([p.joinpath(name) for name in names if p.joinpath(name).exists() and p.joinpath(name).is_file()])
+        return base
+    
+    try:
+        shutil.copytree(internal_copy, output_dir, ignore=should_ignore, dirs_exist_ok=True)
+    except shutil.Error:
+        raise CaverException("Error copying base files. Ensure the directory is not read-only, and that Doukutsu.exe is closed")
+    output_dir.joinpath("data", "Plaintext").mkdir(exist_ok=True)
+
+def patch_map(mapname: str, mapdata: dict[str, dict], TscFile, output_dir: Path):
+    mappath = output_dir.joinpath("data", "Stage", f"{mapname}.tsc")
+    tsc_file = TscFile.new(TscFile, mappath.read_bytes(), logging.getLogger("caver"))
+
+    for event, script in mapdata["pickups"].items():
+        TscFile.placeScriptAtEvent(tsc_file, script, event, mapname)
+    
+    for event, song in mapdata["music"].items():
+        TscFile.placeSongAtCue(tsc_file, song["song_id"], event, song["original_id"], mapname)
+    
+    for event, script in mapdata["entrances"].items():
+        needle = "<EVE...." # TODO: create a proper pattern
+        TscFile.placeScriptAtEvent(tsc_file, script, event, mapname, needle)
+    
+    for event, hint in mapdata["hints"].items():
+        script = create_hint_script(hint["text"], hint.get("facepic", "0000") != "0000", hint.get("ending", "<END"))
+        TscFile.placeScriptAtEvent(tsc_file, script, event, mapname)
+
+    chars = TscFile.getText(tsc_file).values()
+    mappath.write_bytes(bytes(chars))
+    output_dir.joinpath("data", "Plaintext", f"{mapname}.txt").write_text(TscFile.getPlaintext(tsc_file))
+
+def patch_other(filename: str, scripts: dict[str, dict[str, str]], TscFile, output_dir: Path):
+    filepath = output_dir.joinpath("data", f"{filename}.tsc")
+    tsc_file = TscFile.new(TscFile, filepath.read_bytes(), logging.getLogger("caver"))
+
+    for event, script in scripts.items():
+        TscFile.placeScriptAtEvent(tsc_file, script["script"], event, filename, script.get("needle", "<EVE...."))
+    
+    chars = TscFile.getText(tsc_file).values()
+    filepath.write_bytes(bytes(chars))
+    output_dir.joinpath("data", "Plaintext", f"{filename}.txt").write_text(TscFile.getPlaintext(tsc_file))
+
+def patch_mychar(mychar: Optional[str], output_dir: Path):
+    if mychar is None:
+        return
+    mychar_img = Path(mychar).read_bytes()
+    output_dir.joinpath("data", "MyChar.bmp").write_bytes(mychar_img)
+
+def patch_hash(hash: list[int], output_dir: Path):
+    hash_strings = [f"{num:04d}" for num in hash]
+    hash_string = ",".join(hash_strings)
+    output_dir.joinpath("data", "hash.txt").write_text(hash_string)
+
+def create_hint_script(text: str, facepic: bool, ending: str) -> str:
+    """
+    A desperate attempt to generate valid <MSG text. Fills one text box (up to three lines). Attempts to wrap words elegantly.
+    """
+    hard_limit = 35
+    msgbox_limit = 26 if facepic else hard_limit
+    
+    lines = textwrap.wrap(text, width=msgbox_limit, max_lines=3)
+    text = ""
+    for i, l in enumerate(lines):
+        text += l
+        if len(l) != hard_limit and i < len(lines)-1:
+            text += "\r\n"
+    return f"<PRI<MSG<TUR{text}<NOD{ending}"
diff --git a/src/tsc_file.lua b/caver/tsc_file.lua
similarity index 54%
rename from src/tsc_file.lua
rename to caver/tsc_file.lua
index 2213f51..adc8fa0 100644
--- a/src/tsc_file.lua
+++ b/caver/tsc_file.lua
@@ -1,64 +1,48 @@
-local C = Class:extend()
+local TscFile = {}
 
--- local ITEM_DATA = require 'database.items'
-
-local OPTIONAL_REPLACES = {
-  'Max health increased by ',
-  'Max life increased by ',
-  '<ACH0041', -- Cave Story+ only, trigger achievement.
-}
-
-function C:new(path)
-  logInfo('reading TSC: ' .. path)
-
-  local file = lf.newFile(path)
-  assert(file:open('r'))
-
-  local contents, size = file:read()
+function TscFile:new(contents)
+  o = {}
+  setmetatable(o, self)
+  self.__index = self
   self._text = self:_codec(contents, 'decode')
-
-  assert(file:close())
-  assert(file:release())
+  return o
 end
 
-function C:hasUnreplacedItems()
-  return #self._unreplaced >= 1
-end
-
-function C:placeItemAtLocation(item, location)
-  local wasChanged
-  self._text, wasChanged = self:_stringReplace(self._text, "<EVE....", item.script, location.event)
-  if not wasChanged then
-    local template = 'Unable to place [%s] "%s" at "%s".'
-    logError(template:format(location.map, item.name, location.name))
+function TscFile:placeScriptAtEvent(script, event, mapname, needle)
+  needle = needle or "<EVE...."
+  local err
+  self._text, err = self:_stringReplace(self._text, needle, script, event)
+  if err ~= nil then
+    local template = 'Unable to place script "%s" at [%s] event "%s".\nCause: %s'
+    error(template:format(script, mapname, event, err))
   end
 end
 
-function C:placeSongAtCue(songid, event, map, originalid)
-  local wasChanged
-  self._text, wasChanged = self:_stringReplace(self._text, "<CMU" .. originalid, "<CMU" .. songid, event, {"<CMU0015", "<CMU0000"})
-  if not wasChanged then
-    local template = "Unable to replace [%s] event #%s's music cue with %q."
-    logWarning(template:format(map, event, songid))
+function TscFile:placeSongAtCue(songid, event, originalid, mapname)
+  local err
+  self._text, err = self:_stringReplace(self._text, "<CMU" .. originalid, "<CMU" .. songid, event, {"<CMU0015", "<CMU0000"})
+  if err ~= nil then
+    local template = "Unable to replace [%s] event #%s's music cue with %q.\nCause: %s"
+    error(template:format(mapname, event, songid, err))
   end
 end
 
-function C:_stringReplace(text, needle, replacement, label, overrides)
+function TscFile:_stringReplace(text, needle, replacement, label, overrides)
   overrides = overrides or {}
   local pStart, pEnd = self:_getLabelPositionRange(label)
 
   local i, o = -1, -1
   while(o <= i) do
     o = nil
-    i = text:find(needle, pStart)
+    i, i2 = text:find(needle, pStart)
 
     if i == nil then
-      logDebug(('Unable to replace "%s" with "%s"'):format(needle, replacement))
-      return text, false
+      local err = ('No match for "%s".'):format(needle)
+      return text, err
     elseif i > pEnd then
       -- This is totally normal and can be ignored.
-      logDebug(('Found "%s", but was outside of label.'):format(needle, replacement))
-      return text, false
+      local err = ('Found "%s", but was outside of label (%d, %d) at index %d.'):format(needle, pStart, pEnd, i)
+      return text, err
     end
 
     -- find the earliest occurence of an override
@@ -79,16 +63,16 @@ function C:_stringReplace(text, needle, replacement, label, overrides)
     pStart = o+1
   end
 
-  local len = needle:len()
+  local len = i2-i+1
   local j = i + len - 1
   assert((i % 1 == 0) and (i > 0) and (i <= j), tostring(i))
   assert((j % 1 == 0), tostring(j))
   local a = text:sub(1, i - 1)
   local b = text:sub(j + 1)
-  return a .. replacement .. b, true
+  return a .. replacement .. b, nil
 end
 
-function C:_getLabelPositionRange(label)
+function TscFile:_getLabelPositionRange(label)
   local labelStart, labelEnd
 
   -- Recursive shit for when label is a table...
@@ -128,7 +112,7 @@ function C:_getLabelPositionRange(label)
   end
 
   if labelStart == nil then
-    logError(("%s: Could not find label: %s"):format(self.mapName, label))
+    error(("%s: Could not find label: %s"):format(self.mapName, label))
     labelStart = 1
   end
 
@@ -139,18 +123,15 @@ function C:_getLabelPositionRange(label)
   return labelStart, labelEnd
 end
 
-function C:writePlaintextTo(path)
-  logInfo('writing Plaintext TSC to: ' .. path)
-  U.writeFile(path, self._text)
+function TscFile:getPlaintext()
+  return self._text
 end
 
-function C:writeTo(path)
-  logInfo('writing TSC to: ' .. path)
-  local encoded = self:_codec(self._text, 'encode')
-  U.writeFile(path, encoded)
+function TscFile:getText()
+  return self:_codec(self._text, 'encode')
 end
 
-function C:_codec(text, mode)
+function TscFile:_codec(text, mode)
   -- Create array of chars.
   local chars = {}
   text:gsub(".", function(c) table.insert(chars, c) end)
@@ -166,20 +147,23 @@ function C:_codec(text, mode)
     error('Unknown codec mode: ' .. tostring(mode))
   end
 
-  logDebug("  filesize", #chars)
-  logDebug("  encoding char:", encodingChar)
-  logDebug("  encoding char position:", encodingCharPosition)
-
   -- Encode or decode.
   for pos, char in ipairs(chars) do
     if pos ~= encodingCharPosition then
       local byte = (char:byte() + encodingChar) % 256
-      chars[pos] = string.char(byte)
+      if mode == 'decode' then
+        chars[pos] = string.char(byte)
+      else
+        chars[pos] = byte
+      end
+    elseif mode == 'encode' then
+      chars[pos] = char:byte()
     end
   end
-  local decoded = table.concat(chars)
-
-  return decoded
+  if mode == 'encode' then
+    return chars
+  end
+  return table.concat(chars)
 end
 
-return C
+return TscFile
diff --git a/pre-edited-cs/data/ArmsItem.tsc b/pre-edited-cs/data/ArmsItem.tsc
deleted file mode 100644
index 741f34e..0000000
--- a/pre-edited-cs/data/ArmsItem.tsc
+++ /dev/null
@@ -1 +0,0 @@
-�����ro����������������ro�����ro���������ԅ�����ӓ������������ro�����ro��������������ʅ�ro���������؅������ͅ����ؓro���ʅ�ޅ����ƅ�Ӆ��ʅ��������͓������������ro�����ro��������������ׅ���ׅ�ro��ʅ���م����ȅ��ӓro�م����؅��ʅ���Ѕ�˅������ؓro������������ro�����ro�����������������х�ro������؅����̅��ʅ����דro�����ׅ�������х�Ӆ�����ʅ�����ؓ������������ro�����ro����������������ʅ��Ӆ�ro�Ӆ��������ȅ����ɒ���ʅ��ӓro������������ޅ��������؅���ׅ���ʓ������������ro�����ro����������������ʅ�������ׅ�ro���ʅ����ʅ��Ʌ�������х�����ʓro������ב���؅���������Ӆ�؅������ɓ������������ro�����ro����������������ׅ�ro���҅��ʅ�������ޅ���ь؅��������ʓro��܅��څ��ʅ�م�؅�Յ�ԅ��ړ������������ro�����ro��������������ʅ�ro�������ʒ���ّ����͒�����ʅ�����ӓro���̌؅���х�����؅�����ӓ������������ro�����ro��������������ׅ������ʅ�ro�Ӆ�����������̅���م�˅������ʓro��؅�����������Ӆ�؅��������ɓ������������ro�����ro����������������؅�ro��������̅�˅��ʅ������ؓro��ׅ�������Ʌ������ؓ������������ro�����ro�������������ׅ�ro���Ʌ���Ӆ��ʅ�����Ӆ��ro���ʅƅ����ד������������ro�����ro������������ޡ�����������ro�����ro��������������؅���������������ro�����ro��������������؅���������������ro�����ro��������������؅���������������ro�����ro��������������؅���������������ro�����ro������������ƌ؅��م��̓������������ro�����ro������������ƌ؅��م���ؓ���څ���ʅ����Ʌ��������������ro�����ro������������ƌ؅��م���ؓ���څ���ʅ����Ʌ��������������ro�����ro������������ƌ؅��م���ؓ���څ���ʅ����Ʌ��������������ro�����ro������������ƌ؅��م���ؓ���څ���ʅ����Ʌ��������������ro�����ro���������ԅ���ғ������������ro�����ro�������������׌؅��ޡ�����������ro�����ro����������Յ�����ҡ�����������ro�����ro������������ƌ؅��ޡ�����������ro�����ro�������������ׅ�����١�����������ro�����ro������������م���̡�����������ro�����ro���������������Ɍ؅����١�����������ro�����ro��������������ɡ�����������ro�����ro����������������ͅ����ʡ�����������ro�����ro������������ޅ��ޡ�����������ro�����ro����������҅��ޡ�����������ro�����ro����������҅���ʡ�����������ro�����ro���������������ѡ�����������ro�����ro����������������ʡ�����������ro�����ro�������������ro�������������ro�������������ro�������������ro�������������ro������������ޡ�����������ro�����ro�����������ʅ��١�����������ro�����ro�����������ʒ��ѡ�����������ro�����ro�������������ȅ��ޡ�����������ro�����ro��������������ׅە��������������ro�����ro�����������؅������ס�����������ro�����ro������������������ʡ�����������ro�����ro������������ތ؅��ׅ���С�����������ro�����ro���������������څ������ס�����������ro�����ro��������������ׅۗ��������������ro�����ro�������������ƅ���С�����������ro�����ro�����������������ׅ���҅��ޡ�����������ro�����ro����������ʌ؅�����ס�����������ro�����ro�����������������ס�����������ro�����ro�������������Ӆ��������ס�����������ro�����ro����������������ס�����������ro�����ro����������܅���ʡ�����������ro�����ro�����������ޅ�����ʅ����ѡ�����������ro�����ro�������������ʅ��ӡ�����������ro�����ro���������������҅����ʡ�����������ro�����ro���������ƅ�����ӡ�����������ro�����ro������������ތ؅��������ס�����������ro�����ro������������Ӆ����ѡ�����������ro�����ro������������Ԍ؅�������С�����������ro�����ro����������������х���ס�����������ro�����ro�����������Ӆ���ɡ�����������ro�����ro���������ԅ���ғ������������ro�����ro����������ʅ��ޅ�ԅ�����׌؅����ʓro�م��؅�����Ӆ���ׅ�����׌�ro���������ʓ������������ro�����ro������������ro�����ro����������ʅ��ޅ�ԅ����ƌ؅����ʓ������������ro�����ro���������������ׅ�����م�Ӆ��ʅ����ʅ�˅ƅ���͓ro���҅��ʅ��������Ӆ�ٌ؅�ӑ��م�����ro���ʅ�ٌ؅���Ӆ��������Ʌ��ׅ����ؓ������������ro�����ro�������������ro�������������ro��������������Յ���̅����Ʌ�م���ro��������ƅ���ғ��؅��؅����ׅ�����ro����ʓ���������������ro�����ro����������������Ʌ�ԅ��څ�ޅƅ������ʅ����ɓ������������ro�����ro���������Ӆ������Ʌ����Ʌ�Ӆ��̅�ԓ����������������ro�����ro��������������Ʌ���م��Ӆ������ro���������ؓ������������ro�����ro��������������ޅ��ޓ������������ro�����ro������������̅���؅���҇�������������ro�����ro��������������Յ�˅��ғ������������ro�����ro������������Ӆ���҅ƅ��������ʓ������������ro�����ro���������Ӆ��������ʅ��ׅ������̅�Յ�����ro��Ʌ���͓������������ro�����ro�������������ro�������������ro�������������ro�������������ro�������������ro������������ƌ؅��م��̓������������ro�����ro���������������؅���х������ʅ���ׅ���ʑro��م���ޅ���ʓ����х��څ��ʅ�٤����������������������������������������ro���ʅ�������ɓ����������������ro�����ro�����������������ޅ���؅�����ro�������̅��Ʌ���������̓��������������ro�����ro���������م���؅���������ͅ�����ȇ�������������ro�����ro�������������ro���������������ͅ��ʅ���Յ�����Ӆ����Ӆ��ro�����ׅ�ԅ��ޅ���Ӆ�����ד��������ro�ԅ��څ���م�ԅ����Յ�٤ro������������������������������������������������ro������ׅ�������ɓ������������������������ro�����ro�����������Ӆ��څ���ʅ�����ʑ���ʅ������ro�˅�����Ӆ�����ޅ���م���х�ʅ�����ɓ������������ro�����ro����������������؅��ʅ���ʅ�م����ͅ���ro������ʅ��Ӆ����������؅���ԓ������������ro�����ro�������������ro��������������څ��Ӆ������ʅ���������ׅ����ro���ؓ�����ޅ���Ʌ�ԅ��ʅ�ٓ��������ro�ԅ��څ���م�ԅ����Յ�٤ro��������������������������������ro�������Ʌ����ތ؅��ׅ���Г������������������������ro�����ro��������������ޅ��������ȅ��������͓ro��څ��ӌم��ʅ��ޅ������ؓ������������ro�����ro�������������ro���������������ͅ��ʅ���Յ�����Ӆ�Ӆ�����ׅ���ro��څ��Ӆ���ʅ�Ӆ��ޅ��������ӓ��������ro�ԅ��څ���م�ԅ����Յ�٤ro������������������������������������������������ro�������Ʌ������ׅۗ���������������������������ro�����ro�������������ro�������������ٌ؅ƅ��م��̓������ro�ԅ��څ���م�ԅ����Յ�٤ro��������������������������������ro�������Ʌ��ʅ�����ƅ���Г������������������������ro�����ro������������ޅ�����Ʌ��م�ޅƅ�������ro�����Ɠ������������ro�����ro���������������х��څ���Ʌ�٤����������������ro���؅�؅��ʓ������������ӌم������ʅ�����ׅ����ro��څ���ͅ����م��х�˅�ؓ���������ʅ���ʅ�ԅ���؅�����Ʌ����ro��ʅ������ʅ�Ӆƅ�������ͅ���Փ�����������˓�������ׅ��؅�Ӆ���ro���������ב���Ʌ�ԅ��؅��ro�����ב��ޅ������ב��������������؅���������ؓ��ro��ʅ�����ׅ�؅���ѓ���������ʅ��؅����ʅ�ԅ����ʅ���ro������х����ؑ���Ʌ��Ʌ�ԓ�����������م����ّ�����х�ʅ�����ro��ʅ����Ӆ����ӓ���������������������م����ӑ����ʅ��ʅ��������ro�˅��ʅ�����ׅ�˅���؅�����ɑ�������������؅��������؅�������ro�����؅���Ӆ��؅�����ד������������ʅ�����ׅ���܅���؅����ro�����ʅ�����̅�ԅ��ʅ�����ɑ������������ͅ�؅��ޅ�ʅ�����Ʌ���ro��ޅ���ԅ��ׅ����Յ�Ӆ���ro����م����ʓ�����������ʅ�ʅ��Ʌ��ʅ����Ӆ��ro��؅���������ӑ��ԅ��ʅ�����ro����Ʌ�Յ�ԅ��ғ���������ʅ��Ʌ�ԅ�����ʅ�����م��ro�������ʅ��ׅ�������ͅ�˅���ro�����Ʌ����ׅ��؅�����ؓ����������ʅ�����ׅ����؅�ԅ���ʅ���ro����͌؅������ʅ����̅����ro�����Ʌ�؅ƅ���ʓ��������������Ѕ�ʅ����؅�ԅ�����ro�����Ѕ��ʅ������ʅ�����ro��ʅ������؅�؅������ؓ�������������ޑ�����؅���ʅ�ԅ��م����ro������ܑ���م�����ׅ��ʅ�����ro����������؅��ʅ������ޓ������������ܑ��ʌ؅����̅��ʅ������������ro������؅�ԅ��������ʅ���ʅ���ro���ʅ��Ʌ������ؓ�����������ʅ�ʅ�؅����ޅ�ԅ�����Б��ʅ����ro����ʅ��ʅ������؅���ԅƅ���������ro�����ޅ����̅��ʅ������ؓ������������̅��؅�������ʅ�����ؑro�ʅ���х�ʅ���ʅ�ԅ������х���ro�����̅������؅�ԅ�ԅ��؅������̓��������ro��Ʌ���م����؅�����ԑ����ѓ�����������˅��څ��Ӆ�����ʅ���҅���؅������ro���ё����Ѕ��ׅ��ʅ������م������ro�Ӆ��ʅ���������ӓ���������˅�ޅ�����ׅ�؅��م���ʑro��ʌ�х�ʅ����e�������̅��ro���ͅƅ����������ӓ�������������ʓ����Յ�ޅ�����ד����������ʅ�������Ʌ��ro��������ԅ�������ɇ�������������������������������ʅ�����ׅ���؅���ʓ��������������ro�����ro����������������ޅ�ԅ���ʅƅ�����ٓro����ʅ�˅���͑���ʅ�������ޅ��ӓ������������ro�����ro���������������Ʌ����ׅ��������ד������������ro�����ro���������ٌ؅����ɒ��ܓ����������ؓ������������ro�����ro������������܅���ʅ��ׅ�����ؓ������������ro�����ro������������х��Ʌ���������ޅ����ޓro�م��؅�ԅ��ʓ������������ro�����ro����������ކ��ʅ����ʅ��٤������������ro�����ro����������ʅ�������҅����ʅ��څ��م���҅���ro�������ғ��م��؅�ԅ���х��ʓ��ԅ��ro�����ّ���څ��ӌم�����ޅ���Ʌ�ٓ����������������������ro�����ro����������������ޑ��م��؅��ʅ����ׅ��ro������ʅ�������ؓ��������������ro�����ro����������������Ʌ���҅�����Ʌ��ʅ���ѓro�����ܒ����Ӆ������؅���ͅƅ����ro�����ʅ�������Ɠ����ޅ���ʅ�ԅ��ʓ������������ro�����ro���������������Ʌ���ͅ��ʅ���������ʅ�˅��ro����ӓ��م��؅�ԅ��ʓ������������ro�����ro����������Ʌ�������Гro�م��؅�ԅ��ʓ������������ro�����ro�������������������ʅ������م��څ��م����ro����ƅ�Ӆ��ʅ��������͓ro����������х���ד���������������������ro���х��څ����Յ�٤��������������������������������ro�������Ʌ��ʅ��������х���ד������������������������ro�����ro�����������ׅ��ʅ�ԅ����ޅ����ʑ���ʅ����ro������ׅ��څ����Ʌ����م���ׅ���Ѕ�ԓro�����ޅ��څ���х���م����Ӆ��ʅ��ޓ��������������ro�����ro��������ro�����ro�������������ԅ��څ���م�ԅ�����ʅ�٤ro��������������������������������ro���������Ʌ������ׅە���������������������������ro�����ro�������������ԅ��څ���م�ԅ�����ʅ�٤ro��������������������������������ro���������Ʌ����ތ؅��ׅ���Г������������������������ro�����ro�������������ԅ��څ���م�ԅ�����ʅ�٤ro��������������������������������ro���������Ʌ������ׅۗ���������������������������ro�����ro�������������ԅ��څ���م�ԅ�����ʅ�٤ro��������������������������������ro���������Ʌ��ʅ�����ƅ���Г������������������������ro�����ro�������������ԅ��څ���م�ԅ�����ʅ�٤ro��������������������������������ro���������Ʌ��ʅ��������х���ד������������������������ro�����ro����������������؅ƅ�����Ʌ�˅����ͅ�����؅���ro���ʅ�������Ʌ�Ӆ���ׅ������ޓro���х��څ����Ѕ�٤������������ro�������������ro�����������������̅��ro�������������ɡ�����������ro�����ro�������������ro���������������ןro�������������ɡ�����������ro�����ro�������������ro�����������������̅��ro�������������ɡ�����������ro�����ro�������������ro������������������̟ro�������������ɡ�����������ro�����ro�������������ro����������������Ɵro�������������ɡ�����������ro�����ro�������������ro�����������������Ԑ�ro�������������ɡ�����������ro�����ro�������������ro������������������ׅ��ro�������������ɡ�����������ro�����ro�������������ro�����������������̅��ro�������������ɡ�����������ro�����ro�������������ro��������������ʅ���ʟro�������������ɡ�����������ro�����ro�������������ro�������������������ɟro�������������ɡ�����������ro�����ro�������������ro��������������ʅ������؟ro�������������ɡ�����������ro�����ro�������������ro��������������Ʌ����ӟro�������������ɡ�������������������ro�����ro�������������ro����������������ޅ����ʟro�������������ɡ�����������ro�����ro�������������ro��������������څ����Пro�������������ɡ�����������ro�����ro�������������ro�������������ƅ�����ӟro�������������ɡ�����������ro�����ro�����������������̅��ro�����������ɡ�����������ro�����ro���������������ןro�����������ɡ�����������ro�����ro�����������������̅��ro�����������ɡ�����������ro�����ro������������������̟ro�����������ɡ�����������ro�����ro����������������Ɵro�����������ɡ�����������ro�����ro�����������������Ԑ�ro�����������ɡ�����������ro�����ro������������������ׅ��ro�����������ɡ�����������ro�����ro�����������������̅��ro�����������ɡ�����������ro�����ro��������������ʅ���ʟro�����������ɡ�����������ro�����ro�������������������ɟro�����������ɡ�����������ro�����ro��������������ʅ������؟ro�����������ɡ�����������ro�����ro��������������Ʌ����ӟro�����������ɡ�������������������ro�����ro����������������ޅ����ʟro�����������ɡ�����������ro�����ro��������������څ����Пro�����������ɡ�����������ro�����ro�������������ƅ�����ӟro�����������ɡ�����������ro�����ro������������ro�����ro�������������������������������������������������������������������������������������������ro���������������������ro�����ro������������������������������������������������������������������������������ro���������������������ro�����ro�����������������������������������������������������������������ro���������������������ro�����ro����������������������������������������������������ro���������������������ro�����ro��������������������������ro���������������������ro�����ro�������������ro���������������������ro�����ro���������������������ro�����ro���������������������ro�����ro�����������������������������������������������������������������ro���������������������ro�����ro����������������������������������������������������ro���������������������ro�����ro��������������������������ro���������������������ro�����ro�������������ro���������������������ro�����ro���������������������ro�����ro���������������������ro�����ro���������������������������������������ro���������������������ro�����ro��������������������������ro���������������������ro�����ro�������������ro���������������������ro�����ro���������������������ro�����ro���������������������ro�����ro��������������������������ro���������������������ro�����ro�������������ro���������������������ro�����ro���������������������ro�����ro���������������������ro�����ro�������������ro���������������������ro�����ro���������������������ro�����ro���������������������ro�����ro���������������������������������������ro���������������������ro�����ro��������������������������ro���������������������ro�����ro�������������ro���������������������ro�����ro���������������������ro�����ro���������������������ro�����ro��������������������������ro���������������������ro�����ro�������������ro���������������������ro�����ro���������������������ro�����ro���������������������ro�����ro�������������ro���������������������ro�����ro���������������������ro�����ro���������������������ro�����ro��������������������������ro���������������������ro�����ro�������������ro���������������������ro�����ro���������������������ro�����ro�������������ro���������������������ro�����ro���������������������ro�����ro���������������������ro�����ro�������������ro���������������������ro�����ro���������������������ro�����ro���������������������ro�����ro���������������������ro�����ro��������������������������ro���������������������ro�����ro�������������ro���������������������ro�����ro���������������������ro�����ro�������������ro���������������������ro�����ro���������������������ro�����ro���������������������ro�����ro�������������ro���������������������ro�����ro���������������������ro�����ro���������������������ro�����ro���������������������ro�����ro�������������ro���������������������ro�����ro���������������������ro�����ro���������������������ro�����ro���������������������ro�����ro�������������ro���������������������ro�����ro���������������������ro�����ro���������������������ro�����ro���������������������ro�����ro���������������������ro�����ro���������������������ro�����ro���������������������ro�����ro���������������������ro�����ro��������������������������ro������������؅��������ɟro���������������ro���܅��դ����������������ro�����ro������������؅��������ɟro���������������ro���܅��դ����������������
\ No newline at end of file
diff --git a/pre-edited-cs/data/Head.tsc b/pre-edited-cs/data/Head.tsc
deleted file mode 100644
index cc91004..0000000
--- a/pre-edited-cs/data/Head.tsc
+++ /dev/null
@@ -1 +0,0 @@
-S`\``=:lu~t=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:S`]``=:lv|]da``lv|zdb`aj`]`alv|zdc`aj`]`blu�u`]a`=:=:S`]`a=:lv|zdc`aj`]`clu�u`]a`=:=:S`]`b=:lv|[db`alu�u`]a`=:=:S`]`c=:lv|]db`alv|[da``lu�u`]a`=:=:S`]a`=:lv|zdb`bj`]aalv|zdc`bj`]ablv|zda``j`]aclu�u`]b`=:=:S`]aa=:lv|zdc`bj`]adlv|zda``j`]aelu�u`]b`=:=:S`]ab=:lv|zda``j`]aflv|[db`blu�u`]b`=:=:S`]ac=:lv|[db`blv|]da``lu�u`]b`=:=:S`]ad=:lv|zda``j`]aglv|]db`blv|[da``lu�u`]b`=:=:S`]ae=:lv|]db`blu�u`]b`=:=:S`]af=:lu�u`]b`=:=:S`]ag=:lv|zda``j`]ahlv|]db`blv|[da``lu�u`]b`=:=:S`]ah=:lu�u`]b`=:=:S`]b`=:lv|zdb`cj`]balv|zdc`cj`]bblv|zda``j`]bclu�u`]c`=:=:S`]ba=:lv|zdc`cj`]bdlv|zda``j`]belu�u`]c`=:=:S`]bb=:lv|zda``j`]bflv|[db`clu�u`]c`=:=:S`]bc=:lv|[db`clv|]da``lu�u`]c`=:=:S`]bd=:lv|zda``j`]bglv|]db`clv|[da``lu�u`]c`=:=:S`]be=:lv|]db`clu�u`]c`=:=:S`]bf=:lu�u`]c`=:=:S`]bg=:lv|zda``j`]bhlv|]db`clv|[da``lu�u`]c`=:=:S`]bh=:lu�u`]c`=:=:S`]c`=:lv|zdb`dj`]calv|zda``j`]cblu�u`]d`=:=:S`]ca=:lv|zda``j`]cclu�u`]d`=:=:S`]cb=:lv|[db`dlv|]da``lu�u`]d`=:=:S`]cc=:lv|]db`dlu�u`]d`=:=:S`]d`=:lv|zdb`ej`]dalv|zda``j`]dblu�u`]e`=:S`]da=:lv|zda``j`]dclu�u`]e`=:S`]db=:lv|[db`elv|]da``lu�u`]e`=:S`]dc=:lv|]db`elu�u`]e`=:S`]e`=:lv|zdb`fj`]ealv|zda``j`]eblu�u`]f`=:S`]ea=:lv|zda``j`]eclu�u`]f`=:S`]eb=:lv|[db`flv|]da``lu�u`]f`=:S`]ec=:lv|]db`flu�u`]f`=:S`]f`=:lv|zdb`gj`]falv|zda``j`]fblu�u`]g`=:S`]fa=:lv|zda``j`]fclu�u`]g`=:S`]fb=:lv|[db`glv|]da``lu�u`]g`=:S`]fc=:lv|]db`glu�u`]g`=:S`]g`=:lv|zd``ij`^``lv|zd`aij`^b`lv|zd`bij`^d`lu~t=:S`^``=:lv|zdb`aj`^`alv|]d``alu�u`^`b=:S`^`a=:lv|[d``alu�u`^`b=:S`^`b=:lv|zdb`bj`^`clv|]d``blu�u`^`d=:S`^`c=:lv|[d``blu�u`^`d=:S`^`d=:lv|zdb`cj`^`elv|]d``clu�u`^`f=:S`^`e=:lv|[d``clu�u`^`f=:S`^`f=:lv|zdb`dj`^`glv|]d``dlu�u`^`h=:S`^`g=:lv|[d``dlu�u`^`h=:S`^`h=:lv|zdb`ej`^`ilv|]d``elu�u`^a`=:S`^`i=:lv|[d``elu�u`^a`=:S`^a`=:lv|zdb`fj`^aalv|]d``flu�u`^ab=:S`^aa=:lv|[d``flu�u`^ab=:S`^ab=:lv|zdb`gj`^aclv|]d``glu�u`^ad=:S`^ac=:lv|[d``glu�u`^ad=:S`^ad=:lv|]d``ilu~t=:S`^b`=:lv|zdb`aj`^balv|]d`aalu�u`^bb=:S`^ba=:lv|[d`aalu�u`^bb=:S`^bb=:lv|zdb`bj`^bclv|]d`ablu�u`^bd=:S`^bc=:lv|[d`ablu�u`^bd=:S`^bd=:lv|zdb`cj`^belv|]d`aclu�u`^bf=:S`^be=:lv|[d`aclu�u`^bf=:S`^bf=:lv|zdb`dj`^bglv|]d`adlu�u`^bh=:S`^bg=:lv|[d`adlu�u`^bh=:S`^bh=:lv|zdb`ej`^bilv|]d`aelu�u`^c`=:S`^bi=:lv|[d`aelu�u`^c`=:S`^c`=:lv|zdb`fj`^calv|]d`aflu�u`^cb=:S`^ca=:lv|[d`aflu�u`^cb=:S`^cb=:lv|]d`ailu�u``ae=:S`^d`=:lv|zdb`aj`^dalv|]d`balu�u`^db=:S`^da=:lv|[d`balu�u`^db=:S`^db=:lv|zdb`bj`^dclv|]d`bblu�u`^dd=:S`^dc=:lv|[d`bblu�u`^dd=:S`^dd=:lv|zdb`cj`^delv|]d`bclu�u`^df=:S`^de=:lv|[d`bclu�u`^df=:S`^df=:lv|zdb`dj`^dglv|]d`bdlu�u`^dh=:S`^dg=:lv|[d`bdlu�u`^dh=:S`^dh=:lv|zdb`ej`^dilv|]d`belu�u`^e`=:S`^di=:lv|[d`belu�u`^e`=:S`^e`=:lv|zdb`fj`^ealv|]d`bflu�u`^eb=:S`^ea=:lv|[d`bflu�u`^eb=:S`^eb=:lv|zdb`gj`^eclv|]d`bglu�u`^ed=:S`^ec=:lv|[d`bglu�u`^ed=:S`^ed=:lv|]d`bi=:lv|]giiil���lv|[giii=:l}�z``ihlu~t=:S`_``=:lv|[d``ilv|[dc`alv|]dc`blv|]dc`c=:lv|zd``aj`_`alv|]db`alu�u`_`b=:S`_`a=:lv|[db`alu�u`_`b=:S`_`b=:lv|zd``bj`_`clv|]db`blu�u`_`d=:S`_`c=:lv|[db`blu�u`_`d=:S`_`d=:lv|zd``cj`_`elv|]db`clu�u`_`f=:S`_`e=:lv|[db`clu�u`_`f=:S`_`f=:lv|zd``dj`_`glv|]db`dlu�u`_`h=:S`_`g=:lv|[db`dlu�u`_`h=:S`_`h=:lv|zd``ej`_`ilv|]db`elu�u`_a`=:S`_`i=:lv|[db`elu�u`_a`=:S`_a`=:lv|zd``fj`_aalv|]db`flu�u`_ab=:S`_aa=:lv|[db`flu�u`_ab=:S`_ab=:lv|zd``gj`_aclv|]db`glu�u`_ad=:S`_ac=:lv|[db`glu�u`_ad=:S`_ad=:lu�u`]``=:S`_b`=:lv|[d`ai=:lv|zd`aaj`_balv|]db`alu�u`_bb=:S`_ba=:lv|[db`alu�u`_bb=:S`_bb=:lv|zd`abj`_bclv|]db`blu�u`_bd=:S`_bc=:lv|[db`blu�u`_bd=:S`_bd=:lv|zd`acj`_belv|]db`clu�u`_bf=:S`_be=:lv|[db`clu�u`_bf=:S`_bf=:lv|zd`adj`_bglv|]db`dlu�u`_bh=:S`_bg=:lv|[db`dlu�u`_bh=:S`_bh=:lv|zd`aej`_bilv|]db`elu�u`_c`=:S`_bi=:lv|[db`elu�u`_c`=:S`_c`=:lv|zd`afj`_calv|]db`flu�u`_cb=:S`_ca=:lv|[db`flu�u`_cb=:S`_cb=:lu�u`]``=:S`_d`=:lv|zd`cej````lv|zd`cdj`_ddlv|zd`ccj`_dclv|zd`cbj`_dblv|zd`caj`_da=:lv|[d`calu�u``ae=:S`_da=:lv|[d`cblu�u``ae=:S`_db=:lv|[d`cclu�u``ae=:S`_dc=:lv|[d`cdlu�u``ae=:S`_dd=:lv|[d`celu�u``ae=:S`_e`=:lv|[d`bilv|[dc`alv|]dc`blv|]dc`c=:lv|zd`baj`_ealv|]db`alu�u`_eb=:S`_ea=:lv|[db`alu�u`_eb=:S`_eb=:lv|zd`bbj`_eclv|]db`blu�u`_ed=:S`_ec=:lv|[db`blu�u`_ed=:S`_ed=:lv|zd`bcj`_eelv|]db`clu�u`_ef=:S`_ee=:lv|[db`clu�u`_ef=:S`_ef=:lv|zd`bdj`_eglv|]db`dlu�u`_eh=:S`_eg=:lv|[db`dlu�u`_eh=:S`_eh=:lv|zd`bej`_eilv|]db`elu�u`_f`=:S`_ei=:lv|[db`elu�u`_f`=:S`_f`=:lv|zd`bfj`_falv|]db`flu�u`_fb=:S`_fa=:lv|[db`flu�u`_fb=:S`_fb=:lv|zd`bgj`_fclv|]db`glu�u`_fd=:S`_fc=:lv|[db`glu�u`_fd=:S`_fd=:lu�u`]``=:S```^=:l�{]``dblu�u`_e`=:S```_=:lu~t=:S````=:lv|zgiiij```_lv|[giii=:l�{z``dbj```^l}�z``ihlu~t=:S```a=:l��yl}�wl���u����^l~tlu~t=:S```b=:lq}z```bj```cl��yl}�wl���lwy�```blq}[```bj````lv|[g```=:w��P���Pm�����P����mQl�qy``bel~tlu�u``ae=:S```c=:l��yl}�wl���lwy�``acl�q}```bj``acj````lv|[g``a=:m�����P����mP������P���Pm����mQl�qy``bel~tlu�u``ae=:S```d=:l��y=:l}�wl���lwy�```clv|[g``b=:w��P���Pmv�������mQl�qy``bel~tls|�=:lv|zbh`aj```flv|[bh`alq}[```cj````lu�u``ae=:S```e=:l��y=:l}�wl���lwy�```alv|[g``c=:w��P���Pm�����mQl�qy``bel~tls|�=:lv|zbh`aj```flv|[bh`alq}[```aj````lu�u``ae=:S```f=:l��yl}�wl������P���P�����P���Pmv�������m=:����P���Pm�����mP���P����]�����=:��P���P��������P��Pq�����W�Px����^l�qy``e`l~tlv|[bh`b=:ls|������P���ol�~z``aelq}z```aj``dcl�q}```cj```aj````lu�u``ae=:S```g=:l��yl}�wl���lwy�```glq}[```gj`a``lv|[bhb`lv|[g``d=:w��P���Pmr������mQl�qy``bel~tlu�u``ae=:S```h=:l��yl}�wl���lwy�```dlq}[```dj`a``lv|[g``e=:w��P���Pm}������Pw��mQl�qy``bel~tlu�u``ae=:S```i=:l��y=:l}�wl���lwy�```ilv|[g``f=:w��P���Pmr����mQl�qy``bel~tls|�=:lv|zbha`j``aalv|[bha`lq}[```ij````lu�u``ae=:S``a`=:l��y=:l}�wl���lwy�``ablv|[g``g=:w��P���Pm~������mQl�qy``bel~tls|�=:lv|zbha`j``aalv|[bha`lq}[``abj````lu�u``ae=:S``aa=:l��yl}�wl������P���P�����P���Pm~������m=:����P���Pmr����mP���P����]�����=:��P���P��������P��Pq�����W�Px����^l�qy``e`l~tlv|[bhaa=:ls|������P���ol�~z``aelq}z```ij``ddl�q}``abj```ij````lu�u``ae=:S``ab=:l��yl}�wl���lwy�a``fw��P�Pm|���Ps������mQl}|[```c=:}��P������P���������P��PcQl�qy``bel~tlv|[dc`alv|[dc`blv|]dc`clu�u``bh=:S``ac=:l��yl}�wl���lwy�a``fw��P�Pm|���Ps������mQl}|[```d=:}��P������P���������P��PdQl�qy``bel~tlv|]dc`alv|]dc0blv|[dc`clu�u``bh=:S``ad=:l��yl}�wl���lwy�a``fw��P�Pm|���Ps������mQl}|[```e=:}��P������P���������P��PeQl�qy``bel~tlv|[dc`alv|]dc`blv|[dc`clu�u``bh=:S``ae=:lu�u`_``=:S``af=:l��yl}�wl���=:t�P���P����P��P����ol�~z````lv|[`dcalv|]giiil���lv|[giiils|�w���P�����^l~tlu~t=:S``ag=:l��yl�q�lv|z`b`aj``ah=:l|y[a```l��``b`lqu[l}�w=:x�����P��������^l~tlu~t=:S``ah=:l��y=:l|y[a```l��``b`lqu[l}�w=:x�����P���P��������P��������^l~tlu~t=:S``ai=:l{u�l}�wl���=:t�P���P����P��P����ol�~z````lvq```dls}�````l�qy``b`ls|�l���^^^^^l~tls|=:l�qy``e`=:l|y[a```l��``b`l}�t```bl}�wl���=:x�����P��������^l~tls|l�}�lvqy```dlu~t=:S``b`=:lv|[`bgdly�[``adlv|ze``fj``bfl�~�`acfj````j````j````lu�u``ba=:S``ba=:lv|ze``dj``belv|ze``cj``bdlv|ze``bj``bclv|ze``aj``bb=:l��yl}�wl���lwy�a`adlv|[e``a=:w��P�Pm�����mQl�qy``bel~tlu�u``ae=:S``bb=:l��yl}�wl���lwy�a`adlv|[e``b=:w��P�P������Pm�����mQl�qy``bel~tlu�u``ae=:S``bc=:l��yl}�wl���lwy�a`adlv|[e``c=:w��P�P�����Pm�����mQl�qy``bel~tlu�u``ae=:S``bd=:l��yl}�wl���lwy�a`adlv|[e``d=:w��P�P������Pm�����mQl�qy``bel~tlu�u``ae=:S``be=:l��yl}�wl���lwy�a`adlv|[e``elv|[`eic=:w��P���P����Pm�����mQl�qy``bel~tlu�u``ae=:S``bf=:ls~�ebgdj`acfj````lu�u``ba=:S``bh=:lu�u`_b`=:S``bi=:lu�u`_d`=:S``c`=:l��ylv|zbdb`j``cblv|z`b`aj``calv|[`b`alv|[g``hlq}[```ej``a`l}�wl���=:lwy�```ew��P���Pm}������P|�������mQl�qy``bel~tlu�u``bi=:S``ca=:l��ylq}[```ej```el}�wl���=:lwy�```f}��P��������P���������P��PeQl�qy``bel~tlu�u``bi=:S``cb=:l��ylq}[``a`j```el}�wl���=:lwy�``aa}��P��������P���������P��PeQl�qy``bel~tlu�u``bi=:S``cc=:lv|[bdbalq}z```ej``cdlu�u``c`=:S``cd=:l��ylv|[bdb`lv|]bdbalv|[g``il}�wl���lwy�``a`l�q}```ej``a`j````=:����P}�������P����P����P�������P��Ql�qy``bel~tlu�u``ae=:S``ce=:l��ylv|[d`cflv|zbdb`j``cglv|z`b`aj``cflv|[`b`al}�wl���lwy�```elq}[```ej``bilv|[g``h=:w��P���Pm}������P|�������mQl�qy``bel~tlu�u``ae=:S``cf=:l��ylq}[```ej``bdl}�wl���lwy�```f}��P��������P���������P��PbdQl�qy``bel~tlu�u``ae=:S``cg=:l��ylq}[``a`j``bdl}�wl���lwy�``aa}��P��������P���������P��PbdQl�qy``bel~tlu�u``ae=:S``ch=:lv|zbdbaj``cdlu�u``c`=:S``d`=:l�{[``db=:l{u�ls}�````l�qy``d`l��yl�qy``d`ls}�```c=:l}�wl���=:���P����P����^l~tls|�����P��P�����ol�~z``dils|=:lvq```al�qy``e`lv|z`dcaj``dhly~y=:S``da=:l�{[``db=:l{u�ls}�````lx}sl�qy``d`l��yl�qy``d`ls}�```c=:l}�wl���=:���P����P�������^l~tls|�����P��P�����ol�~z``dils|=:lvq```al�qy``e`lv|z`dcaj``dhly~y=:S``db=:l�{[``db=:l{u�ls}�````l�qy``d`l��yl�qy``d`ls}�```c=:l}�wl���lx}s=:���P����P�����P����P�����^^^l~tls|�����P��P�����ol�~z``dils|=:lvq```al�qy``e`lv|z`dcaj``dhly~y=:S``dc=:l�q}```aj```cj````lu�u``ae=:S``dd=:l�q}```ij``abj````lu�u``ae=:S``dh=:l�}sl|t�=:S``di=:ls|lvq```dlu�s=:S``ea=:l��yl}�wl���lwy�a``aly�[```alv|[ga``=:w��Pmq�����W�P{��mQl�qy``bel~tlu�u``ae=:S``eb=:l��yl}�wl���lwy�a``bly�[```blu�[```blv|[ga`a=:w��P���Pm}��P������mQl�qy``bel~tlu�u``ae=:S``ec=:l��yl}�wl���lwy�a``cly�[```clv|[ga`b=:w��Pm�����W�P{��mQl�qy``bel~tlu�u``ae=:S``ed=:l��yl}�wl���lwy�a``dly�[```dlv|[ga`c=:w��P���Pm������P|�����mQl�qy``bel~tlu�u``ae=:S``ee=:l��yl}�wl���lwy�a``ely�[```elv|[ga`d=:w��P���Pmr����Pv���mQl�qy``bel~tlu�u``ae=:S``eg=:l��yl}�wl���lwy�a``gly�[```glv|[ga`e=:w��P���PmytPs���mQl�qy``bel~tlu�u``ae=:S``eh=:l��yl}�wl���lwy�a``hly�[```hlv|[ga`f=:w��P���Pmz��������Pz����mQl�qy``bel~tlu�u``ae=:S``ei=:l��yl}�wl���lwy�a``ily�[```ilv|[ga`g=:w��P���Pm�����P{��mQl�qy``bel~tlu�u``ae=:S``f`=:l��yl}�wl���lwy�a`a`ly�[``a`lv|[ga`h=:w��P���Pmw��P{��mQl�qy``bel~tlu�u``ae=:S``fa=:l��yl}�wl���lwy�a`aaly�[``aalv|[ga`i=:w��P���Pmw��Pr���mQl�qy``bel~tlu�u``ae=:S``fb=:l��yl}�wl���lwy�a`ably�[``ablv|[gaa`=:w��P���Pms�������mQl�qy``bel~tlu�u``ae=:S``fc=:l��yl}�wl���lwy�a`acly�[``aclv|[gaaa=:w��P���Pmu��������mQl�qy``bel~tlu�u``ae=:S``fd=:lu�u``b`=:S``fe=:l��yl}�wl���lwy�a`aely�[``aelv|[gaac=:w��P���Pm|���P���mQl�qy``bel~tlu�u``ae=:S``ff=:l��yl}�wl���lwy�a`afly�[``aflv|[gaad=:w��P���Pms���]q��mQl�qy``bel~tlu�u``ae=:S``fg=:l��yl}�wl���lwy�a`agly�[``aglv|[gaae=:w��P���Pms�����P{��mQl�qy``bel~tlu�u``ae=:S``fh=:ly�z``ahj``gc=:l��yl}�wl���lwy�a`ahly�[``ahlu�[```alv|[`gdblv|[gaaf=:w��P���Pmr������P�`^hmQl�qy``bel~tlu�u``ae=:S``fi=:l��yl}�wl���lwy�a`aily�[``ailu�[```dlv|[gaag=:w��P���Pmq���Pr������mQl�qy``bel~tlu�u``ae=:S``g`=:l��yl}�wl���lwy�a`b`ly�[``b`lu�[```hlv|[gaah=:w��P���Pm�����������mQl�qy``bel~tlu�u``ae=:S``ga=:l��yl}�wl���lwy�a`baly�[``balu�[``aflv|[bie`lv|[gaai=:w��Pms����W�Pq��P����mQl�qy``bel~tlu�u``ae=:S``gb=:l��yl}�wl���lwy�a`bbly�[``bblv|[gab`=:w��P���Pm~�������Ps������mQl�qy``bel~tlu�u``ae=:S``gc=:l��yl}�wl���lwy�a`bcly�[``bcly�]``ahlu�[``cblu�]```alv|[`gdclv|]`gdblv|[gaba=:w��P���Pmr������P�b^`mQl�qy``bel~tlu�u``ae=:S``gd=:ly�[``bdlu�[``fdlv|[a`b`lv|[gabb=:l��yl}�wl���lwy�a`bd=:w��P���Pm}�����P}���mQl�qy``bel~tlu�u``ae=:S``ge=:l��yl}�wl���lwy�a`bely�[``belv|[gabc=:w��P���Pm����������P����P{��mQl�qy``bel~tlu�u``ae=:S``gf=:l��yl}�wl���lwy�a`bfly�[``bflv|[gabd=:w��Pm���W�P|�����mQl�qy``bel~tlu�u``ae=:S``gg=:l��yl}�wl���lwy�a`bgly�[``bglv|[gabe=:w��P���Pms���������mQl�qy``bel~tlu�u``ae=:S``gh=:l��yl}�wl���lwy�a`bhly�[``bhlv|[gabf=:w��P���Pmr�����P���������mQl�qy``bel~tlu�u``ae=:S``gi=:l��yl}�wl���lwy�a`bily�[``bilv|[gabg=:w��P���Pm���������mQl�qy``bel~tlu�u``ae=:S``h`=:l��yl}�wl���lwy�a`c`ly�[``c`lv|[gabh=:w��P���Pm���P����mQl�qy``bel~tlu�u``ae=:S``ha=:l��yl}�wl���lwy�a`caly�[``calv|[gabi=:w��P���Pms���Pv�����P}����mQl�qy``bel~tlu�u``ae=:S``hb=:l��yl}�wl���lwy�a`cbly�[``cblv|[gac`=:w��P���Pm|�����P}��mQl�qy``bel~tlu�u``ae=:S``hc=:l��yl}�wl���lwy�a`ccly�[``cclv|[gaca=:w��P���Pm}�������Pr����mQl�qy``bel~tlu�u``ae=:S``hd=:l��yl}�wl���lwy�a`cdly�[``cdlv|[gacb=:w��Pm}�P������mQl�qy``bel~tlu�u``ae=:S``he=:l��yl}�wl���lwy�a`cely�[``celv|[gacc=:w��Pms����W�P���������mQl�qy``bel~tlu�u``ae=:S``hf=:l��yl}�wl���lwy�a`cfly�[``cflv|[gacd=:w��P���Pmq����P}����mQl�qy``bel~tlu�u``ae=:S``hg=:l��yl}�wl���lwy�a`cgly�[``cglv|[gace=:w��Pms����W�P|�������mQl�qy``bel~tlu�u``ae=:S``hh=:l��yl}�wl���lwy�a`chly�[``chlu�[`abhlv|[`gbblv|[gacf=:w��P���Pm���������P����mQl�qy``bel~tlu�u``ae=:S``hi=:l��yl}�wl���lwy�a`cily�[``cilv|[gacg=:w��P���Pmy���Pr���mQl�qy``bel~tlu�u``ae
\ No newline at end of file
diff --git a/pre-edited-cs/data/ItemImage.bmp b/pre-edited-cs/data/ItemImage.bmp
deleted file mode 100644
index 8809f19..0000000
Binary files a/pre-edited-cs/data/ItemImage.bmp and /dev/null differ
diff --git a/pre-edited-cs/data/Stage/Cent.tsc b/pre-edited-cs/data/Stage/Cent.tsc
deleted file mode 100644
index 17287fc..0000000
--- a/pre-edited-cs/data/Stage/Cent.tsc
+++ /dev/null
@@ -1 +0,0 @@
-B?XeeneB?q��vqx��eegiq{v~eeeeqz�yB?XeenfB?q��vqx��eegiq{v~eeefqz�yB?XeengB?q��vqx��eegiq{v~eeegqz�yB?XeenhB?q��vqx��eegiq{v~eeehqz�yB?XeeniB?q��vqx��eegiq{v~eeeiqz�yB?XefeeB?q�z�q���eeffqv��efeeoeeeeoeeegq{v�eeegq��veejjoeengoeeehoeeenB?XeffeB?q�z�q{v�eeegq��veejloeengoeeejoeefiB?XeffjB?q�z�q���eeffqv��effjoeeeeoeeegq{v�eeegq��veejloeengoeeehoeeegB?XefgeB?q��~q{�ffejoefggq��|q�������\�U���U��������tq��yq~�eegkoefgfqz�yB?XefgfB?q��|q���B?W��������U��������Wcq��yqx��B?q�z�q���eeffqv��efgeoeeeeoeeegq{v�eeehq��veejmoeenhoeeenoeeeiB?XefggB?q�z�q���eeffqv��efgeoeeeeoeeegq{v�eeehq��veejmoeenhoeeenoeeeiB?XefheB?q�z�q���eeffqv��efheoeeeeoeeegq{v�eeeeq��veejnoeeneoeegkoeeemB?XefhjB?q��~B?q{�feghoefhlB?q~�eegjoefhkB?q��|q���~�U����UW��Uz����Wcq��yB?v��U��\�U������cq��yqz�yB?XefhkB?q���eeggq��|q���q|~�fegj����U���Ur����������U����U���rcq��yqx��q~�beegjB?q|~�eeeeq{�`feghqz�zefhlB?XefhlB?q�z�q���eeffqv��efhjoeeeeoeeegq{v�eeeeq��veekeoeeneoeefmoeeenB?XefieB?q�z�q{v�eeeeq��veekfoeeneoeegnoeeenB?XefjeB?q��~q{�feheofheeq{�kieeofheeq��|~�\�U�����U���U�����U��U����B?����cccq��yqz�yB?XefjfB?q�z�q���eeffqv��efjeoeeeeoeeegq{v�eeegB?q~�eeghoefkeB?q�z�q��veekhoeengoeeeloeejgB?XefkeB?q�z�q��veekloeengoeeeloeejgB?XefleB?q�z�q{v�eeegq��veemioeengoeeefoeegfB?XefnnB?q���eelioeelnqz�yB?XegeeB?q��~q{�fegeoegefB?qz�zegnnB?XegefB?q��~q��|q������U�������U��������U���U��������B?��U������U��U��aU��U��\��U�������B?���U�������U��U�������cq��yqx��~�U����U���Uy�����U����U��B?����aU�����U�������U������B?�����U����aU��U����cq��yqz�yB?XegfeB?q��~q{�fegeoegffB?qz�zegnnB?XegffB?q��~q��|q�������U���U���U�������U��U���B?����aU�����U������U������\��U��B?�U�����U��U����Vq��yqx��w����U����aU��U�������U��������Vq��yqz�yB?XeggeB?q��~q{�fegeoeggfB?qz�zegnnB?XeggfB?q��~q��|q�������U����U���Uy�����Vq��yqz�yB?XegheB?q��~q{�fegeoeghfB?qz�zegnnB?XeghfB?q��~q��|q���|��U��U����Vq��yqz�yB?XegieB?q��~B?q{�fehloegigB?q{�fegeoegifB?qz�zegnnB?XegifB?q��~q{�`fehlq��|q������cq��yqx�����\��U���U����aU����\�U��cq��yB?qx��~U���U���\��U�����U��������aB?�����U������U��U���U�������B?����U���U��U�U������cq��yqx������aU����U��������cq��yB?y��\�U���U��������U�����cq��yB?qx��~�U���U���U����U���U���B?������aU����\��U�����U���B?��U������cq��yqx��v�U����U��U���U����U����U��B?���U�������aU���\��U��U����aB?���U���\��U���U��U���cq��yqz�yB?XegigB?q��~q��|q���}��\�U���U����U����\tq��yqx������U���U����aU��\��U��B?����U��U���U����aU��������B?����U��U��U����cq��yqx��ccc~U����aU��U����aU���\�U��tq��yqz�yB?XegjeB?q��~B?q~�eegnoegjiB?q{�fegnoegjhB?q{�fegeoegjgB?q��~q��|q������aU�����U����������U����cccq��yqx��������cB?���U��������U��U����U��U������cq��yqz�yB?XegjfB?q��~q��|q��������U����������U���U�����aU���B?����U����U�����U���U���U����cq��yqz�yB?XegjgB?q��~q{�`fegnq��|q���~�U������U�����Vq��yqx��cccccq��yqx��}��aU���cB?���\��U���U���U���aU�����tq��yB?qx��|�U����U����U������U���������B?��U���U��������U��U���U�U���B?���cq��yqz�yB?XegjhB?q��~q��|q���}����U��U��VU���U������U����B?���U�������U�������cq��yB?qx��|�U����U����U������U���������B?��U���U��������U��U���U�U���B?���cq��yqz�yB?XegjiB?q��~q��|q���~�\�U���U���U�������U����B?����U��U��������U��������Vq��yB?qx����U�������U���U����U��������B?��U��U���U�����cq��yB?qx����U���U����U��U������U���U������B?����\�U����U��U���U������Vq��yqx��}��b���b���cccq��yqx��w����aU������U�������cccq��yB?�����U��U����aU~\�U�������B?�U���U����U��U�������cq��yqz�yB?XegkeB?q��~q�v�B?q{�feghoegkhB?q{�feggoegkgB?q{�fehjoegkfB?q{�`fehjB?q��|~U������U���������U�����B?����U���cq��yB?~�\�U��U���U������U�����cq��yqz�yB?XegkfB?q��~q��|~�\�U��U���U������U�����cq��yqz�yB?XegkgB?q��~q��|�����U����U����U���U��aU~U������tq��yqx�����\�U�����U��\�U�����B?��U����U���������U������U����cccq��yqx�����aU~\�U������cccq��yqz�yB?XegkhB?q��~q��|~\�U���U��������Uv���}~�|cq��yqz�yB?XegkjB?q��~B?q{�feggoegklB?qz�zegkkB?XegkkB?q{�`feggB?qz�zegkmB?XegklB?q��~q��|q����������U��U����U�������cccq��yqz�yB?XegkmB?qz�zeeljB?XegnnB?q��~q��|cccccq��yqz�yB?XeheeB?XehefB?XehfeB?qz�zeeeeB?XehffB?q��~q��|{����U����U���U�����U��U���B?������cq��yB?qx������U���U�����\�U����U��������B?���U���U��cccq��yqx�����U�U�����U��U����aU~U�����cq��yq{�`feiiqz�zehfgB?XehfgB?q��~q��|���U����U���U�������U��cccq��yB?�����\�U�U�������U����U��B?��������aU~\�U����aq��yqx������U������U����U��������B?����U���U���U��cccq��yB?������U��U��\�U����U��U���tq��yqz�yB?XehfhB?q��~q��|����\�U����tB?}��U��������U���U����tq��yB?qx������cU�����U��U������U���B?���U���cq��yqz�yB?XehgeB?q��~q�v�B?q{�feikoehgjB?q{�feijoehgiB?q{�fegeoehgfB?q{�`feifq��|q{vxeeg5���cccU���U���ccctq��yq~�eehioehggqz�yB?XehgfB?q��~q��|q{vxeegj��cccq��yB?���\��U��U����cccq��yqx��y��\�U��U���U���cq��yB?v��U�����U���U���U���B?���U������cccq��yq~�eehioehggqz�yB?XehggB?q��~q{vxeeeeq��|q���q|~�fehiq~�beehiqx��eeeeqx��q{�`feikB?�����U��U����Ux����\�U�����cq��yqx��qx��q�v~eejeqz�beekiq�v~eejeB?q{�`feijq���q{�fegeoehghqz�zehgiB?XehghB?q��~qz�`eekiqz�zehgiB?XehgiB?qz�zeemnB?XehgjB?q��~q��|q{vxeefn~\�U����U���cq��yqz�yB?XehjeB?q��~q��|q���y�U���U����U��U����U���B?������tq��eeeeqx��B?qv��ehjeoeefeoeeeeqz�yB?XehkeB?q��~q��|q���q{vxeegm~\�U����Vq��yqx����U���U��U������B?�������aU���U����tq��yqx��v��U������aU���U������B?������\�U��U��������B?�������U��U����Vq��yqx��w�U���U���cccq��yqx��~�U���U������U���Uy�����aq��yqx����U���U�����U~\��U��B?����U��U������U�U�����B?�����ccctq��yqz�yB?B?XehleB?q��~q�v�q��|q{vxeeggv��U���U�����U��U����U��U���B?������U����tU���\�U���cccq��yqz�zehlfB?B?XehlfB?q{�keehoehmeB?q{�gmeeoehlhB?q��~q��|q{vxeegg�����U����U���U�����U����U��B?����U��U��������cq��yqx��q~�eeeloehlgq|~�feelB?q��|q{vxeeggq|~�feel���U�����U����U��U����U���B?r~yUx���rcq��yqx��B?q{�keefoehliq{�keegoehliq{�keeioehliqz�zehnnB?XehlgB?q��~q��|q{vxeeggq|~�feel|���aU���\��U�����U���B?r~yUx���rcq��yqx��B?q{�keefoehliq{�keegoehliq{�keeioehliqz�zehnnB?XehlhB?q��~q��|q{vxeegg�����U����U���\��U�������B?�����U��U��������cq��yB?q{�keefoehliq{�keegoehliq{�keeioehliqz�zehnnB?B?XehliB?q~�eeghoehljB?q��~q��|q{vxeeggq|~�fegh���U�����U����U��U����U���B?rw������Ugcercq��yqz�zehlkB?XehljB?q��~q��|q{vxeeggq|~�fegh|���aU���\��U�����U���B?rw������Ugcercq��yqz�zehlkB?B?XehlkB?q~�eehnoehllB?q��~q��|q{vxeeggq|~�fehn���U�����U����U��U����U���B?r~���Uw���rcq��yq{�keegoehlmq{�keeioehlmqz�zehnnB?XehllB?q��~q��|q{vxeeggq|~�fehn|���aU���\��U�����U���B?r~���Uw���rcq��yq{�keegoehlmq{�keeioehlmqz�zehnnB?B?XehlmB?q��~q��|q{vxeeggq|~�feej}���U���U��������U���U��U���B?������tU����U�U����U��U����B?rw����U{���rU��U��U����cq��yq{�keeioehlnqz�zehnnB?B?XehlnB?q��~q��|q{vxeegg}���U���U�����U���U��U���B?�����tU���\��U����UkkU��B?�����U���U������U����cq��yqx��q|~�feegvUr���U������rU���B?����U���cq��yqz�zehnnB?B?XehmeB?q��~q��|q{vxeegg�����U���U���\�U��U����U��B?�����U���U������U����cUv��B?���U�����U����U�����tq��yqz�zehnnB?B?XehnnB?q��~q��|q{vxeeggv��U����\�U���cq��yB?qx��y�������U�����U��U��U�B?����U��U���U������U����cq��yqx�����U������U��U����U��B?���U�����U�����U���B?������cq��yqz�yB?XeieeB?q��~q{�ffegoeiefq��|q���~�\�U�������U���U�����B?��U�U�����������U����cq��yqz�yB?XeiefB?q��~q��|q���}��VU��U����U����U����Vq��yqz�yB?XeifeB?q��~q{�ffegoeiffq��|q���~�\�U�������U���U�����B?��U�U�����������U����cq��yqz�yB?XeiffB?q��~q��|q���}��VU��U����U����U����Vq��yqz�yB?XeifjB?q��~q{�gieloeeefq{�fegeoeifkq��|q���}��VB?y��\�U�����U����aU�����Vq��yqz�yB?XeifkB?q��~q{�gieloeeefq{�`gielq���eeggqx��eifjoeegfoeeeeqz�zeiflB?XeiflB?qz�zeelmB?XeijeB?q��~q{�feieoeijfq{�`feieq��|q�������U����U��U���Vq��yqx��q~�eefjoeijgB?q|~�fefjq~�`eefj|��U�Ur����U���rVq�v~eegjq��yq|~�eeeeqz�zeijgB?XeijfB?q��~q��|q�����U���\��U�����U��U�����B?���Uy�����tU|���U����VB?��U����U����U����U���U���Vq��yqx����aU����aU���U����Ux����U~B?����U��Vq��yqz�yB?XeijgB?qz�zeefiB?XeikeB?q��~q��|q��������U���U���U|������VU]����oB?�����U���U���U����U��U���������B?��U��U��U�����U���U����c^q��yqz�yB?XeimeB?q�z�q}�xB?q{��eimfoeefkB?q���eimfoeehioeffmoeeeeB?qv��eimfoeegeoeeegq�v~ehgeB?qv��eimfoeeeeoeeeeB?q���eelhoeffeq��xq��weeegq{��eefkqz�yB?XeimfB?XejeeB?q��~q���eeggqy��ejeeqz�zejefB?XejefB?qz�zeefhB?XfgeeB?q�z�qv��fgeeoeegeoeeeeB?q{��fgeeoeefkq{v~eeefB?q�v~efeeq{v�eeefq{��q�v~egeeq��veenfoefeeoeeefoeeefB?B?B?XfheeB?q{�keehoefjfB?q{�gmeeofhefqz�zfhnnB?B?XfhefB?q{�keeeoefjfB?q~�eeghofhegqz�zfhnnB?B?XfhegB?q~�eehnofhehqz�zfhnnB?B?XfhehB?q{�keefoefjfB?q{�kfeeofheiqz�zfhnnB?XfheiB?q{�kfefofhejqz�zfhnnB?XfhejB?q{�kfegofhekqz�zfhnnB?XfhekB?q{�kfehofhelqz�zfhnnB?XfhelB?q{�kfeiofhemqz�zfhnnB?XfhemB?q{�kfejofhenqz�zfhnnB?XfhenB?q{�kfekofhfeqz�zfhnnB?XfhfeB?q{�kfelofhffqz�zfhnnB?XfhffB?q{�kfemofhfgqz�zfhnnB?XfhfgB?q{�kfenofhfhqz�zfhnnB?XfhfhB?q{�kffeofhfiqz�zfhnnB?B?XfhfiB?q{�kffgofhfjqz�zfhnnB?XfhfjB?q{�kffhofhfkqz�zfhnnB?XfhfkB?q{�kffiofhflqz�zfhnnB?B?XfhflB?q{�keegoefjfqz�zfhfmB?XfhfmB?q{�ieelofhfnqz�zfhnnB?B?XfhfnB?q{�ieegoefjfq{�ieefofhgeqz�zfhnnB?B?XfhgeB?q{�fhgeofhnnqz�zefjfB?XfhnnB?q{�fhgeofieeB?q��~q��|~�\�U�����U���U�����U��U����B?����cccU������U���U����U���U�����\������cUz����U������tq��eeeeqz�zefjfB?XfieeB?q��~q��|~�\�U�����U���U�����U��U����B?����cccB?z����U������tq��eeeeqz�zefjf
\ No newline at end of file
diff --git a/pre-edited-cs/data/Stage/CentW.tsc b/pre-edited-cs/data/Stage/CentW.tsc
deleted file mode 100644
index 96dfa43..0000000
--- a/pre-edited-cs/data/Stage/CentW.tsc
+++ /dev/null
@@ -1,2 +0,0 @@
--::C:FWXKFMW_::::FPKS::::FOXN-::C;FWXKFMW_::::FPKS:::;FOXN-::C<FWXKFMW_::::FPKS:::<FOXN-::C=FWXKFMW_::::FPKS:::=FOXN-::C>FWXKFMW_::::FPKS:::>FOXN-::C?-::CCFUOcFWXKFMW_::::FKXZ:;?:D:::;D::::FPKS:::>FMXZ:=:;D:;;<D:::<FaKS:;::FKXZ:;?:D::::D::::FWcN:::<FNXZ:=:;F]WMFOXN-:;::FZ\SF]K^FPVT;:<=D:;:<FS^T::<?D:;:;FW]QS~1}*vymuon8FXYNFOXN-:;:;F]Y_::<<FW]QF^_\FQS^;:<?_}on*~ro*G^ovozy|~o|*\yyw*Uo�G8FXYNFMVYFS^7::<?FQS^::::FPV5;:<=FO`O:;:<-:;:<FUOcF]Y_::;;FKXZ:;::D::::D:::<FPKY:::<F^\K::?@D::C<D:::;D:;:=
--:;?:FUOcF]K^FPVT;;>:D:;?<FS^T::<?D:;?;FPVT;:<=D:;?;FO`O:;?<-:;?;FUOcFW]QNy*�y*�kx~*~y*qy*~y*K|~r|1}ry}oIFcXT::::FMVYFPV5;:B<FPV5;;>:FZ]5:::?D@::?FWcN:::<FKXZ:<?:D::;:D::::FaKS::@:FMXZ:<@:D:;?:D::::FRWMFKXZ:<@:D::;:D::::FaKS::?:FPKY:::=FaKS:;::F]WMFPVT;;>;D:;?<FPV5;;>;F^\K::?AD:<<:D::;;D::;>-:;?<FZ\SFW]QNy*�y*�kx~*~y*qy*~y*K|~r|1}ry}oIFcXT::::FMVYFZ]5:::?D@::?FUOcFMXZ:=::D:;;;D:::<FRWMFaKS::@:FKXZ:;?:D:::;D::::FaKS:;::FPKY:::>F^\K:::;D::CCD:::?D:::B-:<?:FUOcFW]Q88888FXYNFOXN-:<@:-:=::-:=:;
\ No newline at end of file
diff --git a/pre-edited-cs/data/Stage/CurlyS.tsc b/pre-edited-cs/data/Stage/CurlyS.tsc
deleted file mode 100644
index c369227..0000000
--- a/pre-edited-cs/data/Stage/CurlyS.tsc
+++ /dev/null
@@ -1 +0,0 @@
-0-FSS\S0-_pqd_fpxSSSS_idlSSSS_hqg0-FSS\T0-_pqd_fpxSSSS_idlSSST_hqg0-FSS\U0-_pqd_fpxSSSS_idlSSSU_hqg0-FSS\V0-_pqd_fpxSSSS_idlSSSV_hqg0-FSS\W0-_pqd_fpxSSSS_idlSSSW_hqg0-FSS\[0-_dpmSSSU]SSSS_dpmSSSW]SSSS_dpmSSSX]SSSS0-_dpmSSS\]SSSS_dpmSSTS]SSSS_dpmSSTU]SSSS_dpmSSTV]SSSS0-_fqsSXSS]SUTY]SSSS_pqsSXSS]SSSY]SSS\]SSSS_hqg0-0-FSTSS0-_sul_vrxSSTT_gqsSTSS_idrSSSW_wudSSU\]SS\W]SSSY]SSS\0-#SWSS0-_sul_vrxSSUU_gqsSWSS_hyhSWST0-FSWST0-_hyhSSUS0-FSWUS0-_nh|_gqsSWUS_hyhSWUT0-FSWUT0-_hyhSS[X0-FSXSS0-_pvj_wxuo����C����C���J��C��C�C�����QCz���0-����C�������OC���C�����C��C�����Q_qrg0-j�C����C��C���C�����b_zdlSSWS_|qmSSSS_for0-_olNTSSS_vrxSSUS_dhN0-_iomYUST]SXST0-_iomYUSU]SXSU0-_wudSSTV]SS\T]SSTS]SSS[0-0-FSXST0-_wudSSST]SS\W]SSS[]SSSW0-0-FSXSU0-_wudSSWS]SS\W]SSTW]SSS\0-
\ No newline at end of file
diff --git a/pre-edited-cs/data/Stage/Jenka1.tsc b/pre-edited-cs/data/Stage/Jenka1.tsc
deleted file mode 100644
index 7f0791e..0000000
--- a/pre-edited-cs/data/Stage/Jenka1.tsc
+++ /dev/null
@@ -1 +0,0 @@
-|y�����|y�������ğ���������������|y�����|y�������ğ���������������|y�����|y�������ğ���������������|y�����|y�������ğ���������������|y�����|y�������ğ���������������|y�����|y��������������������������|y���������������������������������������|y���������������������������������������������|y|y�����|y�����¾ğ������������������������������������������|y�����|y���ȫ�¶����������ޏ��ԏ��䝝������|y���ԏ��������ݏ���|y�����ӏ�����ԝ����|y�Տ�������֏�ԏ��|y���ԏ���à����������⬛����������Ŵ����|y�����|y��Ŵ����|y�����|y���ȫ�¶������������ۏ�������㝝�����|y����ӏ������ӏ�����|y������ԏ����ޏ���ӏ���|y�����������������᮫�������|y�����|y���ȫ�¶������������ԏ���ԏ���㝫���|y���ӏ���ڝ��������|y�����|y���ȫ�¶��������������ڏ���������|y���ԏ����ݏЏ������|y�ޏ��䝫���������ޏ���ԏ�ޏ�ޝ����������|y�����|y���ȫ�¶����������ԏ���ԏ�ޏ�ޝ������|y�����������׏��������|y������ݏ��ԏ��ӏ������❫�������|y�����|y���ȫ�¶�����������蛏�������ڝ�����������à��������������ӏ��ԏ��|y������������❫�������|y���ß����������������������������������������ԏ�����ԏ�����謝���������������������������ܝ������|y����ԏЏ�����������|y��ԏ������ԛ����ݖ���䝫�������������������������ݖ����֏��ޏ����|y���������Տ����������|y������ԏ�ޏ���������ӝ����|y��������⏼��������������|y�����������❫���|y����ӏ��ԏ���������|y����ӏ�ޏ����������ܝ���������������ӛ���ԏ�������|y��������������ӏ���|y��������ݏ��ӏ������⛫���|y��ӏ�ݏ��������������|y���ԏ����ݏ�ޏ������|y���ڏ���������ԏ�����❫���������ӏ��ԏ��ӏ����������|y������ӛ���ԏ������������|y���ԏ�������ӏ�������諽��|y���܏��ԏ�����ӝ��������������ԏ���ԏ���㝫������ӏ���ڝ����������������|y�����|y���ȫ�¶�����������ם�����������à�����⛏��❫���|y�����������������ԏ��|y��������֏������❫�������|y���ß����������������������������������������ԏ�����ԏ�����謝����������������������������ڏ���������|y�Ԗ�ԏ�ߏ�o�����ԏ��杝�������������������������ԏ����������ݏ�|y�������ӏ�����Ю����������ԏ�������ӏ������������|y������ԏ��ӏ�������|y����ӏ��������܏�������ם����|y������ԏ���ܛ���ӏ����|y������������ԏ�����❫�������|y������᝝����������ޏ�����������|y�������ӏ�ޏ����|y���������⮫������������������������Џ��ӏ���ԝ������|y��ԏ������ӏ�������|y�����������ԏ�ޏ�������|y�������ݏ������⛫���|y����������ӏ��������|y����ԝ����|y�Տ��������ԏ�ޏ��|y������ӛ��������������|y�ޏ��ԏ������ԛ����|y����ԏ���������ԝ���������ݏ�����Տ���������|y������������ӏ����|y��ԏ����ם������|y�Տ�������ԏ���ԝ�����������ޏ������������ӏ��殫���|y�ޏ������������ӏ���|y�����������ԏ���|y���������Ԯ�����������������������ޏ���ԏ�ޏ�ޝ������������������|y�����|y���ȫ�¶���������������܏�ޏ����|y����ԏ��䝫���|y�����������ݖ������|y�������������ݏ��|y��ӏ����❫����������à������������❝���������|y���ß��������������ԏ�����ԏ�����謝������������������������������������������|y�������������������������ԏ��������|y���������ԏ��蛏���ݖ�|y��䝫���|y������ݏ��ԏ��ԏ�������|y��ԏ��ӏ������❝�������������ݖ����ԏ��ޏ���|y��ԛ�����ԏ����������|y��ԏ��蝫���|y�ޏ���ݏ��ԏ����������|y����ӏ�����ԏ��������|y���������ۏ��������ݝ������������ԛ���ޛ�����ԝ��������������Ԗ��������|y���㝫���������������|y�����|y�����������������|y�����|y�����������������|y�����|y�����������������|y�����|y�����������������|y�����|y�����������������|y�����|y���ȫ�¶��Ր��������|y�����|y���ȫ�¶��Տ��Ր��������|y�����|y���ȫ�¶��Տ��Տ��Ր��������|y�����|y���ȫ�¶����ߝ��������|y�����|y���ȫ�¶���Ԑ��������|y�����|y�����|y�����|y��¶������������ԏ����ԏ�ݏЏ����ם�����|y����������⛏���������ԏ����ڝ����|y�ޏ���ڏ�ޏ��ԏ����㮫ư������Ƚ���������|y���������¾ğ�������|y�������������|y�������������|y�����������������������|y|y�����|y�����������������������|y|y�����|y�����������������������|y
\ No newline at end of file
diff --git a/pre-edited-cs/data/Stage/Lounge.tsc b/pre-edited-cs/data/Stage/Lounge.tsc
deleted file mode 100644
index b99a888..0000000
--- a/pre-edited-cs/data/Stage/Lounge.tsc
+++ /dev/null
@@ -1 +0,0 @@
-ro�����ro������������������������ro�����ro������������������������ro�����ro������������������������ro�����ro������������������������ro�����ro������������������������ro�����ro���������������������������������������������������ro�����ro����ro�������������ro��������ro�����ro����ro�������������ro�������������ro��������ʅ��ʅ���������ؓ����ro���ޅ����Ѕ��х��ʅ���ʑ���څ��ʓ����ro�ԅ�ʌ�ʅ�����؅����ƅ���ʅ����ro�˅��܅���؅����ޓ��������ro�����ro�����������������������������������������Ʌ���ׅ��ʅ�������ro��������ע���������������������ro�����ro����������������؅���ʅ�ʅ��Ʌ���م������ro���������ؓ����������ro�����ro��������ro�����ro����ro�������������ro�������������ro��������ro�����ro�����ٌ؅���ʅ���م�����؅����ro��ʅ������ʅ���ʅ��������ro���؅�����Ʌ�Ӆ��ʅ���ٓ����ro��Ʌ�����܅���ޅ�˅�؅����ro�����ɓ������ro��م���ʅ����̅����ʅ������ro���������Ʌ�����͓����ro��������ʅ���ޑ���ԑ���Ʌ����ؓ����������ro�����ro��������e����م�����׆���������������̅���م���ׅ����̅�����ro��˅���ͅ��҆����ro�͑��˅���ޅ�����ʅ��مƅ���ro������ד������ro���ͅƅ����ʓ����������ro�����ro�����������������ro��������ro�����ro��������ӌم������ʅƅ���Ʌ����ro�����ׅ���؆�������������ؤ����͆����ro���ʅ���ٌ؅�������Ʌ�ԅ����ʅ�ʓ��������ro�����ro�����������������ro��������ro�����ro������҅�ԅ��������ɓ����������ro�����ro���������������������͑���ޓ������������ӌم�ʅ��م�����ʤ����ro���͑����Ѕ�م��ʅ������ro������ʓ����ro������ʅ�����Ʌ������އ���������ro�ʅ�Յ��Ʌ������م�ʅ���ʓ����ro��م��ӑ������ʅ������̓������������؅���م������̅��م�ԅ��ro������̅��ׅƅ�����ʅ�˅���ʓ���������ԅ��څ���ʅ�ԅ���ͤ����ro���ё���ʅ��څ�����Ʌ����ד��������ro������������������������������������������ro��������������������������ro����������������������������������������������������ro������������������������������������������������������ro�����ro�����ro���������������������
\ No newline at end of file
diff --git a/pre-edited-cs/data/Stage/Mapi.tsc b/pre-edited-cs/data/Stage/Mapi.tsc
deleted file mode 100644
index 5519ec4..0000000
--- a/pre-edited-cs/data/Stage/Mapi.tsc
+++ /dev/null
@@ -1 +0,0 @@
-;8Q^^g^;8j{|ojq{�^^^^jtow^^^^js|r;8Q^^g_;8j{|ojq{�^^^^jtow^^^_js|r;8Q^^g`;8j{|ojq{�^^^^jtow^^^`js|r;8Q^^ga;8j{|ojq{�^^^^jtow^^^ajs|r;8Q^^gb;8j{|ojq{�^^^^jtow^^^bjs|r;8;8Q^_^^;8jys�jtzx_cdbh^_^_j�}�^^__jo|~^_^^h^^^^h^^^`;8jto}^^^bj��o^^_dh^^gbh^^a`h^^^`;8Q^_^_;8j~�wj{�uw�N���U�N����Oj|}rjs|r;8Q^`^^;8jtzx`b^dh^^^_jtzx_cdbh^_^_jtzx_^b`h^`^_;8jys�j{�p^^^`j�ow^^`^;8j{�uj���v��\j|}r;8����N�����U�N����N���N������;8����N�������\j|}rjqz����N�����N��ZN�����mj|}rjqz}js|r;8Q^`^_;8j~�wjtzx`b^dh^^^_jtzY`b^dj�}�^^``jq|~^`^^h^^`_h^^^^js�s^`^`;8Q^`^`;8js�s^^fa;8Q^b^^;8jys�j{�p^^^`j�ow^^`^;8jw�x^^aah^b`^;8jtzx_cd`h^b__;8jtzx_cd_h^b^aj{�u���N���N����N��������N����N��mj�|x^b^_jqz�v��Oj|}r;8wN�����N����\j|}rjs|r;8Q^b^_;8jys�j{�uv��[���[���\Np��ZN����\j|}rjs|r;8Q^b^`;8jys�jtzY_cd_j{�uv�mj|}rNo������mj|}r;8v��N�����\j|}rjs�s^b^a;8Q^b^a;8jys�j{�u����ZN����.Nr�N���N����N��N��;8����N���N���N{�������Np����mj�|x^b^fjs�s^b^b;8Q^b^b;8jys�j{�up��N��N�������ZN���N���U�;8������N����N��ZN�����mj�|x^b^cjs�s^b^f;8Q^b^c;8jys�j{�u���N����N��N����N����mj�|x^b^gjs�s^b^d;8Q^b^d;8jys�j{�u���N����N��N����������N����������;8��N������N����mj�|x^b^gjs�s^b^e;8Q^b^e;8jys�j{�up��N������N���N���U�N����;8��ZN�����mj�|x^b_^js�s^b^g;8Q^b^f;8jys�j{�u������mN}���\j|}rjs|r;8Q^b^g;8jys�j{�u����ZN���N�����N��\\\j|}rjs|r;8Q^b_^;8jys�j{�ut���ZN����N���N��Oj|}rjqz�juw�_^aajw�Y^^aajtzY_cd`jqz�;8jq{�^^_^u��N���Nk{�������Np����k\j�ow^_d^j|}rj�{�js|r;8Q^b__;8jys�j{�up������\j|}rjs|r;8Q^b`^;8jys�j{�ujq{�^^^bj���r��OOj|}rjqz}jtzY_cdb;8jq|~^c^^h^a_ah^^^^j�ow^^^`;8jo|~^c^^h^_^^h^^^^jr|~^b^^;8jp�z^c^^js|r;8Q^c^^;8jys�jq{�^^^^jo|~^c^^h^c^^h^^^cj�ow^_c^;8j{�uj������N���\\\\\\j|}rjqz�jtz[_cdbjtzYd__bjr|~^c^^js�s^c^_;8Q^c^_;8js�s^^fb
\ No newline at end of file
diff --git a/pre-edited-cs/data/Stage/Pens1.tsc b/pre-edited-cs/data/Stage/Pens1.tsc
deleted file mode 100644
index 8608246..0000000
--- a/pre-edited-cs/data/Stage/Pens1.tsc
+++ /dev/null
@@ -1 +0,0 @@
-0==F=IZ[NIPZb===?ISNV====IR[Q0==F>IZ[NIPZb===?ISNV===>IR[Q0==F?IZ[NIPZb===?ISNV===?IR[Q0==F@IZ[NIPZb===?ISNV===@IR[Q0==FAIZ[NISYW=@A>G==FBIPZb===?ISNV===AIRcR====0==FBIPZb==>AISNV===AIR[Q0==FEIPZb==>AIN[]=B==G===>G====ISNV===AIP[]=@=>G=>>?G===?IdNV=>==IN[]=B==G====G====IZfQ===?I`ZPIQ[]=@=>IR[Q0==FFIXRfIZ[NISYW=@A>G==FEIPZb===?IN[]=B==G===>G====ISNV===AIP[]=@=>G=>>?G===?IdNV=>==IN[]=B==G====G====IZfQ===?I`ZPIQ[]=@=>IR[Q0=>==I]_VISN\===AIa_N==>=G==FAG==>EG==@?0=>=>I]_VISN\===AIa_N==>?G==FAG==@DG==>>0=>=?I]_VISYW=@?AG=>=AIVaW===>G=>=@IZ`TY|pxrq;I[\QIR[Q0=>=@I`\b==??ITVa>==>ISY8=@?AISY8=AA>IZ`TIab_b�rq-JN�u�4�-Xr�J;I[\QIVa:===>ITVa====IPY\IRcR=>=A0=>=AI]_VI`\b==>>IQ[]=>=?ISN\===AIa_N==>>G==FAG==>CG==B@0=?==ISY8?EF?I]`8===>G=?=>I]`8===?G=?=BI]`8===@G=?>>I]`8===AG=??=I]`8===BG=??=IXRfI`NaIZ`TN�u�4�-N�r{nyGI[\QI`Y]-0=?=>ISYW?E=?G=?=?IZ`TPn{4�-�nqr;I[\QI`Y]-0=?=?INZW===>G=?=@INZW===@G=?=AIZ`TPn{4�-�nqr;I[\QI`Y]0=?=@IXRfIZ`TITVa===@anqr-�|�-`{nxr-s|-n-SvronyyLIf[W=?>FIaNZ===>G===@G====I`Y]0=?=AIXRfIZ`TITVa===>anqr-�|�-Svronyy-s|-n-`{nxrLIf[W=?>FIaNZ===@G===>G====I`Y]0=?=BISYW?E>>G=?=CIZ`TPn{4�-�nqr;I[\QI`Y]0=?=CINZW===FG=?=EINZW==>?G=?=FIZ`TPn{4�-�nqr;I[\QI`Y]0=?=EIXRfIZ`TITVa==>?anqr-�|�-Oynqr-s|-n-[rzr�v�LIf[W=?>FIaNZ===FG==>?G====I`Y]0=?=FIXRfIZ`TITVa===Fanqr-�|�-[rzr�v�-s|-n-OynqrLIf[W=?>FIaNZ==>?G===FG====I`Y]0=?>=IXRfIZ`TSy|�r�;;;LI[\QIR[Q0=?>>ISYW?E?=G=?>?IZ`TPn{4�-�nqr;I[\QI`Y]0=?>?INZW===DG=?>@IXRfIZ`TITVa===D]vpx-�}-�|�-O�ooyrLIf[W=?>FINZ8===DG=>==I`Y]0=?>@IXRfIZ`TITVa===DQ|}-|ss-�|�-O�ooyrLIf[W=?>FINZ:===DI`Y]0=?>FI`Y]0=??=IR[Q0=@==0=@=>0=@=@0=B==ISY:?EF?I]`8===>GC==>I]`8===?GC==?I]`8===@GC==@I]`8===AGC==AI]`8===BGC==BIXRfI`NaIZ`TN-�ryr}|�r;I[\QI`Y]I[\QIR[Q0=C==ISYW=@?BG=C=>IXRfIZ`TISNP===Fdryp|zr-onpx;I[\QIPY_`�r4�-onpx;I[\Q`ur4�-orr{-y|pxrq-�}-v{�ur-pntr-|���vqr;I[\Qdur{-�ur-Q|p�|4�-sy�{xvr�p|zr9-�r4r-t|v{t-�|-���|-tr�-a||x|-onpx;I[\QV{-r�pun{tr-s|-`�r9�|�-�rr;I[\QIPY_V�4�-{|�-�r�-{vpr9-V-x{|�9o��-a||x|-v�-|{r-|s-��;I[\Qaun�4�-�un�-�|�-tr�-�ur{�|�-np�-ny|{r;I[\QIR[Q0=C=>IXRfIZ`TISNP===FV-u|}r-a||x|4�-�nsr;;;I[\QIR[Q0=C?=IXRfIPZb====ISY8=>BCISY8=AAAIN[]=B==G===>G====IdNV===?IP[]=C??G==BBG====IdNV==>=ISNV===AIP[]=C?>G=>>@G====IN[]=C?>G==@=G====IdNV=>==IZ`TISNP==>E\|||uu;;;I[\QIPY_ISNP==>=;;;Nr-�|�-|xn�LI[\QIPY\ISNP====IdNV==@=IN[]=C?>G====G===?IZ`TISNP==>E;;;Zzz;I[\QIPY_Z�-yvsr-syn�urq-ors|rz�-r�r�;I[\QIPY_ISNP==>=;;;;;I[\QIPY\ISNP====IN[]=B==G====G====IdNV==@=IN[]=>=?G====G===?I`\b==>>IP[]=C?BG==A?G====IZ`TISNP===>Xn��zn..I[\QIN[]=C??G====G===?IPY_N{q-]|sr��|-O||��r.I[\QIPY_ISNP==>E\u.I[\QIPY\ISNP====IN[]=C?>G===@G===?IdNV==E=IN[]=C?>G====G===?IZ`TISNP==>Ef|�4r-nyy-vtu�9-�ur{L.I[\QIPY_ISNP===>dryy9-z|r-|-yr��;I[\QIPY\ISNP====IP[]=C?AG==C>G====IN[]=C?BG===@G====IdNV==>CIN[]=C?AG===EG====IdNV==>CIN[]=C?AG====G====I`\b==>>IN[]=>=?G====G====IdNV==AEIN[]=C?BG====G====IZ`TISNP===D;;;;;I[\QIPY_ISNP==>Edu|4�-�un�-ZvzvtnLI[\QIPY\ISNP====IdNV==@=IN[]=C?BG====G===?IdNV==@=IN[]=C?AG====G===?IdNV==B=IN[]=C?BG====G====IdNV==?=IZ`TISNP===>aun�4�-Xv{t;I[\QIPY_N-svr{q-|s-zv{r-urr-v{�ur-�vyyntr;I[\QIPY_aurr-��rq-�|-or-�|{�-|sZvzvtn�-urr;I[\Q[rny�-nyy-|s-�urz9�u|�tu9-un�r-orr{-xvq{n}}rqo�-�ur-Q|p�|4�-t||{�;I[\QIPY_R�r{-Xv{t-un�-y|��svr{q�;;;I[\QIPY\IPZb===?IN[]=B==G===>G====IP[]=@=>G=>>?G===?IdNV=>==IN[]=B==G====G====IZfQ===?I`ZPIQ[]=@=>ISY:=>BDIR[Q0=C?>IXRfISYW=>BEG=C@>IZ`TISNP==>Eaur-Q|p�|4�-}yn{�-nr}|prrqv{t-r�np�y�-|{�purq�yr;;;I[\QVs-�r-q|{4�-q|-�|zr�uv{t�||{;;;I[\QIR[Q0=C??IXRfISYW=>BEG=C@?IZ`TISNP==>=aun{x�-s|-�|�-ury};I[\QIPY_\�-�n{�}|�n�v|{-qvq{4�rnyy�-���v�r9-o��-n�yrn��-�r-qvq;I[\QIR[Q0=C?AIXRfISYW=>BEG=C@AIZ`TISNP===Da||x|-n�-n-qrn�u�rn}|{;;;I[\Q[|.-V4yy-{r�r-nyy|�-v�.I[\QIR[Q0=C?BIXRfISYW=>BEG=C@BIZfO====IdNV==@=IZfQ====IN[]=C?BG====G===?IZ`TISNP===>dryp|zr-onpx.I[\QIPY_Y||x�-yvxr-V-|�r-�|�n{|�ur-|{r;I[\Qdv�u-z�-o|�ur4�-ury}9I[\Q�r-�u|�yq-or-noyr-�|-tr�n|�{q-�ur-}n���|q-s|
�un�-rtt;I[\QIPY\ISNP====IN[]=C?BG===@G====IdNV===EIN[]=C?BG====G====IZ`TISNP===>O||��r.I[\QIPY_Pn{-�r-�nxr-�uv�-yv��yrt��-�v�u-��-�ur{-�r-t|LI[\QIPY\ISNP====IN[]=C??G===@G===?IdNV==>BIN[]=C??G===BG===?IZ`TISNP==>EIPZb====;;;;;I[\QIPY_ISNP==>=]|sr��|;I[\QIPY_ISNP===>LLLI[\QIPY_ISNP==>E`�r9-z�-qrn;;;I[\Qdr-un�r-�|-���}r{q-|�r�pn}r;I[\QIPY_aur-Q|p�|-un�-y|pn�rq�ur-rq-sy|�r�;I[\QIN[]=C?AG====G====IPY_ISNP===D...I[\QIPY_ISNP===>dun�LI[\QIPY_ISNP==>Eduvyr-ur-un�-{|�-�r�np~�vrq-�urz9-v�-v�-|{y�n-zn��r-|s-�vzr;I[\Qaur-y|pn�v|{-v�-�ur-`n{qg|{r;I[\QIPY_aur-sy|�r�-nr-n}}nr{�y��|-or-s|�{q-�|zr�urr-v{�ur-`n{q-g|{r;I[\QIPY_ISNP===Daur-`n{q-g|{rLI[\QIPY_f|�-zrn{9-�un�4�-�urr�r4yy-sv{q-�ur-Q|p�|LI[\QIPY_ISNP==>Edryy9I[\Q-z|r-yvxry�-|{r|s-uv�-�r�n{��;I[\QVs-�r-q|{4�-qr��|�-�u|�rsy|�r�-ors|r-�ur�-tr��urv-un{q�-|{-�urz;;;I[\QIPY_U|�r�r9-�ur-`n{q-g|{r-v�r�prrqv{ty�-qn{tr|��;I[\QR�r{-��}}|�v{t-�r-znqr-�ur�v}9I[\Q�urr4�-{|-t�nn{�rr-�un��r-�|�yq-r��{-nyv�r;;;I[\QIPY_ISNP===Df|�4r-tv�v{t-�}LI[\QIPY_ISNP==>ENp��nyy�;;;I[\QIPY_aurr4�-|{r-|s-��-�u|4�n-}rsrp�-zn�pu-s|-�uv�w|o;I[\QIPY\ISNP====IN[]=C?>G===@G===?IN[]=C?BG===@G====IdNV==?=IN[]=C?>G====G===?IdNV===?IN[]=C?BG====G===?IZ`TISNP==>EV�4�-�|�;I[\QIPY_IPZb===?ISNP==>=;;;du|-V`-urLI[\QIPY_ISNP==>EV{-snp�;;;I[\QIPY_auv�-v�-|{r-|s-�ur-nzrq�p|��-|o|��-�un�-�rrqv�}n�purq-�|-�uv�-v�yn{qI[\Q>=-�rn�-nt|;I[\QIPY_ISNP==>=N-|o|�L.I[\QIPY_ISNP==>EZ�-vz}r��v|{-�n�-�un��ur�-unq-orr{-p|z}yr�ry��v}rq-|��9IN[]=C?>G====G====I[\Qo��-V-q|-{|�-x{|�-�ur}n�vp�yn�;I[\QV�4�-r{�vry�-}|��voyr-�un�|{r-|s-�urz-p|�yq-un�r;;;I[\QIPY_ISNP==>=]|sr��|;I[\QV4�r-p|{{rp�rq-�|-�ur-`n{qg|{r;I[\QIPY_ISNP==>EV-�rr;I[\QIPY\ISNP====IN[]=C??G===@G====IdNV==>BIN[]=C??G====G===?IN[]=C?>G====G===?IdNV==@=IZ`TISNP==>Ef|�-nr-�ur-z|��-��v�rq�|-r�}y|v{t-�uv�-v�yn{q;I[\QIPY_]yrn�r;-Tv�r-��-�|�-nvq;I[\QISY8=>BEI]`8===@GC==@IR[Q0=C@>IXRfIZ`TISNP==>Ef|�-pn{-rnpu-�ur-`n{qg|{r-�vn-�ur-�ryr}|�r;I[\QSv{q-�ur-rq-sy|�r�-n{qo�{-r�r�-�v{tyr-|{r-|s�urz;I[\QIR[Q0=C@?IXRfIZ`TISNP==>=`|-�|�4r-|{r-|s-�ur;;;I[\QIPY_V-unq{4�-r�r{-{|�vprq;I[\QIPY_Z�9-z�9-�|�-pr�nv{y�-nr�ryy:o�vy�;I[\QIR[Q0=C@AIXRfIZ`TISNP===Daur-`n{q-g|{r;;;I[\QIR[Q0=C@BIXRfIZ`TISNP===>Vs-�|�-tr�-vq-|s-�ursy|�r�9-�r4yy-or-noyr-�|}r�r{�-�ur-�n-s|-{|�;I[\QIPY_V�4�-n-ovt-r�}|{�vovyv��;I[\QIR[Q0=CB=IXRfIZ`TISNP==>Eanxr-`�r-�v�u-�|�-n{qsyrr-�uv�-v�yn{q;;;I[\QV-ort-�|�;;;I[\QIR[Q0=CB>IQ[]=CB>IXRfIZfQ====IN[]=B==G===>G====IdNV==B=IZ[]=CB=G===CG===DG===?IP[]=CB=G=>>@G===?IN[]=CB=G==@=G===?IdNV=>==IN[]=CB=G====G===?IN[]=B==G====G====IdNV==B=IN[]=CB=G===@G===?IdNV==CAIN[]=CB=G====G====IdNV==>=IN[]=CB=G====G===?IdNV==B=IN[]=CB=G===@G===?IdNV==??IN[]=CB=G===BG===?ISY8=DAAISY8=>C?IN[]=CB=G====G===?ISY:=>C=ISY8=>C>ISY8=DA>IRcR=CB?0=CB?IRcR==D@0=CC=IXRfISYW>=?=G=CC>IZ`TISNP==>Eanxr-`�r-�v�u-�|�-n{qsyrr-�uv�-v�yn{q;;;I[\QV-ort-�|�;;;I[\QIR[Q0=CC>IXRfIZ`TISNP==>EV4z-��y�-�|�-s|-�urpun|�-�un�-un�-orsnyyr{�|�-v�yn{q;I[\QIPY_dr-u�zn{�-z���-�nxr-�uroynzr;I[\QIR[Q0=D==IXRfIPZb====ISN\===AIa_N==?AG=D==G===?G====0C==>I]_VIZ`TIab_Q|-�|�-�n{�-�|-t|-�|-�urRtt-P|vq|LIf[W====ISYW=>BFGC=>>IPY\IRcRC=>=0C==?I]_VIZ`TIab_Q|-�|�-�n{�-�|-t|-�|-Tn���|�{LIf[W====IPY\IXRfIP[]=@==G=>>>G===?IUZPIdNV==C=IN[]=B==G===>G====IdNV=>==ISN\===AIa_N===CG==FEG===AG==>E0C==@I]_VIZ`TIab_Q|-�|�-�n{�-�|-t|-�|-�ur`n{q-g|{rLIf[W====IPY\IXRfIP[]=@==G=>>>G===?IUZPIdNV==C=IN[]=B==G===>G====IdNV=>==ISN\===AIa_N==>=G==FFG==@CG==@@0C==AI]_VIZ`TIab_Q|-�|�-�n{�-�|-t|-�|-�urYno�v{�uLIf[W====IPY\IXRfIP[]=@==G=>>>G===?IUZPIdNV==C=IN[]=B==G===>G====IdNV=>==ISN\===AIa_N==A@G==FFG==>=G==@A0C==BI]_VIZ`TIab_Q|-�|�-�n{�-�|-t|-�|-�ur]yn{�n�v|{LIf[W====IPY\IXRfIP[]=@==G=>>>G===?IUZPIdNV==C=IN[]=B==G===>G====IdNV=>==ISN\===AIa_N==C=G==FFG===FG===F0C=>=IPY\IXRfIP[]=@==G=>>>G===?IUZPIdNV==C=IN[]=B==G===>G====IdNV=>==ISN\===AIa_N===?G==FFG===BG===C0C=>>I]_VIZ`TIab__�v{rqLIf[WC=>=IPY\IXRfIP[]=@==G=>>>G===?IUZPIdNV==C=IN[]=B==G===>G====IdNV=>==ISN\===AIa_N==AFG==FFG===DG===C
\ No newline at end of file
diff --git a/pre-edited-cs/Config.dat b/pre_edited_cs/Config.dat
similarity index 100%
rename from pre-edited-cs/Config.dat
rename to pre_edited_cs/Config.dat
diff --git a/pre-edited-cs/DoConfig.exe b/pre_edited_cs/DoConfig.exe
similarity index 100%
rename from pre-edited-cs/DoConfig.exe
rename to pre_edited_cs/DoConfig.exe
diff --git a/pre-edited-cs/Doukutsu.exe b/pre_edited_cs/Doukutsu.exe
similarity index 100%
rename from pre-edited-cs/Doukutsu.exe
rename to pre_edited_cs/Doukutsu.exe
diff --git a/pre_edited_cs/__init__.py b/pre_edited_cs/__init__.py
new file mode 100644
index 0000000..910dfe9
--- /dev/null
+++ b/pre_edited_cs/__init__.py
@@ -0,0 +1,10 @@
+import sys
+from pathlib import Path
+
+
+def get_path() -> Path:
+    if getattr(sys, "frozen", False):
+        file_dir = Path(getattr(sys, "_MEIPASS"))
+    else:
+        file_dir = Path(__file__).parent.parent
+    return file_dir.joinpath("pre_edited_cs")
diff --git a/pre-edited-cs/data/Arms.bmp b/pre_edited_cs/data/Arms.bmp
similarity index 100%
rename from pre-edited-cs/data/Arms.bmp
rename to pre_edited_cs/data/Arms.bmp
diff --git a/pre-edited-cs/data/ArmsImage.bmp b/pre_edited_cs/data/ArmsImage.bmp
similarity index 100%
rename from pre-edited-cs/data/ArmsImage.bmp
rename to pre_edited_cs/data/ArmsImage.bmp
diff --git a/pre_edited_cs/data/ArmsItem.tsc b/pre_edited_cs/data/ArmsItem.tsc
new file mode 100644
index 0000000..3542a9a
--- /dev/null
+++ b/pre_edited_cs/data/ArmsItem.tsc
@@ -0,0 +1 @@
+S````=:lv�ul�qyiiiilu~t=:Sa```=:l}�wl���~�P������^l�qyiiiilu~t=:Sa``a=:l}�wl���]P�����P]=:����������P�������P�����^=:}���P��Ps����P��P���P|��������^l�qyiiiilu~t=:Sa``b=:l}�wl���]P�����P����P]=:���P����P�����P���^=:y�P�����P���P����P��P�������^=:l�qyiiiilu~t=:Sa``c=:l}�wl���]Pv�������P]=:r������P�����P���P�����^=:������P��������P��P������P������^l�qyiiiilu~t=:Sa``d=:l}�wl���]P}������Pw��P]=:q�P���������P�����]����P���^=:q������������P���������P����P����^l�qyiiiilu~t=:Sa``e=:l}�wl���]P}������P|�������P]=:����P�����P���P��������P������^=:x������\P���P����������P��P�������^l�qyiiiilu~t=:Sa``g=:l}�wl���]Pr������P]=:v���P���Pq�������Px���W�P���������^=:x��P���P���P��P��P��P��P���^l�qyiiiilu~t=:Sa``i=:l}�wl���]Pr����P]=:qP������]����\P����]������P������^=:{���W�P����P������P������^l�qyiiiilu~t=:Sa`a`=:l}�wl���]P�����P}������P]=:q�P������������P����P��P�������^=:y��P������������P��P���������^l�qyiiiilu~t=:Sa`ab=:l}�wl���]P~������P]=:|��������P��P���Pw������^=:v��P��������P�������^l�qyiiiilu~t=:Sa`ac=:l}�wl���]P����P]=:x���P����P���P������P��=:����P�P�����^l�qyiiiilu~t=:Saa``=:l}�wl��������l�qyiiiilu~t=:Saa`a=:l}�wl����������PXbYl�qyiiiilu~t=:Saa`b=:l}�wl����������PXcYl�qyiiiilu~t=:Saa`c=:l}�wl����������PXdYl�qyiiiilu~t=:Saa`d=:l}�wl����������PXeYl�qyiiiilu~t=:Sab``=:l}�wl���z����W�P���P���^l�qyiiiilu~t=:Sab`a=:l}�wl���z����W�P���P����^P���P����P�����Pb^l�qyiiiilu~t=:Sab`b=:l}�wl���z����W�P���P����^P���P����P�����Pc^l�qyiiiilu~t=:Sab`c=:l}�wl���z����W�P���P����^P���P����P�����Pd^l�qyiiiilu~t=:Sab`d=:l}�wl���z����W�P���P����^P���P����P�����PeQl�qyiiiilu~t=:Se```=:l}�wl���~�P����^l�qyiiiilu~t=:Se``a=:l}�wl���q�����W�P{��l�qyiiiilu~t=:Se``b=:l}�wl���}��P������l�qyiiiilu~t=:Se``c=:l}�wl��������W�P{��l�qyiiiilu~t=:Se``d=:l}�wl���������P|�����l�qyiiiilu~t=:Se``e=:l}�wl���r����Pv���l�qyiiiilu~t=:Se``f=:l}�wl���y�������W�Px����l�qyiiiilu~t=:Se``g=:l}�wl���ytPs���l�qyiiiilu~t=:Se``h=:l}�wl���z��������Pz����l�qyiiiilu~t=:Se``i=:l}�wl��������P{��l�qyiiiilu~t=:Se`a`=:l}�wl���w��P{��l�qyiiiilu~t=:Se`aa=:l}�wl���w��Pr���l�qyiiiilu~t=:Se`ab=:l}�wl���s�������l�qyiiiilu~t=:Se`ac=:l}�wl���u��������l�qyiiiilu~t=:Se`ad=:lv|ze``ejaa`d=:lv|ze``djaa`c=:lv|ze``cjaa`b=:lv|ze``bjaa`a=:lv|ze``ajaa``=:l}�wl��������l�qyiiiilu~t=:Se`ae=:l}�wl���|���P���l�qyiiiilu~t=:Se`af=:l}�wl���s���]q��l�qyiiiilu~t=:Se`ag=:l}�wl���s�����P{��l�qyiiiilu~t=:Se`ah=:l}�wl���r������P�`^hl�qyiiiilu~t=:Se`ai=:l}�wl���q���Pr������l�qyiiiilu~t=:Se`b`=:l}�wl��������������l�qyiiiilu~t=:Se`ba=:l}�wl���s����W�Pq��P����l�qyiiiilu~t=:Se`bb=:l}�wl���~�������Ps������l�qyiiiilu~t=:Se`bc=:l}�wl���r������P�b^`l�qyiiiilu~t=:Se`bd=:l}�wl���}�����P}���l�qyiiiilu~t=:Se`be=:l}�wl�������������P����P{��l�qyiiiilu~t=:Se`bf=:l}�wl������W�P|�����l�qyiiiilu~t=:Se`bg=:l}�wl���s���������l�qyiiiilu~t=:Se`bh=:l}�wl���r�����P���������l�qyiiiilu~t=:Se`bi=:l}�wl������������l�qyiiiilu~t=:Se`c`=:l}�wl������P����l�qyiiiilu~t=:Se`ca=:l}�wl���s���Pv�����P}����l�qyiiiilu~t=:Se`cb=:l}�wl���|�����P}��l�qyiiiilu~t=:Se`cc=:l}�wl���}�������Pr����l�qyiiiilu~t=:Se`cd=:l}�wl���}�P������l�qyiiiilu~t=:Se`ce=:l}�wl���s����W�P���������l�qyiiiilu~t=:Se`cf=:l}�wl���q����P}����l�qyiiiilu~t=:Se`cg=:l}�wl���s����W�P|�������l�qyiiiilu~t=:Se`ch=:l}�wl������������P����l�qyiiiilu~t=:Se`ci=:l}�wl���y���Pr���l�qyiiiilu~t=:Se`d`=:l}�wl���{������l�qyiiiilu~t=:Se`da=:l}�wl����������P}�����l�qyiiiilu~t=:Se`db=:l}�wl���|���Py����l�qyiiiilu~t=:Se`dc=:l}�wl�������������l�qyiiiilu~t=:Se`dd=:l}�wl���}��������l�qyiiiilu~t=:Sf```=:l}�wl���~�P����^l�qyiiiilu~t=:Sf``a=:l}�wl������P���P��Pq�����W�P�����^=:y�P���P������P����Pq�����W�=:����������^l�qyiiiilu~t=:Sf``b=:l��ylu�ui```=:Sf``c=:l}�wl������P���P��P�����W�P�����^l�qyiiiilu~t=:Sf``d=:l}�wl���qP������P������P��P���P�����P��P�P����^=:v���P���P���������P��W�P��\P��P�����=:����P��W�P����P���������P���P�����^l�qyiiiilu~t=:Sf``e=:lv|zf``bjh```=:lv|zf``djh```=:l}�wl���qP�����P����P�����P��P���=:���������Pv���^Py�P���P�����P�����=:�����^^^ol�qyiiiilu~t=:Sf``f=:l}�wl���t��������P��P���P��P�P�������P�����^l�qyiiiilu~t=:Sf``g=:l}�wl���q�PytPs���P�����P��Pu��P~�^P`f^l�qyiiiilu~t=:Sf``h=:l}�wl���qP�����P����P���P������=:����������^l�qyiiiilu~t=:Sf``i=:l}�wl���qP�����P���^l�qyiiiilu~t=:Sf`a`=:l}�wl���qP���P����PRw��R^l�qyiiiilu~t=:Sf`aa=:l}�wl���qP�����P��P���^l�qyiiiilu~t=:Sf`ab=:l}�wl��������P����P�P���������^l�qyiiiilu~t=:Sf`ac=:l}�wl���q�P���������P���P�������P��P�����=:���P����^l�qyiiiilu~t=:Sf`ad=:lv|ze``ejab`d=:lv|ze``djab`c=:lv|ze``cjab`b=:lv|ze``bjab`a=:lv|ze``ajab``=:l}�wl���z����W�P���P���^l�qyiiiilu~t=:Sf`ae=:l{u�l}�wl�������P����P�������P����P����\=:���P����P����^P����P���P���P��ol�~z````l|y[a```l��``b`ly�]``ael}�wl���=:|���P��������^lv�ul�qyiiiilu~t=:Sf`af=:l}�wl���q���������P����P�����=:��������P���P����������^^^l�qyiiiilu~t=:Sf`ag=:l}�wl���y�P����PR|��������Ps�����R^l�qyiiiilu~t=:Sf`ah=:lv|z`gdbjg`ah=:l{u�l}�wl�������P���P����P������P�����P��=:������P��P���P����P������^l~tls|�=:t�P���P����P��P�����P��o=:l�~z````lu�[```alv|[`gdblu�]``cblv|]`gdcl}�wl���=:r������P��������^l~tl�qy```clv�ulu�ue`ah=:Sf`ai=:l}�wl�������P���P����P������\P���P������=:��P������P������P����P����P��P������^l�qyiiiilu~t=:Sf`b`=:l}�wl���y��������P���P����P��P�����P���=:�������P���P�����������P����^l�qyiiiilu~t=:Sf`ba=:lv|zbie`jg`ba=:l{u�l}�wl������P���P�������P����������P����=:����^Ps����P����P��P���P��^l~tls|�=:t�P���P����P��P�����P��o=:l�~z````lu�[``aflv|[bie`l}�wl���=:u�������Ps����W�Pq��P����^l~tl�qy```clv�ulu�ue`ba=:Sf`bb=:l}�wl���qP�����P���������P���������^=:���P���W�P���P���P�������^l�qyiiiilu~t=:Sf`bc=:lv|z`gdcjg`bc=:l{u�l}�wl�������P���P����P������P��P������P���=:���P���P����P��P���P���������^l~tls|�=:t�P���P����P��P�����P��o=:l�~z````lu�[``cblv|[`gdclu�]```alv|]`gdbl}�wl���=:u�������Pr������P�b^`^l~tl�qy```clv�ulu�ue`bc=:Sf`bd=:lv|za`b`jg`bd=:l{u�l}�wl���y�W�P�P���P���^^^l~t=:t�P���P����P��P�����P��o=:l�~z````lu�[``fdlv|[a`b`l}�wl���=:u�������P���P}�����P}���^l~tl�qy```clv�ulu�ue`bd=:Sf`be=:l}�wl���qP���P������P���P��P�P�������=:}�����^l�qyiiiilu~t=:Sf`bf=:l{u�l}�wl�������P���P����P��ol�~z````l}�wl���=:����P��P���^l~tls|�yP���W�P�������PyP����P����=:���P����P�����P���P��P��^l~tls|���P����P��P����P������P����=:���P�������P��P�P��������P����^l~tls|�����^Pr������P���P��P���=:����������\P���P��P���P��=:������\P��P�������\l~tls|��������P����������^^^=:���Pt�����P��P����^l~tls|�x�P���P�����P��P�����P���=:�������P�����\P���P���P��^^^l~tls|�q�P�����\P�����P��P�����=:���Pt����Ps����^^^l�qy``b`l~tls|�����P�����\P����P���P��������=:��P���P������P��P����P������\l~tls|�������P���������P�������=:������P����P���P������^^^l~tls|����Pt�����P����P����P����=:������P������P��P���P������\l~tls|������P��P���P��P������P���=:���P����P���P�����P��P���=:�����P�����^l~tls|����P��P���P���Ps����P��=:���P����������\P��P���P�����=:�����P��P��P���^l~tls|���P���P��P������P������P��=:��������P���P��������P��P���=:������P�����P���P������^l~tls|����Pt�����P�����P��P����P���=:u����W�P�������P�����P����=:������P��P�P����^l~tls|�yP�����P��P�����P��P�����=:������P���P�������P�����=:���P}������P��P�������^l~tls|�q�����\PyP���P����P��P���P����=:�������\P���PyP����P���P�����=:�����������P���P�������^^^l~tls|�~��\P��W�P�����P���P������������=:}������P��P���������P����P���=:����P���P�������^l~tls|����P��P��P�����P��P������\P��P����=:�����P���P}������P����P�P���������=:������P�����P���P�������^l~tls|������P���P��������P������\=:��P����P��P����P��P�������P���=:������P}������P��P��P���P�������^l~tls|�=:q��P����P�����Py\P���\P����^^^l~tls|�y�P���P���P������P����P����P������=:����\P����P���P���P�������P������=:��P���P����������^l~tls|�y�P��P������P��P���P����\=:���W��P��P�����\P������P��=:����P�P�����������^l~tls|�������^Px���P��P������^l~tls|����P��������P��=:R|�������P}�������R^l~tls|�lv|[a`bdlv�ul}�wl������P������P����P����^^^l�qyiiiilu~t=:Sf`bg=:l}�wl���~��������P��P����P�P������^=:�����P��Py���\P���P��������P���^l�qyiiiilu~t=:Sf`bh=:l}�wl���qP������P�����P���������^l�qyiiiilu~t=:Sf`bi=:l}�wl���y�W�P�����]���^P^^^�������^l�qyiiiilu~t=:Sf`c`=:l}�wl���qP���P����P���P������^l�qyiiiilu~t=:Sf0ca=:l}�wl��������P���P����������P�����^=:y�P���P��P���^l�qyiiiilu~t=:Sf`cb=:l}�wl���x��QP��P�����P���ol�qyiiiilu~t=:Sf`cc=:l}�wl������P��������P�����P���P���P����P���=:��������^Py�P���P��P����P���^P��P��=:������\P���P���W�P������P����P��^^^lv|[aefcl�qyiiiilu~t=:Sf`cd=:l}�wl���q��������\P��P���P���P�����P��=:�������P��������^^^l�qyiiiilu~t=:Sf`ce=:l}�wl������������P����P������P���P����^=:������]�����P�������P����P�P����=:������P��������^P����P����P��P���^l�qyiiiilu~t=:Sf`cf=:l}�wl���u�������P����P���P����������P��P��=:�����^Py�P���P��P���^l�qyiiiilu~t=:Sf`cg=:l}�wl������P��������^=:y�P���P��P���^l�qyiiiilu~t=:Sf`ch=:l{u�l}�wl���qP������P�������P���P���P����=:s����P��P���P���������^=:qP���������P����^l~tlv|z`gbbjg`chls|�=:����P���P�����P��ol�~z````lu�[`abhlv|[`gbbl}�wl���=:u�������P���P���������P����^l~tl�qy```clv�ulu�ue`ch=:Sf`ci=:l}�wl�������P���P��Ps����Pr����\P���P����=:�������P���P�����P�����P����P����P��^=:������P���P����P����P�����P���P���^^^l�qyiiiilu~t=:Sf`d`=:lu�uhc``=:Sf`da=:l}�wl�����P��P�����P���P����������P�����^=:���P�����P��P��������P����P���=:����������P��P��P�����^P�������^l�qyiiiilu~t=:Sf`db=:l}�wl������P��������P���P������]�����=:�������P����P�P����P������=:��������^P����P����P��P���^l�qyiiiilu~t=:Sf`dc=:l}�wl������P����������^P��P��P������^=:��P��P�����]���^P^^^�������^l�qyiiiilu~t=:Sf`dd=:l}�wl���qP��������P����P���P�����P��=:�������P��������\P���P���P�������=:�����P��P�����P���^l�qyiiiilu~t=:Sg``b=:l}|�lu~t=:Sg`ah=:l{u�l}�wl���t�P���P����P��P������P��o=:l�~z````lu�]```alv|]`gdbl}�wl���=:t���������Pr������P�`^h^l~tl�qy```clv�ulu�ue`ah=:Sg`ba=:l{u�l}�wl���t�P���P����P��P������P��o=:l�~z````lu�]``aflv|]bie`l}�wl���=:t���������Ps����W�Pq��P����^l~tl�qy```clv�ulu�ue`ba=:Sg`bc=:l{u�l}�wl���t�P���P����P��P������P��o=:l�~z````lu�]``cblv|]`gdcl}�wl���=:t���������Pr������P�b^`^l~tl�qy```clv�ulu�ue`bc=:Sg`bd=:l{u�l}�wl���t�P���P����P��P������P��o=:l�~z````lu�]``fdlv|]a`b`l}�wl���=:t���������P���P}�����P}���^l~tl�qy```clv�ulu�ue`bd=:Sg`ch=:l{u�l}�wl���t�P���P����P��P������P��o=:l�~z````lu�]`abhlv|]`gbbl}�wl���=:t���������P���P���������P����^l~tl�qy```clv�ulu�ue`ch=:Sh```=:l{u�l}�wl���{����P�P������P��P�����P������P���=:����P��������P��P����P�������^=:����P���P�����P��ol�~zhb``ls|�=:lv|zfa``jha``=:l{u�l}�wl���r�����Paj=:PPPP����������l~tlu�uh``a=:Sh``a=:lv|zfa`ajha`a=:l{u�l}�wl���y���j=:PPPP����������l~tlu�uh``b=:Sh``b=:lv|zfa`bjha`b=:l{u�l}�wl���r�����Pbj=:PPPP����������l~tlu�uh``c=:Sh``c=:lv|zfa`cjha`c=:l{u�l}�wl���r������j=:PPPP����������l~tlu�uh`ab=:Sh``d=:lv|zfa`djha`d=:l{u�l}�wl�������j=:PPPP����������l~tlu�uh``e=:Sh``e=:lv|zfa`ejha`e=:l{u�l}�wl���������[j=:PPPP����������l~tlu�uh`ac=:Sh``f=:lv|zfa`fjha`f=:l{u�l}�wl���}������P�j=:PPPP����������l~tlu�uh``g=:Sh``g=:lv|zfa`gjha`g=:l{u�l}�wl���r�����Pcj=:PPPP����������l~tlu�uh``h=:Sh``h=:lv|zfa`hjha`h=:l{u�l}�wl������Ps���j=:PPPP����������l~tlu�uh``i=:Sh``i=:lv|zfa`ijha`i=:l{u�l}�wl���y�������j=:PPPP����������l~tlu�uh`a`=:Sh`a`=:lv|zfaa`jhaa`=:l{u�l}�wl������P�������j=:PPPP����������l~tlu�uh`ad=:Sh`aa=:lv|zfaaajhaaa=:l{u�l}�wl������Pt����j=:PPPP����������l~tlv�ul�qyiiiilu~t=:Sh`ab=:lv|zfaabjhaab=:l{u�l}�wl���s����Pr����j=:PPPP����������l~tlu�uh``d=:Sh`ac=:lv|zfaacjhaac=:l{u�l}�wl������Pr����j=:PPPP����������l~tlu�uh``f=:Sh`ad=:lv|zfaadjhaad=:l{u�l}�wl���}�P������j=:PPPP����������l~tlu�uh`aa=:Sha``=:l{u�l}�wl���r�����Paj=:PPPPt�������l~tlu�uh``a=:Sha`a=:l{u�l}�wl���y���j=:PPPPt�������l~tlu�uh``b=:Sha`b=:l{u�l}�wl���r�����Pbj=:PPPPt�������l~tlu�uh``c=:Sha`c=:l{u�l}�wl���r������j=:PPPPt�������l~tlu�uh`ab=:Sha`d=:l{u�l}�wl�������j=:PPPPt�������l~tlu�uh``e=:Sha`e=:l{u�l}�wl���������[j=:PPPPt�������l~tlu�uh`ac=:Sha`f=:l{u�l}�wl���}������P�j=:PPPPt�������l~tlu�uh``g=:Sha`g=:l{u�l}�wl���r�����Pcj=:PPPPt�������l~tlu�uh``h=:Sha`h=:l{u�l}�wl������Ps���j=:PPPPt�������l~tlu�uh``i=:Sha`i=:l{u�l}�wl���y�������j=:PPPPt�������l~tlu�uh`a`=:Shaa`=:l{u�l}�wl������P�������j=:PPPPt�������l~tlu�uh`ad=:Shaaa=:l{u�l}�wl������Pt����j=:PPPPt�������l~tlv�ul�qyiiiilu~t=:Shaab=:l{u�l}�wl���s����Pr����j=:PPPPt�������l~tlu�uh``d=:Shaac=:l{u�l}�wl������Pr����j=:PPPPt�������l~tlu�uh``f=:Shaad=:l{u�l}�wl���}�P������j=:PPPPt�������l~tlu�uh`aa=:Shb``=:lv�ulu�ue``e=:Shc``=:l{u�l}�wl���x����P�������P����^Ps����P��ol�~zhd``=:lv|zga``jhc`alu�uhc`b=:Shc`a=:l{u�l}�wl���lwy�a``a=:q�����W�P{��l~tlu�uhc`b=:Shc`b=:lv|zga`bjhc`clu�uhc`d=:Shc`c=:l{u�l}�wl���lwy�a``c=:�����W�P{��l~tlu�uhc`d=:Shc`d=:lv|zga`gjhc`elu�uhc`f=:Shc`e=:l{u�l}�wl���lwy�a``i=:�����P{��l~tlu�uhc`f=:Shc`f=:lv|zga`hjhc`glu�uhc`h=:Shc`g=:l{u�l}�wl���lwy�a`a`=:w��P{��l~tlu�uhc`h=:Shc`h=:lv|zgaaejhc`ilu�uhca`=:Shc`i=:l{u�l}�wl���lwy�a`ag=:s�����P{��l~tlu�uhca`=:Shca`=:lv|zgabcjhcaalu�uhd``=:Shcaa=:l{u�l}�wl���lwy�a`be=:����������P����P{��l~tlu�uhd``=:Shd``=:lv�ulwy�````lu�ue`d`=:Si```=:lv|zd``aji``alv|zd``bji``blv|zd``cji``clv|zd``dji``dlv|zd``eji``elv|zd``fji``flv|zd``gji``g=:lq}[````j````lu�uia``=:Si``a=:lv|zd``bji``hlv|zd``cji``ilv|zd``dji`a`lv|zd``eji`aalv|zd``fji`ablv|zd``gji`ac=:lq}[````j```alu�uia``=:Si``b=:lv|zd``cji`adlv|zd``dji`aelv|zd``eji`aflv|zd``fji`aglv|zd``gji`ah=:lq}[````j```blu�uia``=:Si``c=:lv|zd``dji`ailv|zd``eji`b`lv|zd``fji`balv|zd``gji`bb=:lq}[````j```dlu�uia``=:Si``d=:lv|zd``eji`bclv|zd``fji`bd=:lq}[````j```hlu�uia``=:Si``e=:lv|zd``fji`be=:lq}[````j``aflu�uia``=:Si``f=:lq}[````j``cblu�uia``=:Si``g=:lq}[````j``fdlu�uia``=:Si``h=:lv|zd``cji`bflv|zd``dji`bglv|zd``eji`bhlv|zd``fji`bilv|zd``gji`c`=:lq}[````j```clu�uia``=:Si``i=:lv|zd``dji`calv|zd``eji`cblv|zd``fji`cclv|zd``gji`cd=:lq}[````j```elu�uia``=:Si`a`=:lv|zd``eji`celv|zd``fji`cf=:lq}[````j```ilu�uia``=:Si`aa=:lv|zd``fji`cg=:lq}[````j``aglu�uia``=:Si`ab=:lq}[````j``cclu�uia``=:Si`ac=:lq}[````j``felu�uia``=:Si`ad=:lv|zd``dji`chlv|zd``eji`cilv|zd``fji`d`=:lq}[````j```flu�uia``=:Si`ae=:lv|zd``eji`dalv|zd``fji`db=:lq}[````j``a`lu�uia``=:Si`af=:lv|zd``fji`dc=:lq}[````j``ahlu�uia``=:Si`ag=:lq}[````j``cdlu�uia``=:Si`ah=:lq}[````j``fflu�uia``=:Si`ai=:lv|zd``eji`ddlv|zd``fji`de=:lq}[````j``ablu�uia``=:Si`b`=:lv|zd``fji`df=:lq}[````j``b`lu�uia``=:Si`ba=:lq}[````j``cflu�uia``=:Si`bb=:lq}[````j``fhlu�uia``=:Si`bc=:lv|zd``fji`dg=:lq}[````j``bdlu�uia``=:Si`bd=:lq}[````j``d`lu�uia``=:Si`be=:lq}[````j``dhlu�uia``=:Si`bf=:lv|zd``dji`dhlv|zd``eji`dilv|zd``fji`e`=:lq}[````j```glu�uia``=:Si`bg=:lv|zd``eji`ealv|zd``fji`eb=:lq}[````j``aalu�uia``=:Si`bh=:lv|zd``fji`ec=:lq}[````j``ailu�uia``=:Si`bi=:lq}[````j``celu�uia``=:Si`c`=:lq}[````j``fglu�uia``=:Si`ca=:lv|zd``eji`edlv|zd``fji`ee=:lq}[````j``aclu�uia``=:Si`cb=:lv|zd``fji`ef=:lq}[````j``balu�uia``=:Si`cc=:lq}[````j``cglu�uia``=:Si`cd=:lq}[````j``filu�uia``=:Si`ce=:lv|zd``fji`eg=:lq}[````j``belu�uia``=:Si`cf=:lq}[````j``dalu�uia``=:Si`cg=:lq}[````j``dilu�uia``=:Si`ch=:lv|zd``eji`ehlv|zd``fji`fi=:lq}[````j``adlu�uia``=:Si`ci=:lv|zd``fji`ei=:lq}[````j``bblu�uia``=:Si`d`=:lq}[````j``chlu�uia``=:Si`da=:lv|zd``fji`f`=:lq}[````j``bflu�uia``=:Si`db=:lq}[````j``dblu�uia``=:Si`dc=:lq}[````j``e`lu�uia``=:Si`dd=:lv|zd``fji`fa=:lq}[````j``bhlu�uia``=:Si`de=:lq}[````j``ddlu�uia``=:Si`df=:lq}[````j``eblu�uia``=:Si`dg=:lq}[````j``eflu�uia``=:Si`dh=:lv|zd``eji`fblv|zd``fji`fc=:lq}[````j``aelu�uia``=:Si`di=:lv|zd``fji`fd=:lq}[````j``bclu�uia``=:Si`e`=:lq}[````j``cilu�uia``=:Si`ea=:lv|zd``fji`fe=:lq}[````j``bglu�uia``=:Si`eb=:lq}[````j``dclu�uia``=:Si`ec=:lq}[````j``ealu�uia``=:Si`ed=:lv|zd``fji`ff=:lq}[````j``bilu�uia``=:Si`ee=:lq}[````j``delu�uia``=:Si`ef=:lq}[````j``eclu�uia``=:Si`eg=:lq}[````j``eglu�uia``=:Si`eh=:lv|zd``fji`fg=:lq}[````j``c`lu�uia``=:Si`ei=:lq}[````j``edlu�uia``=:Si`f`=:lq}[````j``ehlu�uia``=:Si`fa=:lq}[````j``f`lu�uia``=:Si`fb=:lv|zd``fji`fh=:lq}[````j``calu�uia``=:Si`fc=:lq}[````j``dglu�uia``=:Si`fd=:lq}[````j``eelu�uia``=:Si`fe=:lq}[````j``eilu�uia``=:Si`ff=:lq}[````j``falu�uia``=:Si`fg=:lq}[````j``fblu�uia``=:Si`fh=:lq}[````j``fclu�uia``=:Si`fi=:lq}[````j``dflu�uia``=:Sia``=:lv|zf```jia`alv|zf``cjia`a=:l{u�l}�wy����P���������j=:PPPPl~�}````_fh=:����P���ol�~z````lu�ug``b=:Sia`a=:l{u�l}�wy����P���������j=:PPPPl~�}````_ff=:����P���ol�~z````lu�ug``b
\ No newline at end of file
diff --git a/pre-edited-cs/data/Bullet.bmp b/pre_edited_cs/data/Bullet.bmp
similarity index 100%
rename from pre-edited-cs/data/Bullet.bmp
rename to pre_edited_cs/data/Bullet.bmp
diff --git a/pre-edited-cs/data/Caret.bmp b/pre_edited_cs/data/Caret.bmp
similarity index 100%
rename from pre-edited-cs/data/Caret.bmp
rename to pre_edited_cs/data/Caret.bmp
diff --git a/pre-edited-cs/data/Credit.tsc b/pre_edited_cs/data/Credit.tsc
similarity index 100%
rename from pre-edited-cs/data/Credit.tsc
rename to pre_edited_cs/data/Credit.tsc
diff --git a/pre-edited-cs/data/Face.bmp b/pre_edited_cs/data/Face.bmp
similarity index 100%
rename from pre-edited-cs/data/Face.bmp
rename to pre_edited_cs/data/Face.bmp
diff --git a/pre-edited-cs/data/Fade.bmp b/pre_edited_cs/data/Fade.bmp
similarity index 100%
rename from pre-edited-cs/data/Fade.bmp
rename to pre_edited_cs/data/Fade.bmp
diff --git a/pre-edited-cs/data/Font/LICENSE-dejavu.txt b/pre_edited_cs/data/Font/LICENSE-dejavu.txt
similarity index 100%
rename from pre-edited-cs/data/Font/LICENSE-dejavu.txt
rename to pre_edited_cs/data/Font/LICENSE-dejavu.txt
diff --git a/pre-edited-cs/data/Font/font b/pre_edited_cs/data/Font/font
similarity index 100%
rename from pre-edited-cs/data/Font/font
rename to pre_edited_cs/data/Font/font
diff --git a/pre_edited_cs/data/Head.tsc b/pre_edited_cs/data/Head.tsc
new file mode 100644
index 0000000..0e903ff
--- /dev/null
+++ b/pre_edited_cs/data/Head.tsc
@@ -0,0 +1 @@
+p}x}}ZW����}}~��}x}~����������������}}}���x}}}�}}}}���x�}}}ZW���m���m������m�����n����}}���������}}~�ZWp}x}~ZW����������������}}}���x�}}}ZW���m���m������m�����n����}}���������}}~�ZWp}x}ZW����}}}�}x}�����������������}}~����x}}~��}}}}���x�}}~ZW���m���m���¿�n����}}���������}}~�ZWp}x}�ZW����������������}}~�����}}}�}}~��}}}}���x�}}~ZW���m���m���¿�n����}}���������}}~�ZWp}x}�ZW����}}��}x}�ZW����������������~}~����x}}~����x}}}~���x}�����x�~~�ZW���m���m��������m�}{��n����}}���������}}~�ZWp}x}�ZW����������������~}~����x�~~�ZW���m���m��������m�}{��n����}}���������}}~�ZWp}x~}ZW����}����}x~~����}}���}}���}}~�}}~}ZWp}x~~ZW����}}���}}���}}~�}}~}ZWZWp}x}ZW���z}}}~���z}}}����z}}}����z}}~}���z}}~����z}}�ZW����}}�}�}}~����x}}�}����}}~�ZWZWp}x~ZW���z}}�~���z}}��ZW����}}�~�}}~����x}}�~����}}~�ZWZWp}xZW���z}}�����z}}��ZW����}}��}}~����x}}�����}}~�ZWZWp}x�ZW���z}}����z}}�ZW����}}���}}~����x}}������}}~�ZWZWp}x�ZW���z}}�����z}}��ZW����}}���}}~����x}}������}}~�ZWp}y}}ZW����ZWZWZWZWZWZWZWZWZWZWZWZWZWZWZWZWZWZWZWZWZWZWZWZWZWZWZWZWZWZWZWZWZWZWZWZWp}z}}ZW���z�~}}�����}~�}z}~������}~�}z}����}z~}ZWZWp}z}~ZW������}~�}z}�����}z~}ZWZWp}z}ZW���x�}~����}z~}ZWZWp}z}�ZW���z�}~���x�~}}����}z~}ZWZWp}z~}ZW�����}�}z~~������}�}z~�����~}}�}z~�����}z}ZWZWp}z~~ZW������}�}z~������~}}�}z~�����}z}ZWZWp}z~ZW�����~}}�}z~����x�}����}z}ZWZWp}z~�ZW���x�}���z�~}}����}z}ZWZWp}z~�ZW�����~}}�}z~����z�}���x�~}}����}z}ZWZWp}z~�ZW���z�}����}z}ZWZWp}z~�ZW����}z}ZWZWp}z~�ZW�����~}}�}z~����z�}���x�~}}����}z}ZWZWp}z~�ZW����}z}ZWZWp}z}ZW�����}��}z~������}��}z�����~}}�}z�����}z�}ZWZWp}z~ZW������}��}z������~}}�}z�����}z�}ZWZWp}zZW�����~}}�}z����x�}�����}z�}ZWZWp}z�ZW���x�}����z�~}}����}z�}ZWZWp}z�ZW�����~}}�}z����z�}����x�~}}����}z�}ZWZWp}z�ZW���z�}�����}z�}ZWZWp}z�ZW����}z�}ZWZWp}z�ZW�����~}}�}z����z�}����x�~}}����}z�}ZWZWp}z�ZW����}z�}ZWZWp}z�}ZW�����}��}z�~�����~}}�}z�����}z�}ZWZWp}z�~ZW�����~}}�}z������}z�}ZWZWp}z�ZW���x�}����z�~}}����}z�}ZWZWp}z��ZW���z�}�����}z�}ZWZWp}z�}ZW�����}��}z�~�����~}}�}z�����}z�}ZWp}z�~ZW�����~}}�}z������}z�}ZWp}z�ZW���x�}����z�~}}����}z�}ZWp}z��ZW���z�}�����}z�}ZWp}z�}ZW�����}��}z�~�����~}}�}z�����}z�}ZWp}z�~ZW�����~}}�}z������}z�}ZWp}z�ZW���x�}����z�~}}����}z�}ZWp}z��ZW���z�}�����}z�}ZWp}z�}ZW�����}��}z�~�����~}}�}z�����}z�}ZWp}z�~ZW�����~}}�}z������}z�}ZWp}z�ZW���x�}����z�~}}����}z�}ZWp}z��ZW���z�}�����}z�}ZWp}z�}ZW�����}}��}{}}�����}~��}{}�����}��}{�}����ZWp}{}}ZW�����}~�}{}~���z�}}~����}{}ZWp}{}~ZW���x�}}~����}{}ZWp}{}ZW�����}�}{}����z�}}����}{}�ZWp}{}�ZW���x�}}����}{}�ZWp}{}�ZW�����}��}{}����z�}}�����}{}�ZWp}{}�ZW���x�}}�����}{}�ZWp}{}�ZW�����}��}{}����z�}}�����}{}�ZWp}{}�ZW���x�}}�����}{}�ZWp}{}�ZW�����}��}{}����z�}}�����}{~}ZWp}{}�ZW���x�}}�����}{~}ZWp}{~}ZW�����}��}{~~���z�}}�����}{~ZWp}{~~ZW���x�}}�����}{~ZWp}{~ZW�����}��}{~����z�}}�����}{~�ZWp}{~�ZW���x�}}�����}{~�ZWp}{~�ZW���z�}}�����ZWp}{}ZW�����}~�}{~���z�}~~����}{ZWp}{~ZW���x�}~~����}{ZWp}{ZW�����}�}{����z�}~����}{�ZWp}{�ZW���x�}~����}{�ZWp}{�ZW�����}��}{����z�}~�����}{�ZWp}{�ZW���x�}~�����}{�ZWp}{�ZW�����}��}{����z�}~�����}{�ZWp}{�ZW���x�}~�����}{�ZWp}{�ZW�����}��}{����z�}~�����}{�}ZWp}{�ZW���x�}~�����}{�}ZWp}{�}ZW�����}��}{�~���z�}~�����}{�ZWp}{�~ZW���x�}~�����}{�ZWp}{�ZW���z�}~�����}}~�ZWp}{�}ZW�����}~�}{�~���z�}~����}{�ZWp}{�~ZW���x�}~����}{�ZWp}{�ZW�����}�}{�����z�}����}{��ZWp}{��ZW���x�}����}{��ZWp}{��ZW�����}��}{�����z�}�����}{��ZWp}{��ZW���x�}�����}{��ZWp}{��ZW�����}��}{�����z�}�����}{��ZWp}{��ZW���x�}�����}{��ZWp}{��ZW�����}��}{�����z�}�����}{�}ZWp}{��ZW���x�}�����}{�}ZWp}{�}ZW�����}��}{�~���z�}�����}{�ZWp}{�~ZW���x�}�����}{�ZWp}{�ZW�����}��}{�����z�}�����}{��ZWp}{��ZW���x�}�����}{��ZWp}{��ZW���z�}�ZW���z�����������x����ZW����}}������ZWp}|}}ZW���x�}}����x��}~���z��}���z��}�ZW�����}}~�}|}~���z�}~����}|}ZWp}|}~ZW���x�}~����}|}ZWp}|}ZW�����}}�}|}����z�}����}|}�ZWp}|}�ZW���x�}����}|}�ZWp}|}�ZW�����}}��}|}����z�}�����}|}�ZWp}|}�ZW���x�}�����}|}�ZWp}|}�ZW�����}}��}|}����z�}�����}|}�ZWp}|}�ZW���x�}�����}|}�ZWp}|}�ZW�����}}��}|}����z�}�����}|~}ZWp}|}�ZW���x�}�����}|~}ZWp}|~}ZW�����}}��}|~~���z�}�����}|~ZWp}|~~ZW���x�}�����}|~ZWp}|~ZW�����}}��}|~����z�}�����}|~�ZWp}|~�ZW���x�}�����}|~�ZWp}|~�ZW����}z}}ZWp}|}ZW���x�}~�ZW�����}~~�}|~���z�}~����}|ZWp}|~ZW���x�}~����}|ZWp}|ZW�����}~�}|����z�}����}|�ZWp}|�ZW���x�}����}|�ZWp}|�ZW�����}~��}|����z�}�����}|�ZWp}|�ZW���x�}�����}|�ZWp}|�ZW�����}~��}|����z�}�����}|�ZWp}|�ZW���x�}�����}|�ZWp}|�ZW�����}~��}|����z�}�����}|�}ZWp}|�ZW���x�}�����}|�}ZWp}|�}ZW�����}~��}|�~���z�}�����}|�ZWp}|�~ZW���x�}�����}|�ZWp}|�ZW����}z}}ZWp}|�}ZW�����}���}}}}�����}���}|�������}���}|�������}��}|������}�~�}|�~ZW���x�}�~����}}~�ZWp}|�~ZW���x�}�����}}~�ZWp}|�ZW���x�}������}}~�ZWp}|��ZW���x�}������}}~�ZWp}|��ZW���x�}������}}~�ZWp}|�}ZW���x�}����x��}~���z��}���z��}�ZW�����}~�}|�~���z�}~����}|�ZWp}|�~ZW���x�}~����}|�ZWp}|�ZW�����}�}|�����z�}����}|��ZWp}|��ZW���x�}����}|��ZWp}|��ZW�����}��}|�����z�}�����}|��ZWp}|��ZW���x�}�����}|��ZWp}|��ZW�����}��}|�����z�}�����}|��ZWp}|��ZW���x�}�����}|��ZWp}|��ZW�����}��}|�����z�}�����}|�}ZWp}|��ZW���x�}�����}|�}ZWp}|�}ZW�����}��}|�~���z�}�����}|�ZWp}|�~ZW���x�}�����}|�ZWp}|�ZW�����}��}|�����z�}�����}|��ZWp}|��ZW���x�}�����}|��ZWp}|��ZW����}z}}ZWp}}}{ZW���z}}�����}|�}ZWp}}}|ZW����ZWp}}}}ZW���������}}}|���x����ZW����}}��}}}{����}}������ZWp}}}~ZW�����������������{��������ZWp}}}ZW����}}}�}}}�����������������}}}���x}}}�}}}}���x�}}}ZW���m���m������m�����n����}}���������}}~�ZWp}}}�ZW����������������}}~�����}}}�}}~��}}}}���x�}}~ZW������m�����m������m���m���¿�n����}}���������}}~�ZWp}}}�ZW����ZW������������}}}����x�}}ZW���m���m����������n����}}���������ZW�����}��}}}����x�}~���x}}}��}}}}����}}~�ZWp}}}�ZW����ZW������������}}}~���x�}}�ZW���m���m�������n����}}���������ZW�����}~�}}}����x�}����x}}}~�}}}}����}}~�ZWp}}}�ZW���������������m���m�����m���m����������ZWĶ��m���m�������m���mö��zò���ZW��m���m��������m��m����¿t�m�����{����}}�}�������x�}ZW���������m��Č����}}~�����}}}~�}}������}}}��}}}~�}}}}����}}~�ZWp}}}�ZW����������������}}}����x}}}��}~}}���x�}���x�}}�ZW���m���m��¯�����n����}}���������}}~�ZWp}}}�ZW����������������}}}����x}}}��}~}}���x�}}�ZW���m���m��������m�»�n����}}���������}}~�ZWp}}}�ZW����ZW������������}}}����x�}}�ZW���m���m�������n����}}���������ZW�����~�}}~~���x�~}���x}}}��}}}}����}}~�ZWp}}~}ZW����ZW������������}}~���x�}}�ZW���m���m���������n����}}���������ZW�����~}�}}~~���x�~���x}}~�}}}}����}}~�ZWp}}~~ZW���������������m���m�����m���m���������ZWĶ��m���m�������m���mö��zò���ZW��m���m��������m��m����¿t�m�����{����}}�}�������x�~~ZW���������m��Č����}}~�����}}}��}}������}}~�}}}��}}}}����}}~�ZWp}}~ZW����������������~}}����m�m�����m����¹��nZW���m������m���������m��m�n���x}}}�����}}��������x��}~���x��}���z��}�����}}�ZWp}}~�ZW����������������~}}����m�m�����m����¹��nZW���m������m���������m��m�n�M�x}}}�����}}��������z��}~���z��}���x��}�����}}�ZWp}}~�ZW����������������~}}����m�m�����m����¹��nZW���m������m���������m��m�n���x}}}�����}}��������x��}~���z��}���x��}�����}}�ZWp}}~�ZW����}|}}ZWp}}~�ZW������������ZW��mƼ�mĮ��m��m��ò�����}}}}���x}��~���z�����������x������������m��ò�{��������ZWp}}~�ZW������������}}~�}}~�ZW���x~}}}����}}}���x����ZW������m��������{��������ZWp}}~�ZW����ZW���x~}}}����}}}���x����ZW������m���m��������m��������{��������ZWp}}~�ZW������������ZW��mƼ�mĮ��m��m���������}}}}����}}}�����}}}}����}}}��������{{{{{��������ZW����}}�}ZW���x~}}}����}}}����}}}��������ZW������m��������{����������������}}}�����ZWp}}}ZW���x}�����x}}~������}}��}}�����}~���}}}}�}}}}�}}}}����}}~ZWp}}~ZW�����}}��}}������}}��}}������}}�}}������}}~�}}ZW����������������~}~����x�}}~ZW���m�m��½�Ɗn����}}���������}}~�ZWp}}ZW����������������~}~����x�}}ZW���m�m������m��½�Ɗn����}}���������}}~�ZWp}}�ZW����������������~}~����x�}}�ZW���m�m�����m��½�Ɗn����}}���������}}~�ZWp}}�ZW����������������~}~����x�}}�ZW���m�m��¿��m��½�Ɗn����}}���������}}~�ZWp}}�ZW����������������~}~����x�}}����x}���ZW���m���m����m��½�Ɗn����}}���������}}~�ZWp}}�ZW��������}~���}}}}����}}~ZWp}}�ZW����}|}ZWp}}�ZW����}|�}ZWp}}�}ZW���������}�}}�����}}~�}}�~���x}}~���x�}}����x}}}��}}~}��������ZW����}}}����m���m��������m��»�����n����}}���������}}�ZWp}}�~ZW�������x}}}��}}}���������ZW����}}}����m��������m���������m��m����}}}}n����}}���������}}�ZWp}}�ZW�������x}}~}�}}}���������ZW����}}~~���m��������m���������m��m����}}}}n����}}���������}}�ZWp}}��ZW���x�~����}}}��}}������}}�}ZWp}}��ZW�������x�}���z�~���x�}}�������������}}~}����}}}��}}~}�}}}}ZW��¿m��������mIJ��m��IJ���m½nn����}}���������}}~�ZWp}}��ZW�������x�}�������}�}}������}}~�}}�����x}}~������������}}}����x}}}��}}����x�}}�ZW���m���m��������m��»�����n����}}���������}}~�ZWp}}��ZW�������x}}}��}}�������������}}}����m��������m���������m��m����}}}}n����}}���������}}~�ZWp}}��ZW�������x}}~}�}}�������������}}~~���m��������m���������m��m����}}}}n����}}���������}}~�ZWp}}��ZW����}}}��}}���������x�}���x�}}����x}}~���x�}}�������������}}~}���x}}~}�}}}�ZW���m���m��½��m�������m��»�����n����}}���������}}~�ZWp}}�}ZW���x}}�ZW��������}}}}����}}�}��������}}�}����}}}�ZW��������ZW���m��òm����{������������m��m����ƌ����}}������ZW����}}}~����}}�}����}��~�}}������ZWp}}�~ZW���x}}�ZW��������}}}}��������}}�}��������}}�}����}}}�ZW��������ZW���m��òm���Ļ��{������������m��m����ƌ����}}������ZW����}}}~����}}�}����}��~�}}������ZWp}}�ZW���x}}�ZW��������}}}}����}}�}��������}}�}����}}}�ZW������������ZW���mIJ��m��ò�m����m�����{{{������������m��m����ƌ����}}������ZW����}}}~����}}�}����}��~�}}������ZWp}}��ZW����}}}~�}}}��}}}}����}}~�ZWp}}��ZW����}}}��}}~�}}}}����}}~�ZWp}}��ZW��������ZWp}}��ZW��������}}}�����ZWp}}�~ZW����������������~}}~���x}}}~���x�~}}ZW���m�����¿t�m��Ɗn����}}���������ZW����}}�}�}x}ZW����}}}��}x}����}}}��}x}ZW����}}~}�}x}����}}~��}x}����}}��}x}ZW����}}~�ZWp}}�ZW����������������~}}���x}}}���x}}}���x�~}~ZW���m���m����m�������n����}}���������}}~�ZWp}}��ZW����������������~}}����x}}}����x�~}ZW���m������t�m��Ɗn����}}���������ZW����}}�}�}x}ZW����}}}~�}x}����}}}��}x}ZW����}}~}�}x}����}}~��}x}����}}��}x}ZW����}}~�ZWp}}��ZW����������������~}}����x}}}����x�~}�ZW���m���m����ò�m�������n����}}���������}}~�ZWp}}��ZW����������������~}}����x}}}����x�~}�ZW���m���m������m�����n����}}���������}}~�ZWp}}��ZW����������������~}}����x}}}����x�~}�ZW���m���m���m�����n����}}���������}}~�ZWp}}��ZW����������������~}}����x}}}����x�~}�ZW���m���m�����Ƴ���m�¶���n����}}���������}}~�ZWp}}��ZW����������������~}}����x}}}����x�~}�ZW���m���m������m��Ɗn����}}���������ZW����}}�}�}x}ZW����}}}~�}x}����}}}��}x}ZW����}}~}�}x}����}}~��}x}����}}��}x}ZW����}}~�ZWp}}�}ZW����������������~}~}���x}}~}���x�~}�ZW���m���m��ºm��Ɗn����}}���������ZW����}}�}�}x}ZW����}}}~�}x}����}}}��}x}����}}}��}x}ZW����}}~��}x}����}}��}x}ZW����}}~�ZWp}}�~ZW����������������~}~~���x}}~~���x�~}�ZW���m���m��ºm�����n����}}���������}}~�ZWp}}�ZW����������������~}~���x}}~���x�~~}ZW���m���m����������n����}}���������}}~�ZWp}}��ZW����������������~}~����x}}~����x�~~~ZW���m���m��Ž����ò�n����}}���������}}~�ZWp}}��ZW����}}}ZWp}}��ZW����������������~}~����x}}~����x�~~�ZW���m���m�����m����n����}}���������}}~�ZWp}}��ZW����������������~}~����x}}~����x�~~�ZW���m���m��¿�z����n����}}���������}}~�ZWp}}��ZW����������������~}~����x}}~����x�~~�ZW���m���m�������m��Ɗn����}}���������ZW����}}�}�}x}ZW����}}}~�}x}����}}}��}x}����}}}��}x}ZW����}}~}�}x}����}}��}x}ZW����}}~�ZWp}}��ZW����}}~��}}��ZW����������������~}~����x}}~����x}}}~���x}�����x�~~�ZW���m���m��������m�}{��n����}}���������}}~�ZWp}}��ZW����������������~}~����x}}~����x}}}����x�~~�ZW���m���m�����m��������n����}}���������}}~�ZWp}}�}ZW����������������~}}���x}}}���x}}}����x�~~�ZW���m���m��¿���������n����}}���������}}~�ZWp}}�~ZW����������������~}~���x}}~���x}}~����x��}���x�~~�ZW���m��¿��t�m���m�����n����}}���������}}~�ZWp}}�ZW����������������~}���x}}���x�~}ZW���m���m����º���m��»����n����}}���������}}~�ZWp}}��ZW����������������~}����x}}����z}}~����x}}����z}}}~���x}������z}�����x�~~ZW���m���m��������m�{}�n����}}���������}}~�ZWp}}��ZW���x}}����x}}�����x~}}���x�~ZW����������������~}�ZW���m���m�������m�����n����}}���������}}~�ZWp}}��ZW����������������~}����x}}����x�~�ZW���m���m�����������m����m��Ɗn����}}���������ZW����}}�}�}x}ZW����}}}~�}x}����}}}��}x}����}}}��}x}ZW����}}~}�}x}����}}~��}x}ZW����}}~�ZWp}}��ZW����������������~}����x}}����x�~�ZW���m��²t�m�������n����}}���������}}~�ZWp}}��ZW����������������~}����x}}����x�~�ZW���m���m������������n����}}���������}}~�ZWp}}��ZW����������������~}����x}}����x�~�ZW���m���m�������m����������n����}}�������������}}���}x�����}}��}x�����}}~�ZWp}}��ZW����������������~}����x}}����x�~�ZW���m���m�����������n����}}�������������}}���}x�����}}��}x�����}}~�ZWp}}�}ZW����������������~}�}���x}}�}���x�~�ZW���m���m����m�����n����}}���������}}~�ZWp}}�~ZW����������������~}�~���x}}�~���x�~�ZW���m���m�����m���¿�m������n����}}�������������}}�~�}x~����}}���}x~����}}~�ZWp}}�ZW����������������~}����x}}����x�~�}ZW���m���m�������m����n����}}���������}}~�ZWp}}��ZW����������������~}�����x}}�����x�~�~ZW���m���m���������m������n����}}�������������}}���}x�����}}���}x�����}}~�ZWp}}��ZW����������������~}�����x}}�����x�~�ZW���m���m�������n����}}�������������}}���}x�����}}���}x�����}}~�ZWp}}��ZW����������������~}�����x}}�����x�~��ZW���m��¿��t�m�����IJ���n����}}�������������}}��}x����}}���}x����}}~�ZWp}}��ZW����������������~}�����x}}�����x�~��ZW���m���m������m������n����}}�������������}}�~�}x~����}}�~�}x~����}}~�ZWp}}��ZW����������������~}�����x}}�����x�~��ZW���m������t�m���������n����}}�������������}}��}x����}}���}x����}}~�ZWp}}��ZW����������������~}�����x}}�����x}~����x}����x�~��ZW���m���m����������m�����n����}}���������}}~�ZWp}}��ZW����������������~}�����x}}�����x�~��ZW���m���m�����m�����n����}}���������}}~�
\ No newline at end of file
diff --git a/pre_edited_cs/data/ItemImage.bmp b/pre_edited_cs/data/ItemImage.bmp
new file mode 100644
index 0000000..7a629ca
Binary files /dev/null and b/pre_edited_cs/data/ItemImage.bmp differ
diff --git a/pre-edited-cs/data/Loading.bmp b/pre_edited_cs/data/Loading.bmp
similarity index 100%
rename from pre-edited-cs/data/Loading.bmp
rename to pre_edited_cs/data/Loading.bmp
diff --git a/pre-edited-cs/data/MyChar.bmp b/pre_edited_cs/data/MyChar.bmp
similarity index 100%
rename from pre-edited-cs/data/MyChar.bmp
rename to pre_edited_cs/data/MyChar.bmp
diff --git a/pre-edited-cs/data/Npc/Npc0.bmp b/pre_edited_cs/data/Npc/Npc0.bmp
similarity index 100%
rename from pre-edited-cs/data/Npc/Npc0.bmp
rename to pre_edited_cs/data/Npc/Npc0.bmp
diff --git a/pre-edited-cs/data/Npc/NpcAlmo1.bmp b/pre_edited_cs/data/Npc/NpcAlmo1.bmp
similarity index 100%
rename from pre-edited-cs/data/Npc/NpcAlmo1.bmp
rename to pre_edited_cs/data/Npc/NpcAlmo1.bmp
diff --git a/pre-edited-cs/data/Npc/NpcAlmo2.bmp b/pre_edited_cs/data/Npc/NpcAlmo2.bmp
similarity index 100%
rename from pre-edited-cs/data/Npc/NpcAlmo2.bmp
rename to pre_edited_cs/data/Npc/NpcAlmo2.bmp
diff --git a/pre-edited-cs/data/Npc/NpcBallos.bmp b/pre_edited_cs/data/Npc/NpcBallos.bmp
similarity index 100%
rename from pre-edited-cs/data/Npc/NpcBallos.bmp
rename to pre_edited_cs/data/Npc/NpcBallos.bmp
diff --git a/pre-edited-cs/data/Npc/NpcBllg.bmp b/pre_edited_cs/data/Npc/NpcBllg.bmp
similarity index 100%
rename from pre-edited-cs/data/Npc/NpcBllg.bmp
rename to pre_edited_cs/data/Npc/NpcBllg.bmp
diff --git a/pre-edited-cs/data/Npc/NpcCemet.bmp b/pre_edited_cs/data/Npc/NpcCemet.bmp
similarity index 100%
rename from pre-edited-cs/data/Npc/NpcCemet.bmp
rename to pre_edited_cs/data/Npc/NpcCemet.bmp
diff --git a/pre-edited-cs/data/Npc/NpcCent.bmp b/pre_edited_cs/data/Npc/NpcCent.bmp
similarity index 100%
rename from pre-edited-cs/data/Npc/NpcCent.bmp
rename to pre_edited_cs/data/Npc/NpcCent.bmp
diff --git a/pre-edited-cs/data/Npc/NpcCurly.bmp b/pre_edited_cs/data/Npc/NpcCurly.bmp
similarity index 100%
rename from pre-edited-cs/data/Npc/NpcCurly.bmp
rename to pre_edited_cs/data/Npc/NpcCurly.bmp
diff --git a/pre-edited-cs/data/Npc/NpcDark.bmp b/pre_edited_cs/data/Npc/NpcDark.bmp
similarity index 100%
rename from pre-edited-cs/data/Npc/NpcDark.bmp
rename to pre_edited_cs/data/Npc/NpcDark.bmp
diff --git a/pre-edited-cs/data/Npc/NpcDr.bmp b/pre_edited_cs/data/Npc/NpcDr.bmp
similarity index 100%
rename from pre-edited-cs/data/Npc/NpcDr.bmp
rename to pre_edited_cs/data/Npc/NpcDr.bmp
diff --git a/pre-edited-cs/data/Npc/NpcEggs1.bmp b/pre_edited_cs/data/Npc/NpcEggs1.bmp
similarity index 100%
rename from pre-edited-cs/data/Npc/NpcEggs1.bmp
rename to pre_edited_cs/data/Npc/NpcEggs1.bmp
diff --git a/pre-edited-cs/data/Npc/NpcEggs2.bmp b/pre_edited_cs/data/Npc/NpcEggs2.bmp
similarity index 100%
rename from pre-edited-cs/data/Npc/NpcEggs2.bmp
rename to pre_edited_cs/data/Npc/NpcEggs2.bmp
diff --git a/pre-edited-cs/data/Npc/NpcFrog.bmp b/pre_edited_cs/data/Npc/NpcFrog.bmp
similarity index 100%
rename from pre-edited-cs/data/Npc/NpcFrog.bmp
rename to pre_edited_cs/data/Npc/NpcFrog.bmp
diff --git a/pre-edited-cs/data/Npc/NpcGuest.bmp b/pre_edited_cs/data/Npc/NpcGuest.bmp
similarity index 100%
rename from pre-edited-cs/data/Npc/NpcGuest.bmp
rename to pre_edited_cs/data/Npc/NpcGuest.bmp
diff --git a/pre-edited-cs/data/Npc/NpcHell.bmp b/pre_edited_cs/data/Npc/NpcHell.bmp
similarity index 100%
rename from pre-edited-cs/data/Npc/NpcHell.bmp
rename to pre_edited_cs/data/Npc/NpcHell.bmp
diff --git a/pre-edited-cs/data/Npc/NpcHeri.bmp b/pre_edited_cs/data/Npc/NpcHeri.bmp
similarity index 100%
rename from pre-edited-cs/data/Npc/NpcHeri.bmp
rename to pre_edited_cs/data/Npc/NpcHeri.bmp
diff --git a/pre-edited-cs/data/Npc/NpcIronH.bmp b/pre_edited_cs/data/Npc/NpcIronH.bmp
similarity index 100%
rename from pre-edited-cs/data/Npc/NpcIronH.bmp
rename to pre_edited_cs/data/Npc/NpcIronH.bmp
diff --git a/pre-edited-cs/data/Npc/NpcIsland.bmp b/pre_edited_cs/data/Npc/NpcIsland.bmp
similarity index 100%
rename from pre-edited-cs/data/Npc/NpcIsland.bmp
rename to pre_edited_cs/data/Npc/NpcIsland.bmp
diff --git a/pre-edited-cs/data/Npc/NpcKings.bmp b/pre_edited_cs/data/Npc/NpcKings.bmp
similarity index 100%
rename from pre-edited-cs/data/Npc/NpcKings.bmp
rename to pre_edited_cs/data/Npc/NpcKings.bmp
diff --git a/pre-edited-cs/data/Npc/NpcMaze.bmp b/pre_edited_cs/data/Npc/NpcMaze.bmp
similarity index 100%
rename from pre-edited-cs/data/Npc/NpcMaze.bmp
rename to pre_edited_cs/data/Npc/NpcMaze.bmp
diff --git a/pre-edited-cs/data/Npc/NpcMiza.bmp b/pre_edited_cs/data/Npc/NpcMiza.bmp
similarity index 100%
rename from pre-edited-cs/data/Npc/NpcMiza.bmp
rename to pre_edited_cs/data/Npc/NpcMiza.bmp
diff --git a/pre-edited-cs/data/Npc/NpcMoon.bmp b/pre_edited_cs/data/Npc/NpcMoon.bmp
similarity index 100%
rename from pre-edited-cs/data/Npc/NpcMoon.bmp
rename to pre_edited_cs/data/Npc/NpcMoon.bmp
diff --git a/pre-edited-cs/data/Npc/NpcOmg.bmp b/pre_edited_cs/data/Npc/NpcOmg.bmp
similarity index 100%
rename from pre-edited-cs/data/Npc/NpcOmg.bmp
rename to pre_edited_cs/data/Npc/NpcOmg.bmp
diff --git a/pre-edited-cs/data/Npc/NpcPlant.bmp b/pre_edited_cs/data/Npc/NpcPlant.bmp
similarity index 100%
rename from pre-edited-cs/data/Npc/NpcPlant.bmp
rename to pre_edited_cs/data/Npc/NpcPlant.bmp
diff --git a/pre-edited-cs/data/Npc/NpcPress.bmp b/pre_edited_cs/data/Npc/NpcPress.bmp
similarity index 100%
rename from pre-edited-cs/data/Npc/NpcPress.bmp
rename to pre_edited_cs/data/Npc/NpcPress.bmp
diff --git a/pre-edited-cs/data/Npc/NpcPriest.bmp b/pre_edited_cs/data/Npc/NpcPriest.bmp
similarity index 100%
rename from pre-edited-cs/data/Npc/NpcPriest.bmp
rename to pre_edited_cs/data/Npc/NpcPriest.bmp
diff --git a/pre-edited-cs/data/Npc/NpcRavil.bmp b/pre_edited_cs/data/Npc/NpcRavil.bmp
similarity index 100%
rename from pre-edited-cs/data/Npc/NpcRavil.bmp
rename to pre_edited_cs/data/Npc/NpcRavil.bmp
diff --git a/pre-edited-cs/data/Npc/NpcRed.bmp b/pre_edited_cs/data/Npc/NpcRed.bmp
similarity index 100%
rename from pre-edited-cs/data/Npc/NpcRed.bmp
rename to pre_edited_cs/data/Npc/NpcRed.bmp
diff --git a/pre-edited-cs/data/Npc/NpcRegu.bmp b/pre_edited_cs/data/Npc/NpcRegu.bmp
similarity index 100%
rename from pre-edited-cs/data/Npc/NpcRegu.bmp
rename to pre_edited_cs/data/Npc/NpcRegu.bmp
diff --git a/pre-edited-cs/data/Npc/NpcSand.bmp b/pre_edited_cs/data/Npc/NpcSand.bmp
similarity index 100%
rename from pre-edited-cs/data/Npc/NpcSand.bmp
rename to pre_edited_cs/data/Npc/NpcSand.bmp
diff --git a/pre-edited-cs/data/Npc/NpcStream.bmp b/pre_edited_cs/data/Npc/NpcStream.bmp
similarity index 100%
rename from pre-edited-cs/data/Npc/NpcStream.bmp
rename to pre_edited_cs/data/Npc/NpcStream.bmp
diff --git a/pre-edited-cs/data/Npc/NpcSym.bmp b/pre_edited_cs/data/Npc/NpcSym.bmp
similarity index 100%
rename from pre-edited-cs/data/Npc/NpcSym.bmp
rename to pre_edited_cs/data/Npc/NpcSym.bmp
diff --git a/pre-edited-cs/data/Npc/NpcToro.bmp b/pre_edited_cs/data/Npc/NpcToro.bmp
similarity index 100%
rename from pre-edited-cs/data/Npc/NpcToro.bmp
rename to pre_edited_cs/data/Npc/NpcToro.bmp
diff --git a/pre-edited-cs/data/Npc/NpcTwinD.bmp b/pre_edited_cs/data/Npc/NpcTwinD.bmp
similarity index 100%
rename from pre-edited-cs/data/Npc/NpcTwinD.bmp
rename to pre_edited_cs/data/Npc/NpcTwinD.bmp
diff --git a/pre-edited-cs/data/Npc/NpcWeed.bmp b/pre_edited_cs/data/Npc/NpcWeed.bmp
similarity index 100%
rename from pre-edited-cs/data/Npc/NpcWeed.bmp
rename to pre_edited_cs/data/Npc/NpcWeed.bmp
diff --git a/pre-edited-cs/data/Npc/NpcX.bmp b/pre_edited_cs/data/Npc/NpcX.bmp
similarity index 100%
rename from pre-edited-cs/data/Npc/NpcX.bmp
rename to pre_edited_cs/data/Npc/NpcX.bmp
diff --git a/pre-edited-cs/data/Org/0000.dat b/pre_edited_cs/data/Org/0000.dat
similarity index 100%
rename from pre-edited-cs/data/Org/0000.dat
rename to pre_edited_cs/data/Org/0000.dat
diff --git a/pre-edited-cs/data/Org/0000.org b/pre_edited_cs/data/Org/0000.org
similarity index 100%
rename from pre-edited-cs/data/Org/0000.org
rename to pre_edited_cs/data/Org/0000.org
diff --git a/pre-edited-cs/data/Org/0001.org b/pre_edited_cs/data/Org/0001.org
similarity index 100%
rename from pre-edited-cs/data/Org/0001.org
rename to pre_edited_cs/data/Org/0001.org
diff --git a/pre-edited-cs/data/Org/0002.org b/pre_edited_cs/data/Org/0002.org
similarity index 100%
rename from pre-edited-cs/data/Org/0002.org
rename to pre_edited_cs/data/Org/0002.org
diff --git a/pre-edited-cs/data/Org/0003.org b/pre_edited_cs/data/Org/0003.org
similarity index 100%
rename from pre-edited-cs/data/Org/0003.org
rename to pre_edited_cs/data/Org/0003.org
diff --git a/pre-edited-cs/data/Org/0004.org b/pre_edited_cs/data/Org/0004.org
similarity index 100%
rename from pre-edited-cs/data/Org/0004.org
rename to pre_edited_cs/data/Org/0004.org
diff --git a/pre-edited-cs/data/Org/0005.org b/pre_edited_cs/data/Org/0005.org
similarity index 100%
rename from pre-edited-cs/data/Org/0005.org
rename to pre_edited_cs/data/Org/0005.org
diff --git a/pre-edited-cs/data/Org/0006.org b/pre_edited_cs/data/Org/0006.org
similarity index 100%
rename from pre-edited-cs/data/Org/0006.org
rename to pre_edited_cs/data/Org/0006.org
diff --git a/pre-edited-cs/data/Org/0007.org b/pre_edited_cs/data/Org/0007.org
similarity index 100%
rename from pre-edited-cs/data/Org/0007.org
rename to pre_edited_cs/data/Org/0007.org
diff --git a/pre-edited-cs/data/Org/0008.org b/pre_edited_cs/data/Org/0008.org
similarity index 100%
rename from pre-edited-cs/data/Org/0008.org
rename to pre_edited_cs/data/Org/0008.org
diff --git a/pre-edited-cs/data/Org/0009.org b/pre_edited_cs/data/Org/0009.org
similarity index 100%
rename from pre-edited-cs/data/Org/0009.org
rename to pre_edited_cs/data/Org/0009.org
diff --git a/pre-edited-cs/data/Org/0010.org b/pre_edited_cs/data/Org/0010.org
similarity index 100%
rename from pre-edited-cs/data/Org/0010.org
rename to pre_edited_cs/data/Org/0010.org
diff --git a/pre-edited-cs/data/Org/0011.org b/pre_edited_cs/data/Org/0011.org
similarity index 100%
rename from pre-edited-cs/data/Org/0011.org
rename to pre_edited_cs/data/Org/0011.org
diff --git a/pre-edited-cs/data/Org/0012.org b/pre_edited_cs/data/Org/0012.org
similarity index 100%
rename from pre-edited-cs/data/Org/0012.org
rename to pre_edited_cs/data/Org/0012.org
diff --git a/pre-edited-cs/data/Org/0013.org b/pre_edited_cs/data/Org/0013.org
similarity index 100%
rename from pre-edited-cs/data/Org/0013.org
rename to pre_edited_cs/data/Org/0013.org
diff --git a/pre-edited-cs/data/Org/0014.org b/pre_edited_cs/data/Org/0014.org
similarity index 100%
rename from pre-edited-cs/data/Org/0014.org
rename to pre_edited_cs/data/Org/0014.org
diff --git a/pre-edited-cs/data/Org/0015.org b/pre_edited_cs/data/Org/0015.org
similarity index 100%
rename from pre-edited-cs/data/Org/0015.org
rename to pre_edited_cs/data/Org/0015.org
diff --git a/pre-edited-cs/data/Org/0016.org b/pre_edited_cs/data/Org/0016.org
similarity index 100%
rename from pre-edited-cs/data/Org/0016.org
rename to pre_edited_cs/data/Org/0016.org
diff --git a/pre-edited-cs/data/Org/0017.org b/pre_edited_cs/data/Org/0017.org
similarity index 100%
rename from pre-edited-cs/data/Org/0017.org
rename to pre_edited_cs/data/Org/0017.org
diff --git a/pre-edited-cs/data/Org/0018.org b/pre_edited_cs/data/Org/0018.org
similarity index 100%
rename from pre-edited-cs/data/Org/0018.org
rename to pre_edited_cs/data/Org/0018.org
diff --git a/pre-edited-cs/data/Org/0019.org b/pre_edited_cs/data/Org/0019.org
similarity index 100%
rename from pre-edited-cs/data/Org/0019.org
rename to pre_edited_cs/data/Org/0019.org
diff --git a/pre-edited-cs/data/Org/0020.org b/pre_edited_cs/data/Org/0020.org
similarity index 100%
rename from pre-edited-cs/data/Org/0020.org
rename to pre_edited_cs/data/Org/0020.org
diff --git a/pre-edited-cs/data/Org/0021.org b/pre_edited_cs/data/Org/0021.org
similarity index 100%
rename from pre-edited-cs/data/Org/0021.org
rename to pre_edited_cs/data/Org/0021.org
diff --git a/pre-edited-cs/data/Org/0022.org b/pre_edited_cs/data/Org/0022.org
similarity index 100%
rename from pre-edited-cs/data/Org/0022.org
rename to pre_edited_cs/data/Org/0022.org
diff --git a/pre-edited-cs/data/Org/0023.org b/pre_edited_cs/data/Org/0023.org
similarity index 100%
rename from pre-edited-cs/data/Org/0023.org
rename to pre_edited_cs/data/Org/0023.org
diff --git a/pre-edited-cs/data/Org/0024.org b/pre_edited_cs/data/Org/0024.org
similarity index 100%
rename from pre-edited-cs/data/Org/0024.org
rename to pre_edited_cs/data/Org/0024.org
diff --git a/pre-edited-cs/data/Org/0025.org b/pre_edited_cs/data/Org/0025.org
similarity index 100%
rename from pre-edited-cs/data/Org/0025.org
rename to pre_edited_cs/data/Org/0025.org
diff --git a/pre-edited-cs/data/Org/0026.org b/pre_edited_cs/data/Org/0026.org
similarity index 100%
rename from pre-edited-cs/data/Org/0026.org
rename to pre_edited_cs/data/Org/0026.org
diff --git a/pre-edited-cs/data/Org/0027.org b/pre_edited_cs/data/Org/0027.org
similarity index 100%
rename from pre-edited-cs/data/Org/0027.org
rename to pre_edited_cs/data/Org/0027.org
diff --git a/pre-edited-cs/data/Org/0028.org b/pre_edited_cs/data/Org/0028.org
similarity index 100%
rename from pre-edited-cs/data/Org/0028.org
rename to pre_edited_cs/data/Org/0028.org
diff --git a/pre-edited-cs/data/Org/0029.org b/pre_edited_cs/data/Org/0029.org
similarity index 100%
rename from pre-edited-cs/data/Org/0029.org
rename to pre_edited_cs/data/Org/0029.org
diff --git a/pre-edited-cs/data/Org/0030.org b/pre_edited_cs/data/Org/0030.org
similarity index 100%
rename from pre-edited-cs/data/Org/0030.org
rename to pre_edited_cs/data/Org/0030.org
diff --git a/pre-edited-cs/data/Org/0031.org b/pre_edited_cs/data/Org/0031.org
similarity index 100%
rename from pre-edited-cs/data/Org/0031.org
rename to pre_edited_cs/data/Org/0031.org
diff --git a/pre-edited-cs/data/Org/0032.org b/pre_edited_cs/data/Org/0032.org
similarity index 100%
rename from pre-edited-cs/data/Org/0032.org
rename to pre_edited_cs/data/Org/0032.org
diff --git a/pre-edited-cs/data/Org/0033.org b/pre_edited_cs/data/Org/0033.org
similarity index 100%
rename from pre-edited-cs/data/Org/0033.org
rename to pre_edited_cs/data/Org/0033.org
diff --git a/pre-edited-cs/data/Org/0034.org b/pre_edited_cs/data/Org/0034.org
similarity index 100%
rename from pre-edited-cs/data/Org/0034.org
rename to pre_edited_cs/data/Org/0034.org
diff --git a/pre-edited-cs/data/Org/0035.org b/pre_edited_cs/data/Org/0035.org
similarity index 100%
rename from pre-edited-cs/data/Org/0035.org
rename to pre_edited_cs/data/Org/0035.org
diff --git a/pre-edited-cs/data/Org/0036.org b/pre_edited_cs/data/Org/0036.org
similarity index 100%
rename from pre-edited-cs/data/Org/0036.org
rename to pre_edited_cs/data/Org/0036.org
diff --git a/pre-edited-cs/data/Org/0037.org b/pre_edited_cs/data/Org/0037.org
similarity index 100%
rename from pre-edited-cs/data/Org/0037.org
rename to pre_edited_cs/data/Org/0037.org
diff --git a/pre-edited-cs/data/Org/0038.org b/pre_edited_cs/data/Org/0038.org
similarity index 100%
rename from pre-edited-cs/data/Org/0038.org
rename to pre_edited_cs/data/Org/0038.org
diff --git a/pre-edited-cs/data/Org/0039.org b/pre_edited_cs/data/Org/0039.org
similarity index 100%
rename from pre-edited-cs/data/Org/0039.org
rename to pre_edited_cs/data/Org/0039.org
diff --git a/pre-edited-cs/data/Org/0040.org b/pre_edited_cs/data/Org/0040.org
similarity index 100%
rename from pre-edited-cs/data/Org/0040.org
rename to pre_edited_cs/data/Org/0040.org
diff --git a/pre-edited-cs/data/Org/0041.org b/pre_edited_cs/data/Org/0041.org
similarity index 100%
rename from pre-edited-cs/data/Org/0041.org
rename to pre_edited_cs/data/Org/0041.org
diff --git a/pre-edited-cs/data/Org/0042.org b/pre_edited_cs/data/Org/0042.org
similarity index 100%
rename from pre-edited-cs/data/Org/0042.org
rename to pre_edited_cs/data/Org/0042.org
diff --git a/pre-edited-cs/data/Org/0043.org b/pre_edited_cs/data/Org/0043.org
similarity index 100%
rename from pre-edited-cs/data/Org/0043.org
rename to pre_edited_cs/data/Org/0043.org
diff --git a/pre-edited-cs/data/Org/0044.org b/pre_edited_cs/data/Org/0044.org
similarity index 100%
rename from pre-edited-cs/data/Org/0044.org
rename to pre_edited_cs/data/Org/0044.org
diff --git a/pre-edited-cs/data/Org/0045.org b/pre_edited_cs/data/Org/0045.org
similarity index 100%
rename from pre-edited-cs/data/Org/0045.org
rename to pre_edited_cs/data/Org/0045.org
diff --git a/pre-edited-cs/data/Org/0046.org b/pre_edited_cs/data/Org/0046.org
similarity index 100%
rename from pre-edited-cs/data/Org/0046.org
rename to pre_edited_cs/data/Org/0046.org
diff --git a/pre-edited-cs/data/Org/0047.org b/pre_edited_cs/data/Org/0047.org
similarity index 100%
rename from pre-edited-cs/data/Org/0047.org
rename to pre_edited_cs/data/Org/0047.org
diff --git a/pre-edited-cs/data/Org/0048.org b/pre_edited_cs/data/Org/0048.org
similarity index 100%
rename from pre-edited-cs/data/Org/0048.org
rename to pre_edited_cs/data/Org/0048.org
diff --git a/pre-edited-cs/data/Org/0050.org b/pre_edited_cs/data/Org/0050.org
similarity index 100%
rename from pre-edited-cs/data/Org/0050.org
rename to pre_edited_cs/data/Org/0050.org
diff --git a/pre-edited-cs/data/Org/0051.org b/pre_edited_cs/data/Org/0051.org
similarity index 100%
rename from pre-edited-cs/data/Org/0051.org
rename to pre_edited_cs/data/Org/0051.org
diff --git a/pre-edited-cs/data/Org/0052.org b/pre_edited_cs/data/Org/0052.org
similarity index 100%
rename from pre-edited-cs/data/Org/0052.org
rename to pre_edited_cs/data/Org/0052.org
diff --git a/pre-edited-cs/data/Org/0053.org b/pre_edited_cs/data/Org/0053.org
similarity index 100%
rename from pre-edited-cs/data/Org/0053.org
rename to pre_edited_cs/data/Org/0053.org
diff --git a/pre-edited-cs/data/Org/0054.org b/pre_edited_cs/data/Org/0054.org
similarity index 100%
rename from pre-edited-cs/data/Org/0054.org
rename to pre_edited_cs/data/Org/0054.org
diff --git a/pre-edited-cs/data/Org/0055.org b/pre_edited_cs/data/Org/0055.org
similarity index 100%
rename from pre-edited-cs/data/Org/0055.org
rename to pre_edited_cs/data/Org/0055.org
diff --git a/pre-edited-cs/data/Org/0056.org b/pre_edited_cs/data/Org/0056.org
similarity index 100%
rename from pre-edited-cs/data/Org/0056.org
rename to pre_edited_cs/data/Org/0056.org
diff --git a/pre-edited-cs/data/Org/0057.org b/pre_edited_cs/data/Org/0057.org
similarity index 100%
rename from pre-edited-cs/data/Org/0057.org
rename to pre_edited_cs/data/Org/0057.org
diff --git a/pre-edited-cs/data/Org/0059.org b/pre_edited_cs/data/Org/0059.org
similarity index 100%
rename from pre-edited-cs/data/Org/0059.org
rename to pre_edited_cs/data/Org/0059.org
diff --git a/pre-edited-cs/data/Org/0060.org b/pre_edited_cs/data/Org/0060.org
similarity index 100%
rename from pre-edited-cs/data/Org/0060.org
rename to pre_edited_cs/data/Org/0060.org
diff --git a/pre-edited-cs/data/Org/0062.org b/pre_edited_cs/data/Org/0062.org
similarity index 100%
rename from pre-edited-cs/data/Org/0062.org
rename to pre_edited_cs/data/Org/0062.org
diff --git a/pre-edited-cs/data/Org/0064.org b/pre_edited_cs/data/Org/0064.org
similarity index 100%
rename from pre-edited-cs/data/Org/0064.org
rename to pre_edited_cs/data/Org/0064.org
diff --git a/pre-edited-cs/data/Org/0065.org b/pre_edited_cs/data/Org/0065.org
similarity index 100%
rename from pre-edited-cs/data/Org/0065.org
rename to pre_edited_cs/data/Org/0065.org
diff --git a/pre-edited-cs/data/PixTone/001.pxt b/pre_edited_cs/data/PixTone/001.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/001.pxt
rename to pre_edited_cs/data/PixTone/001.pxt
diff --git a/pre-edited-cs/data/PixTone/002.pxt b/pre_edited_cs/data/PixTone/002.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/002.pxt
rename to pre_edited_cs/data/PixTone/002.pxt
diff --git a/pre-edited-cs/data/PixTone/003.pxt b/pre_edited_cs/data/PixTone/003.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/003.pxt
rename to pre_edited_cs/data/PixTone/003.pxt
diff --git a/pre-edited-cs/data/PixTone/004.pxt b/pre_edited_cs/data/PixTone/004.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/004.pxt
rename to pre_edited_cs/data/PixTone/004.pxt
diff --git a/pre-edited-cs/data/PixTone/005.pxt b/pre_edited_cs/data/PixTone/005.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/005.pxt
rename to pre_edited_cs/data/PixTone/005.pxt
diff --git a/pre-edited-cs/data/PixTone/006.pxt b/pre_edited_cs/data/PixTone/006.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/006.pxt
rename to pre_edited_cs/data/PixTone/006.pxt
diff --git a/pre-edited-cs/data/PixTone/007.pxt b/pre_edited_cs/data/PixTone/007.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/007.pxt
rename to pre_edited_cs/data/PixTone/007.pxt
diff --git a/pre-edited-cs/data/PixTone/011.pxt b/pre_edited_cs/data/PixTone/011.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/011.pxt
rename to pre_edited_cs/data/PixTone/011.pxt
diff --git a/pre-edited-cs/data/PixTone/012.pxt b/pre_edited_cs/data/PixTone/012.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/012.pxt
rename to pre_edited_cs/data/PixTone/012.pxt
diff --git a/pre-edited-cs/data/PixTone/014.pxt b/pre_edited_cs/data/PixTone/014.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/014.pxt
rename to pre_edited_cs/data/PixTone/014.pxt
diff --git a/pre-edited-cs/data/PixTone/015.pxt b/pre_edited_cs/data/PixTone/015.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/015.pxt
rename to pre_edited_cs/data/PixTone/015.pxt
diff --git a/pre-edited-cs/data/PixTone/016.pxt b/pre_edited_cs/data/PixTone/016.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/016.pxt
rename to pre_edited_cs/data/PixTone/016.pxt
diff --git a/pre-edited-cs/data/PixTone/017.pxt b/pre_edited_cs/data/PixTone/017.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/017.pxt
rename to pre_edited_cs/data/PixTone/017.pxt
diff --git a/pre-edited-cs/data/PixTone/018.pxt b/pre_edited_cs/data/PixTone/018.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/018.pxt
rename to pre_edited_cs/data/PixTone/018.pxt
diff --git a/pre-edited-cs/data/PixTone/020.pxt b/pre_edited_cs/data/PixTone/020.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/020.pxt
rename to pre_edited_cs/data/PixTone/020.pxt
diff --git a/pre-edited-cs/data/PixTone/021.pxt b/pre_edited_cs/data/PixTone/021.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/021.pxt
rename to pre_edited_cs/data/PixTone/021.pxt
diff --git a/pre-edited-cs/data/PixTone/022.pxt b/pre_edited_cs/data/PixTone/022.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/022.pxt
rename to pre_edited_cs/data/PixTone/022.pxt
diff --git a/pre-edited-cs/data/PixTone/023.pxt b/pre_edited_cs/data/PixTone/023.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/023.pxt
rename to pre_edited_cs/data/PixTone/023.pxt
diff --git a/pre-edited-cs/data/PixTone/024.pxt b/pre_edited_cs/data/PixTone/024.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/024.pxt
rename to pre_edited_cs/data/PixTone/024.pxt
diff --git a/pre-edited-cs/data/PixTone/025.pxt b/pre_edited_cs/data/PixTone/025.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/025.pxt
rename to pre_edited_cs/data/PixTone/025.pxt
diff --git a/pre-edited-cs/data/PixTone/026.pxt b/pre_edited_cs/data/PixTone/026.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/026.pxt
rename to pre_edited_cs/data/PixTone/026.pxt
diff --git a/pre-edited-cs/data/PixTone/027.pxt b/pre_edited_cs/data/PixTone/027.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/027.pxt
rename to pre_edited_cs/data/PixTone/027.pxt
diff --git a/pre-edited-cs/data/PixTone/028.pxt b/pre_edited_cs/data/PixTone/028.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/028.pxt
rename to pre_edited_cs/data/PixTone/028.pxt
diff --git a/pre-edited-cs/data/PixTone/029.pxt b/pre_edited_cs/data/PixTone/029.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/029.pxt
rename to pre_edited_cs/data/PixTone/029.pxt
diff --git a/pre-edited-cs/data/PixTone/030.pxt b/pre_edited_cs/data/PixTone/030.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/030.pxt
rename to pre_edited_cs/data/PixTone/030.pxt
diff --git a/pre-edited-cs/data/PixTone/031.pxt b/pre_edited_cs/data/PixTone/031.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/031.pxt
rename to pre_edited_cs/data/PixTone/031.pxt
diff --git a/pre-edited-cs/data/PixTone/032.pxt b/pre_edited_cs/data/PixTone/032.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/032.pxt
rename to pre_edited_cs/data/PixTone/032.pxt
diff --git a/pre-edited-cs/data/PixTone/033.pxt b/pre_edited_cs/data/PixTone/033.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/033.pxt
rename to pre_edited_cs/data/PixTone/033.pxt
diff --git a/pre-edited-cs/data/PixTone/034.pxt b/pre_edited_cs/data/PixTone/034.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/034.pxt
rename to pre_edited_cs/data/PixTone/034.pxt
diff --git a/pre-edited-cs/data/PixTone/035.pxt b/pre_edited_cs/data/PixTone/035.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/035.pxt
rename to pre_edited_cs/data/PixTone/035.pxt
diff --git a/pre-edited-cs/data/PixTone/037.pxt b/pre_edited_cs/data/PixTone/037.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/037.pxt
rename to pre_edited_cs/data/PixTone/037.pxt
diff --git a/pre-edited-cs/data/PixTone/038.pxt b/pre_edited_cs/data/PixTone/038.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/038.pxt
rename to pre_edited_cs/data/PixTone/038.pxt
diff --git a/pre-edited-cs/data/PixTone/039.pxt b/pre_edited_cs/data/PixTone/039.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/039.pxt
rename to pre_edited_cs/data/PixTone/039.pxt
diff --git a/pre-edited-cs/data/PixTone/040.pxt b/pre_edited_cs/data/PixTone/040.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/040.pxt
rename to pre_edited_cs/data/PixTone/040.pxt
diff --git a/pre-edited-cs/data/PixTone/041.pxt b/pre_edited_cs/data/PixTone/041.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/041.pxt
rename to pre_edited_cs/data/PixTone/041.pxt
diff --git a/pre-edited-cs/data/PixTone/042.pxt b/pre_edited_cs/data/PixTone/042.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/042.pxt
rename to pre_edited_cs/data/PixTone/042.pxt
diff --git a/pre-edited-cs/data/PixTone/043.pxt b/pre_edited_cs/data/PixTone/043.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/043.pxt
rename to pre_edited_cs/data/PixTone/043.pxt
diff --git a/pre-edited-cs/data/PixTone/044.pxt b/pre_edited_cs/data/PixTone/044.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/044.pxt
rename to pre_edited_cs/data/PixTone/044.pxt
diff --git a/pre-edited-cs/data/PixTone/045.pxt b/pre_edited_cs/data/PixTone/045.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/045.pxt
rename to pre_edited_cs/data/PixTone/045.pxt
diff --git a/pre-edited-cs/data/PixTone/046.pxt b/pre_edited_cs/data/PixTone/046.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/046.pxt
rename to pre_edited_cs/data/PixTone/046.pxt
diff --git a/pre-edited-cs/data/PixTone/047.pxt b/pre_edited_cs/data/PixTone/047.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/047.pxt
rename to pre_edited_cs/data/PixTone/047.pxt
diff --git a/pre-edited-cs/data/PixTone/048.pxt b/pre_edited_cs/data/PixTone/048.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/048.pxt
rename to pre_edited_cs/data/PixTone/048.pxt
diff --git a/pre-edited-cs/data/PixTone/049.pxt b/pre_edited_cs/data/PixTone/049.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/049.pxt
rename to pre_edited_cs/data/PixTone/049.pxt
diff --git a/pre-edited-cs/data/PixTone/050.pxt b/pre_edited_cs/data/PixTone/050.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/050.pxt
rename to pre_edited_cs/data/PixTone/050.pxt
diff --git a/pre-edited-cs/data/PixTone/051.pxt b/pre_edited_cs/data/PixTone/051.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/051.pxt
rename to pre_edited_cs/data/PixTone/051.pxt
diff --git a/pre-edited-cs/data/PixTone/052.pxt b/pre_edited_cs/data/PixTone/052.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/052.pxt
rename to pre_edited_cs/data/PixTone/052.pxt
diff --git a/pre-edited-cs/data/PixTone/053.pxt b/pre_edited_cs/data/PixTone/053.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/053.pxt
rename to pre_edited_cs/data/PixTone/053.pxt
diff --git a/pre-edited-cs/data/PixTone/054.pxt b/pre_edited_cs/data/PixTone/054.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/054.pxt
rename to pre_edited_cs/data/PixTone/054.pxt
diff --git a/pre-edited-cs/data/PixTone/055.pxt b/pre_edited_cs/data/PixTone/055.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/055.pxt
rename to pre_edited_cs/data/PixTone/055.pxt
diff --git a/pre-edited-cs/data/PixTone/056.pxt b/pre_edited_cs/data/PixTone/056.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/056.pxt
rename to pre_edited_cs/data/PixTone/056.pxt
diff --git a/pre-edited-cs/data/PixTone/057.pxt b/pre_edited_cs/data/PixTone/057.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/057.pxt
rename to pre_edited_cs/data/PixTone/057.pxt
diff --git a/pre-edited-cs/data/PixTone/058.pxt b/pre_edited_cs/data/PixTone/058.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/058.pxt
rename to pre_edited_cs/data/PixTone/058.pxt
diff --git a/pre-edited-cs/data/PixTone/059.pxt b/pre_edited_cs/data/PixTone/059.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/059.pxt
rename to pre_edited_cs/data/PixTone/059.pxt
diff --git a/pre-edited-cs/data/PixTone/060.pxt b/pre_edited_cs/data/PixTone/060.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/060.pxt
rename to pre_edited_cs/data/PixTone/060.pxt
diff --git a/pre-edited-cs/data/PixTone/061.pxt b/pre_edited_cs/data/PixTone/061.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/061.pxt
rename to pre_edited_cs/data/PixTone/061.pxt
diff --git a/pre-edited-cs/data/PixTone/062.pxt b/pre_edited_cs/data/PixTone/062.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/062.pxt
rename to pre_edited_cs/data/PixTone/062.pxt
diff --git a/pre-edited-cs/data/PixTone/063.pxt b/pre_edited_cs/data/PixTone/063.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/063.pxt
rename to pre_edited_cs/data/PixTone/063.pxt
diff --git a/pre-edited-cs/data/PixTone/064.pxt b/pre_edited_cs/data/PixTone/064.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/064.pxt
rename to pre_edited_cs/data/PixTone/064.pxt
diff --git a/pre-edited-cs/data/PixTone/065.pxt b/pre_edited_cs/data/PixTone/065.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/065.pxt
rename to pre_edited_cs/data/PixTone/065.pxt
diff --git a/pre-edited-cs/data/PixTone/070.pxt b/pre_edited_cs/data/PixTone/070.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/070.pxt
rename to pre_edited_cs/data/PixTone/070.pxt
diff --git a/pre-edited-cs/data/PixTone/071.pxt b/pre_edited_cs/data/PixTone/071.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/071.pxt
rename to pre_edited_cs/data/PixTone/071.pxt
diff --git a/pre-edited-cs/data/PixTone/072.pxt b/pre_edited_cs/data/PixTone/072.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/072.pxt
rename to pre_edited_cs/data/PixTone/072.pxt
diff --git a/pre-edited-cs/data/PixTone/100.pxt b/pre_edited_cs/data/PixTone/100.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/100.pxt
rename to pre_edited_cs/data/PixTone/100.pxt
diff --git a/pre-edited-cs/data/PixTone/101.pxt b/pre_edited_cs/data/PixTone/101.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/101.pxt
rename to pre_edited_cs/data/PixTone/101.pxt
diff --git a/pre-edited-cs/data/PixTone/102.pxt b/pre_edited_cs/data/PixTone/102.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/102.pxt
rename to pre_edited_cs/data/PixTone/102.pxt
diff --git a/pre-edited-cs/data/PixTone/103.pxt b/pre_edited_cs/data/PixTone/103.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/103.pxt
rename to pre_edited_cs/data/PixTone/103.pxt
diff --git a/pre-edited-cs/data/PixTone/104.pxt b/pre_edited_cs/data/PixTone/104.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/104.pxt
rename to pre_edited_cs/data/PixTone/104.pxt
diff --git a/pre-edited-cs/data/PixTone/105.pxt b/pre_edited_cs/data/PixTone/105.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/105.pxt
rename to pre_edited_cs/data/PixTone/105.pxt
diff --git a/pre-edited-cs/data/PixTone/106.pxt b/pre_edited_cs/data/PixTone/106.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/106.pxt
rename to pre_edited_cs/data/PixTone/106.pxt
diff --git a/pre-edited-cs/data/PixTone/107.pxt b/pre_edited_cs/data/PixTone/107.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/107.pxt
rename to pre_edited_cs/data/PixTone/107.pxt
diff --git a/pre-edited-cs/data/PixTone/108.pxt b/pre_edited_cs/data/PixTone/108.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/108.pxt
rename to pre_edited_cs/data/PixTone/108.pxt
diff --git a/pre-edited-cs/data/PixTone/109.pxt b/pre_edited_cs/data/PixTone/109.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/109.pxt
rename to pre_edited_cs/data/PixTone/109.pxt
diff --git a/pre-edited-cs/data/PixTone/110.pxt b/pre_edited_cs/data/PixTone/110.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/110.pxt
rename to pre_edited_cs/data/PixTone/110.pxt
diff --git a/pre-edited-cs/data/PixTone/111.pxt b/pre_edited_cs/data/PixTone/111.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/111.pxt
rename to pre_edited_cs/data/PixTone/111.pxt
diff --git a/pre-edited-cs/data/PixTone/112.pxt b/pre_edited_cs/data/PixTone/112.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/112.pxt
rename to pre_edited_cs/data/PixTone/112.pxt
diff --git a/pre-edited-cs/data/PixTone/113.pxt b/pre_edited_cs/data/PixTone/113.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/113.pxt
rename to pre_edited_cs/data/PixTone/113.pxt
diff --git a/pre-edited-cs/data/PixTone/114.pxt b/pre_edited_cs/data/PixTone/114.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/114.pxt
rename to pre_edited_cs/data/PixTone/114.pxt
diff --git a/pre-edited-cs/data/PixTone/115.pxt b/pre_edited_cs/data/PixTone/115.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/115.pxt
rename to pre_edited_cs/data/PixTone/115.pxt
diff --git a/pre-edited-cs/data/PixTone/116.pxt b/pre_edited_cs/data/PixTone/116.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/116.pxt
rename to pre_edited_cs/data/PixTone/116.pxt
diff --git a/pre-edited-cs/data/PixTone/117.pxt b/pre_edited_cs/data/PixTone/117.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/117.pxt
rename to pre_edited_cs/data/PixTone/117.pxt
diff --git a/pre-edited-cs/data/PixTone/150.pxt b/pre_edited_cs/data/PixTone/150.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/150.pxt
rename to pre_edited_cs/data/PixTone/150.pxt
diff --git a/pre-edited-cs/data/PixTone/151.pxt b/pre_edited_cs/data/PixTone/151.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/151.pxt
rename to pre_edited_cs/data/PixTone/151.pxt
diff --git a/pre-edited-cs/data/PixTone/152.pxt b/pre_edited_cs/data/PixTone/152.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/152.pxt
rename to pre_edited_cs/data/PixTone/152.pxt
diff --git a/pre-edited-cs/data/PixTone/153.pxt b/pre_edited_cs/data/PixTone/153.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/153.pxt
rename to pre_edited_cs/data/PixTone/153.pxt
diff --git a/pre-edited-cs/data/PixTone/154.pxt b/pre_edited_cs/data/PixTone/154.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/154.pxt
rename to pre_edited_cs/data/PixTone/154.pxt
diff --git a/pre-edited-cs/data/PixTone/155.pxt b/pre_edited_cs/data/PixTone/155.pxt
similarity index 100%
rename from pre-edited-cs/data/PixTone/155.pxt
rename to pre_edited_cs/data/PixTone/155.pxt
diff --git a/pre-edited-cs/data/Resource/BITMAP/Credit01.png b/pre_edited_cs/data/Resource/BITMAP/Credit01.png
similarity index 100%
rename from pre-edited-cs/data/Resource/BITMAP/Credit01.png
rename to pre_edited_cs/data/Resource/BITMAP/Credit01.png
diff --git a/pre-edited-cs/data/Resource/BITMAP/Credit02.png b/pre_edited_cs/data/Resource/BITMAP/Credit02.png
similarity index 100%
rename from pre-edited-cs/data/Resource/BITMAP/Credit02.png
rename to pre_edited_cs/data/Resource/BITMAP/Credit02.png
diff --git a/pre-edited-cs/data/Resource/BITMAP/Credit03.png b/pre_edited_cs/data/Resource/BITMAP/Credit03.png
similarity index 100%
rename from pre-edited-cs/data/Resource/BITMAP/Credit03.png
rename to pre_edited_cs/data/Resource/BITMAP/Credit03.png
diff --git a/pre-edited-cs/data/Resource/BITMAP/Credit04.png b/pre_edited_cs/data/Resource/BITMAP/Credit04.png
similarity index 100%
rename from pre-edited-cs/data/Resource/BITMAP/Credit04.png
rename to pre_edited_cs/data/Resource/BITMAP/Credit04.png
diff --git a/pre-edited-cs/data/Resource/BITMAP/Credit05.png b/pre_edited_cs/data/Resource/BITMAP/Credit05.png
similarity index 100%
rename from pre-edited-cs/data/Resource/BITMAP/Credit05.png
rename to pre_edited_cs/data/Resource/BITMAP/Credit05.png
diff --git a/pre-edited-cs/data/Resource/BITMAP/Credit06.png b/pre_edited_cs/data/Resource/BITMAP/Credit06.png
similarity index 100%
rename from pre-edited-cs/data/Resource/BITMAP/Credit06.png
rename to pre_edited_cs/data/Resource/BITMAP/Credit06.png
diff --git a/pre-edited-cs/data/Resource/BITMAP/Credit07.png b/pre_edited_cs/data/Resource/BITMAP/Credit07.png
similarity index 100%
rename from pre-edited-cs/data/Resource/BITMAP/Credit07.png
rename to pre_edited_cs/data/Resource/BITMAP/Credit07.png
diff --git a/pre-edited-cs/data/Resource/BITMAP/Credit08.png b/pre_edited_cs/data/Resource/BITMAP/Credit08.png
similarity index 100%
rename from pre-edited-cs/data/Resource/BITMAP/Credit08.png
rename to pre_edited_cs/data/Resource/BITMAP/Credit08.png
diff --git a/pre-edited-cs/data/Resource/BITMAP/Credit09.png b/pre_edited_cs/data/Resource/BITMAP/Credit09.png
similarity index 100%
rename from pre-edited-cs/data/Resource/BITMAP/Credit09.png
rename to pre_edited_cs/data/Resource/BITMAP/Credit09.png
diff --git a/pre-edited-cs/data/Resource/BITMAP/Credit10.png b/pre_edited_cs/data/Resource/BITMAP/Credit10.png
similarity index 100%
rename from pre-edited-cs/data/Resource/BITMAP/Credit10.png
rename to pre_edited_cs/data/Resource/BITMAP/Credit10.png
diff --git a/pre-edited-cs/data/Resource/BITMAP/Credit11.png b/pre_edited_cs/data/Resource/BITMAP/Credit11.png
similarity index 100%
rename from pre-edited-cs/data/Resource/BITMAP/Credit11.png
rename to pre_edited_cs/data/Resource/BITMAP/Credit11.png
diff --git a/pre-edited-cs/data/Resource/BITMAP/Credit12.png b/pre_edited_cs/data/Resource/BITMAP/Credit12.png
similarity index 100%
rename from pre-edited-cs/data/Resource/BITMAP/Credit12.png
rename to pre_edited_cs/data/Resource/BITMAP/Credit12.png
diff --git a/pre-edited-cs/data/Resource/BITMAP/Credit14.png b/pre_edited_cs/data/Resource/BITMAP/Credit14.png
similarity index 100%
rename from pre-edited-cs/data/Resource/BITMAP/Credit14.png
rename to pre_edited_cs/data/Resource/BITMAP/Credit14.png
diff --git a/pre-edited-cs/data/Resource/BITMAP/Credit15.png b/pre_edited_cs/data/Resource/BITMAP/Credit15.png
similarity index 100%
rename from pre-edited-cs/data/Resource/BITMAP/Credit15.png
rename to pre_edited_cs/data/Resource/BITMAP/Credit15.png
diff --git a/pre-edited-cs/data/Resource/BITMAP/Credit16.png b/pre_edited_cs/data/Resource/BITMAP/Credit16.png
similarity index 100%
rename from pre-edited-cs/data/Resource/BITMAP/Credit16.png
rename to pre_edited_cs/data/Resource/BITMAP/Credit16.png
diff --git a/pre-edited-cs/data/Resource/BITMAP/Credit17.png b/pre_edited_cs/data/Resource/BITMAP/Credit17.png
similarity index 100%
rename from pre-edited-cs/data/Resource/BITMAP/Credit17.png
rename to pre_edited_cs/data/Resource/BITMAP/Credit17.png
diff --git a/pre-edited-cs/data/Resource/BITMAP/Credit18.png b/pre_edited_cs/data/Resource/BITMAP/Credit18.png
similarity index 100%
rename from pre-edited-cs/data/Resource/BITMAP/Credit18.png
rename to pre_edited_cs/data/Resource/BITMAP/Credit18.png
diff --git a/pre-edited-cs/data/Resource/BITMAP/pixel.bmp b/pre_edited_cs/data/Resource/BITMAP/pixel.bmp
similarity index 100%
rename from pre-edited-cs/data/Resource/BITMAP/pixel.bmp
rename to pre_edited_cs/data/Resource/BITMAP/pixel.bmp
diff --git a/pre-edited-cs/data/Resource/CURSOR/CURSOR_IKA.png b/pre_edited_cs/data/Resource/CURSOR/CURSOR_IKA.png
similarity index 100%
rename from pre-edited-cs/data/Resource/CURSOR/CURSOR_IKA.png
rename to pre_edited_cs/data/Resource/CURSOR/CURSOR_IKA.png
diff --git a/pre-edited-cs/data/Resource/CURSOR/CURSOR_NORMAL.png b/pre_edited_cs/data/Resource/CURSOR/CURSOR_NORMAL.png
similarity index 100%
rename from pre-edited-cs/data/Resource/CURSOR/CURSOR_NORMAL.png
rename to pre_edited_cs/data/Resource/CURSOR/CURSOR_NORMAL.png
diff --git a/pre-edited-cs/data/Resource/ICON/ICON_MINI.png b/pre_edited_cs/data/Resource/ICON/ICON_MINI.png
similarity index 100%
rename from pre-edited-cs/data/Resource/ICON/ICON_MINI.png
rename to pre_edited_cs/data/Resource/ICON/ICON_MINI.png
diff --git a/pre-edited-cs/data/Resource/ORG/Access.org b/pre_edited_cs/data/Resource/ORG/Access.org
similarity index 100%
rename from pre-edited-cs/data/Resource/ORG/Access.org
rename to pre_edited_cs/data/Resource/ORG/Access.org
diff --git a/pre-edited-cs/data/Resource/ORG/Anzen.org b/pre_edited_cs/data/Resource/ORG/Anzen.org
similarity index 100%
rename from pre-edited-cs/data/Resource/ORG/Anzen.org
rename to pre_edited_cs/data/Resource/ORG/Anzen.org
diff --git a/pre-edited-cs/data/Resource/ORG/Balcony.org b/pre_edited_cs/data/Resource/ORG/Balcony.org
similarity index 100%
rename from pre-edited-cs/data/Resource/ORG/Balcony.org
rename to pre_edited_cs/data/Resource/ORG/Balcony.org
diff --git a/pre-edited-cs/data/Resource/ORG/Ballos.org b/pre_edited_cs/data/Resource/ORG/Ballos.org
similarity index 100%
rename from pre-edited-cs/data/Resource/ORG/Ballos.org
rename to pre_edited_cs/data/Resource/ORG/Ballos.org
diff --git a/pre-edited-cs/data/Resource/ORG/BreakDown.org b/pre_edited_cs/data/Resource/ORG/BreakDown.org
similarity index 100%
rename from pre-edited-cs/data/Resource/ORG/BreakDown.org
rename to pre_edited_cs/data/Resource/ORG/BreakDown.org
diff --git a/pre-edited-cs/data/Resource/ORG/Cemetery.org b/pre_edited_cs/data/Resource/ORG/Cemetery.org
similarity index 100%
rename from pre-edited-cs/data/Resource/ORG/Cemetery.org
rename to pre_edited_cs/data/Resource/ORG/Cemetery.org
diff --git a/pre-edited-cs/data/Resource/ORG/Curly.org b/pre_edited_cs/data/Resource/ORG/Curly.org
similarity index 100%
rename from pre-edited-cs/data/Resource/ORG/Curly.org
rename to pre_edited_cs/data/Resource/ORG/Curly.org
diff --git a/pre-edited-cs/data/Resource/ORG/Dr.org b/pre_edited_cs/data/Resource/ORG/Dr.org
similarity index 100%
rename from pre-edited-cs/data/Resource/ORG/Dr.org
rename to pre_edited_cs/data/Resource/ORG/Dr.org
diff --git a/pre-edited-cs/data/Resource/ORG/Ending.org b/pre_edited_cs/data/Resource/ORG/Ending.org
similarity index 100%
rename from pre-edited-cs/data/Resource/ORG/Ending.org
rename to pre_edited_cs/data/Resource/ORG/Ending.org
diff --git a/pre-edited-cs/data/Resource/ORG/Escape.org b/pre_edited_cs/data/Resource/ORG/Escape.org
similarity index 100%
rename from pre-edited-cs/data/Resource/ORG/Escape.org
rename to pre_edited_cs/data/Resource/ORG/Escape.org
diff --git a/pre-edited-cs/data/Resource/ORG/Fanfale1.org b/pre_edited_cs/data/Resource/ORG/Fanfale1.org
similarity index 100%
rename from pre-edited-cs/data/Resource/ORG/Fanfale1.org
rename to pre_edited_cs/data/Resource/ORG/Fanfale1.org
diff --git a/pre-edited-cs/data/Resource/ORG/Fanfale2.org b/pre_edited_cs/data/Resource/ORG/Fanfale2.org
similarity index 100%
rename from pre-edited-cs/data/Resource/ORG/Fanfale2.org
rename to pre_edited_cs/data/Resource/ORG/Fanfale2.org
diff --git a/pre-edited-cs/data/Resource/ORG/Fanfale3.org b/pre_edited_cs/data/Resource/ORG/Fanfale3.org
similarity index 100%
rename from pre-edited-cs/data/Resource/ORG/Fanfale3.org
rename to pre_edited_cs/data/Resource/ORG/Fanfale3.org
diff --git a/pre-edited-cs/data/Resource/ORG/FireEye.org b/pre_edited_cs/data/Resource/ORG/FireEye.org
similarity index 100%
rename from pre-edited-cs/data/Resource/ORG/FireEye.org
rename to pre_edited_cs/data/Resource/ORG/FireEye.org
diff --git a/pre-edited-cs/data/Resource/ORG/Gameover.org b/pre_edited_cs/data/Resource/ORG/Gameover.org
similarity index 100%
rename from pre-edited-cs/data/Resource/ORG/Gameover.org
rename to pre_edited_cs/data/Resource/ORG/Gameover.org
diff --git a/pre-edited-cs/data/Resource/ORG/Ginsuke.org b/pre_edited_cs/data/Resource/ORG/Ginsuke.org
similarity index 100%
rename from pre-edited-cs/data/Resource/ORG/Ginsuke.org
rename to pre_edited_cs/data/Resource/ORG/Ginsuke.org
diff --git a/pre-edited-cs/data/Resource/ORG/Grand.org b/pre_edited_cs/data/Resource/ORG/Grand.org
similarity index 100%
rename from pre-edited-cs/data/Resource/ORG/Grand.org
rename to pre_edited_cs/data/Resource/ORG/Grand.org
diff --git a/pre-edited-cs/data/Resource/ORG/Gravity.org b/pre_edited_cs/data/Resource/ORG/Gravity.org
similarity index 100%
rename from pre-edited-cs/data/Resource/ORG/Gravity.org
rename to pre_edited_cs/data/Resource/ORG/Gravity.org
diff --git a/pre-edited-cs/data/Resource/ORG/Hell.org b/pre_edited_cs/data/Resource/ORG/Hell.org
similarity index 100%
rename from pre-edited-cs/data/Resource/ORG/Hell.org
rename to pre_edited_cs/data/Resource/ORG/Hell.org
diff --git a/pre-edited-cs/data/Resource/ORG/Jenka.org b/pre_edited_cs/data/Resource/ORG/Jenka.org
similarity index 100%
rename from pre-edited-cs/data/Resource/ORG/Jenka.org
rename to pre_edited_cs/data/Resource/ORG/Jenka.org
diff --git a/pre-edited-cs/data/Resource/ORG/Jenka2.org b/pre_edited_cs/data/Resource/ORG/Jenka2.org
similarity index 100%
rename from pre-edited-cs/data/Resource/ORG/Jenka2.org
rename to pre_edited_cs/data/Resource/ORG/Jenka2.org
diff --git a/pre-edited-cs/data/Resource/ORG/Kodou.org b/pre_edited_cs/data/Resource/ORG/Kodou.org
similarity index 100%
rename from pre-edited-cs/data/Resource/ORG/Kodou.org
rename to pre_edited_cs/data/Resource/ORG/Kodou.org
diff --git a/pre-edited-cs/data/Resource/ORG/LastBtl.org b/pre_edited_cs/data/Resource/ORG/LastBtl.org
similarity index 100%
rename from pre-edited-cs/data/Resource/ORG/LastBtl.org
rename to pre_edited_cs/data/Resource/ORG/LastBtl.org
diff --git a/pre-edited-cs/data/Resource/ORG/LastBtl3.org b/pre_edited_cs/data/Resource/ORG/LastBtl3.org
similarity index 100%
rename from pre-edited-cs/data/Resource/ORG/LastBtl3.org
rename to pre_edited_cs/data/Resource/ORG/LastBtl3.org
diff --git a/pre-edited-cs/data/Resource/ORG/LastCave.org b/pre_edited_cs/data/Resource/ORG/LastCave.org
similarity index 100%
rename from pre-edited-cs/data/Resource/ORG/LastCave.org
rename to pre_edited_cs/data/Resource/ORG/LastCave.org
diff --git a/pre-edited-cs/data/Resource/ORG/MDown2.org b/pre_edited_cs/data/Resource/ORG/MDown2.org
similarity index 100%
rename from pre-edited-cs/data/Resource/ORG/MDown2.org
rename to pre_edited_cs/data/Resource/ORG/MDown2.org
diff --git a/pre-edited-cs/data/Resource/ORG/Marine.org b/pre_edited_cs/data/Resource/ORG/Marine.org
similarity index 100%
rename from pre-edited-cs/data/Resource/ORG/Marine.org
rename to pre_edited_cs/data/Resource/ORG/Marine.org
diff --git a/pre-edited-cs/data/Resource/ORG/Maze.org b/pre_edited_cs/data/Resource/ORG/Maze.org
similarity index 100%
rename from pre-edited-cs/data/Resource/ORG/Maze.org
rename to pre_edited_cs/data/Resource/ORG/Maze.org
diff --git a/pre-edited-cs/data/Resource/ORG/Mura.org b/pre_edited_cs/data/Resource/ORG/Mura.org
similarity index 100%
rename from pre-edited-cs/data/Resource/ORG/Mura.org
rename to pre_edited_cs/data/Resource/ORG/Mura.org
diff --git a/pre-edited-cs/data/Resource/ORG/Oside.org b/pre_edited_cs/data/Resource/ORG/Oside.org
similarity index 100%
rename from pre-edited-cs/data/Resource/ORG/Oside.org
rename to pre_edited_cs/data/Resource/ORG/Oside.org
diff --git a/pre-edited-cs/data/Resource/ORG/Plant.org b/pre_edited_cs/data/Resource/ORG/Plant.org
similarity index 100%
rename from pre-edited-cs/data/Resource/ORG/Plant.org
rename to pre_edited_cs/data/Resource/ORG/Plant.org
diff --git a/pre-edited-cs/data/Resource/ORG/Requiem.org b/pre_edited_cs/data/Resource/ORG/Requiem.org
similarity index 100%
rename from pre-edited-cs/data/Resource/ORG/Requiem.org
rename to pre_edited_cs/data/Resource/ORG/Requiem.org
diff --git a/pre-edited-cs/data/Resource/ORG/Toroko.org b/pre_edited_cs/data/Resource/ORG/Toroko.org
similarity index 100%
rename from pre-edited-cs/data/Resource/ORG/Toroko.org
rename to pre_edited_cs/data/Resource/ORG/Toroko.org
diff --git a/pre-edited-cs/data/Resource/ORG/Vivi.org b/pre_edited_cs/data/Resource/ORG/Vivi.org
similarity index 100%
rename from pre-edited-cs/data/Resource/ORG/Vivi.org
rename to pre_edited_cs/data/Resource/ORG/Vivi.org
diff --git a/pre-edited-cs/data/Resource/ORG/Wanpak2.org b/pre_edited_cs/data/Resource/ORG/Wanpak2.org
similarity index 100%
rename from pre-edited-cs/data/Resource/ORG/Wanpak2.org
rename to pre_edited_cs/data/Resource/ORG/Wanpak2.org
diff --git a/pre-edited-cs/data/Resource/ORG/Wanpaku.org b/pre_edited_cs/data/Resource/ORG/Wanpaku.org
similarity index 100%
rename from pre-edited-cs/data/Resource/ORG/Wanpaku.org
rename to pre_edited_cs/data/Resource/ORG/Wanpaku.org
diff --git a/pre-edited-cs/data/Resource/ORG/Weed.org b/pre_edited_cs/data/Resource/ORG/Weed.org
similarity index 100%
rename from pre-edited-cs/data/Resource/ORG/Weed.org
rename to pre_edited_cs/data/Resource/ORG/Weed.org
diff --git a/pre-edited-cs/data/Resource/ORG/White.org b/pre_edited_cs/data/Resource/ORG/White.org
similarity index 100%
rename from pre-edited-cs/data/Resource/ORG/White.org
rename to pre_edited_cs/data/Resource/ORG/White.org
diff --git a/pre-edited-cs/data/Resource/ORG/XXXX.org b/pre_edited_cs/data/Resource/ORG/XXXX.org
similarity index 100%
rename from pre-edited-cs/data/Resource/ORG/XXXX.org
rename to pre_edited_cs/data/Resource/ORG/XXXX.org
diff --git a/pre-edited-cs/data/Resource/ORG/Zonbie.org b/pre_edited_cs/data/Resource/ORG/Zonbie.org
similarity index 100%
rename from pre-edited-cs/data/Resource/ORG/Zonbie.org
rename to pre_edited_cs/data/Resource/ORG/Zonbie.org
diff --git a/pre-edited-cs/data/Resource/ORG/ironH.org b/pre_edited_cs/data/Resource/ORG/ironH.org
similarity index 100%
rename from pre-edited-cs/data/Resource/ORG/ironH.org
rename to pre_edited_cs/data/Resource/ORG/ironH.org
diff --git a/pre-edited-cs/data/Resource/ORG/quiet.org b/pre_edited_cs/data/Resource/ORG/quiet.org
similarity index 100%
rename from pre-edited-cs/data/Resource/ORG/quiet.org
rename to pre_edited_cs/data/Resource/ORG/quiet.org
diff --git a/pre-edited-cs/data/Resource/WAVE/Wave.dat b/pre_edited_cs/data/Resource/WAVE/Wave.dat
similarity index 100%
rename from pre-edited-cs/data/Resource/WAVE/Wave.dat
rename to pre_edited_cs/data/Resource/WAVE/Wave.dat
diff --git a/pre-edited-cs/data/ScriptSource/ArmsItem.txt b/pre_edited_cs/data/ScriptSource/ArmsItem.txt
similarity index 92%
rename from pre-edited-cs/data/ScriptSource/ArmsItem.txt
rename to pre_edited_cs/data/ScriptSource/ArmsItem.txt
index 36e3f8c..0683cbb 100644
--- a/pre-edited-cs/data/ScriptSource/ArmsItem.txt
+++ b/pre_edited_cs/data/ScriptSource/ArmsItem.txt
@@ -1,5 +1,6 @@
 #0000
 <FRE<WAI9999<END
+
 #1000
 <MSG<TURNo weapon.<WAI9999<END
 #1001
@@ -43,6 +44,7 @@ For advanced players.<WAI9999<END
 <MSG<TUR- Spur -
 Hold down the button to
 fire a laser.<WAI9999<END
+
 #1100
 <MSG<TURPuppy<WAI9999<END
 #1101
@@ -53,6 +55,7 @@ fire a laser.<WAI9999<END
 <MSG<TURPuppies (4)<WAI9999<END
 #1104
 <MSG<TURPuppies (5)<WAI9999<END
+
 #1200
 <MSG<TURJenka's pet dog.<WAI9999<END
 #1201
@@ -63,6 +66,7 @@ fire a laser.<WAI9999<END
 <MSG<TURJenka's pet dogs. You have found 4.<WAI9999<END
 #1204
 <MSG<TURJenka's pet dogs. You have found 5!<WAI9999<END
+
 #5000
 <MSG<TURNo item.<WAI9999<END
 #5001
@@ -148,6 +152,16 @@ fire a laser.<WAI9999<END
 <MSG<TURWhimsical Star<WAI9999<END
 #5039
 <MSG<TURIron Bond<WAI9999<END
+#5040
+<MSG<TURKeyring<WAI9999<END
+#5041
+<MSG<TURVictory Medals<WAI9999<END
+#5042
+<MSG<TURLewd Items<WAI9999<END
+#5043
+<MSG<TURSprinklers<WAI9999<END
+#5044
+<MSG<TURMushrooms<WAI9999<END
 #6000
 <MSG<TURNo item.<WAI9999<END
 #6001
@@ -319,6 +333,23 @@ Equipped the Whimsical Star.<NOD<WAI0003<FRE<EVE5038
 <MSG<TURYour tie to Curly Brace, the only
 warrior you would trust your back to.
 Surely you will meet again one day...<WAI9999<END
+#6040
+<EVE8300
+#6041
+<MSG<TUROne is small and profoundly heavy.
+The other is engraved with the
+silhouette of an alien. Useless.<WAI9999<END
+#6042
+<MSG<TURRed lipstick and yellow-green
+panties with a cute little
+insignia. They have no use.<WAI9999<END
+#6043
+<MSG<TURTwo sprinklers. One is busted.
+One is brand-new. ...Perhaps.<WAI9999<END
+#6044
+<MSG<TURA mushroom with the power to
+restore memories, and the useless
+badge it gives out.<WAI9999<END
 #7002
 <MLP<END
 #7018
@@ -455,6 +486,41 @@ Will you check it?<YNJ8200<CLR
 #8200
 <FRE<EVE5005
 
+#8300
+<KEY<MSG<TURHolds several keys. Check it?<YNJ8400
+<FLJ7100:8301<EVE8302
+#8301
+<KEY<MSG<TUR<GIT1001
+Arthur's Key<NOD<EVE8302
+#8302
+<FLJ7102:8303<EVE8304
+#8303
+<KEY<MSG<TUR<GIT1003
+Santa's Key<NOD<EVE8304
+#8304
+<FLJ7107:8305<EVE8306
+#8305
+<KEY<MSG<TUR<GIT1009
+Rusty Key<NOD<EVE8306
+#8306
+<FLJ7108:8307<EVE8308
+#8307
+<KEY<MSG<TUR<GIT1010
+Gum Key<NOD<EVE8308
+#8308
+<FLJ7115:8309<EVE8310
+#8309
+<KEY<MSG<TUR<GIT1017
+Clinic Key<NOD<EVE8310
+#8310
+<FLJ7123:8311<EVE8400
+#8311
+<KEY<MSG<TUR<GIT1025
+Teleporter Room Key<NOD<EVE8400
+
+#8400
+<FRE<GIT0000<EVE5040
+
 #9000
 <FLJ4001:9001<FLJ4002:9002<FLJ4003:9003<FLJ4004:9004<FLJ4005:9005<FLJ4006:9006<FLJ4007:9007
 <AM+0000:0000<EVE9100
diff --git a/pre-edited-cs/data/ScriptSource/Credit.txt b/pre_edited_cs/data/ScriptSource/Credit.txt
similarity index 100%
rename from pre-edited-cs/data/ScriptSource/Credit.txt
rename to pre_edited_cs/data/ScriptSource/Credit.txt
diff --git a/pre-edited-cs/data/ScriptSource/Head.txt b/pre_edited_cs/data/ScriptSource/Head.txt
similarity index 78%
rename from pre-edited-cs/data/ScriptSource/Head.txt
rename to pre_edited_cs/data/ScriptSource/Head.txt
index 94cd048..f0e62f0 100644
--- a/pre-edited-cs/data/ScriptSource/Head.txt
+++ b/pre_edited_cs/data/ScriptSource/Head.txt
@@ -1,3 +1,54 @@
+#0+00
+<AMJ0013:0+01<PRI<MSG<TUR<GIT0002<AM+0002:0000<FL+7000
+Got the =Polar Star=!<WAI0025<NOD<EVE0015
+#0+01
+<PRI<MSG<TUR<GIT0002<FL+7000
+Got the =Polar Star=!<WAI0025<NOD<EVE0015
+#0+02
+<AMJ0002:0+03<PRI<MSG<TUR<GIT0013<AM+0013:0000<FL+7001
+Got the =Spur=!<WAI0025<NOD<EVE0015
+#0+03
+<PRI<MSG<TUR<GIT0013<TAM0002:0013:0000<FL+7001
+Got the =Spur=!<WAI0025<NOD<EVE0015
+
+#0+04
+<ITJ0023:0+05
+<PRI<MSG<TUR<GIT1018<IT+0018<EQ+0001<FL+0742<FL+7116
+Got the =Booster v0.8=!<WAI0025<NOD<EVE0015
+#0+05
+<PRI<MSG<TUR<GIT1018<FL+7116
+Got the =Booster v0.8=!<WAI0025<NOD<EVE0015
+
+#0+10
+<FLJ0593:0+11<TRA0033:0094:0012:0010
+#0+11
+<TRA0036:0094:0012:0010
+
+Keyring
+#0+20
+<IT-0001<IT-0003<IT-0009<IT-0010<IT-0017<IT-0025
+<ITJ0040:0015<IT+0040<EVE0015
+
+Medals
+#0+21
+<IT-0031<IT-0036
+<ITJ0041:0015<IT+0041<EVE0015
+
+Lewd
+#0+22
+<IT-0035<IT-0037
+<ITJ0042:0015<IT+0042<EVE0015
+
+Sprinklers
+#0+23
+<IT-0028<IT-0029
+<ITJ0043:0015<IT+0043<EVE0015
+
+Mushrooms
+#0+24
+<IT-0033<IT-0034
+<ITJ0044:0015<IT+0044<EVE0015
+
 #0,00
 <END
 7 bit + 3 bit adder using 2 full adders and 4 half adders
@@ -366,12 +417,12 @@ Got the =Polar Star=!<WAI0025<NOD<EVE0015
 <PRI
 <MSG<TUR<GIT0003<FL+7002
 Got the =Fireball=!<WAI0025<NOD<CLR
-<FLJ2801:0006<FL+2801<AM+0003:0000<EVE0015
+<FLJ2803:0006<FL+2801<AM+0003:0000<EVE0015
 #0005
 <PRI
 <MSG<TUR<GIT0001<FL+7003
 Got the =Snake=!<WAI0025<NOD<CLR
-<FLJ2801:0006<FL+2801<AM+0001:0000<EVE0015
+<FLJ2801:0006<FL+2803<AM+0001:0000<EVE0015
 #0006
 <PRI<MSG<TURYou may trade the =Fireball=
 with the =Snake= and vice-versa
@@ -387,26 +438,26 @@ Got the =Machine Gun=!<WAI0025<NOD<EVE0015
 <PRI
 <MSG<TUR<GIT0009<FL+7006
 Got the =Blade=!<WAI0025<NOD<CLR
-<FLJ2810:0011<FL+2810<AM+0009:0000<EVE0015
+<FLJ2812:0011<FL+2810<AM+0009:0000<EVE0015
 #0010
 <PRI
 <MSG<TUR<GIT0012<FL+7007
 Got the =Nemesis=!<WAI0025<NOD<CLR
-<FLJ2810:0011<FL+2810<AM+0012:0000<EVE0015
+<FLJ2810:0011<FL+2812<AM+0012:0000<EVE0015
 #0011
 <PRI<MSG<TURYou may trade the =Nemesis=
 with the =Blade= and vice-versa
 at the computer in Arthur's House.<WAI0050<NOD<FL+2811
 <CLRTrade now?<YNJ0015<AMJ0009:0044<TAM0012:0009:0000<EVE0015
 #0012
-<PRI<MSG<TUR<GIT1006Got a =Life Capsule=!<ML+0003
-Max health increased by 3!<WAI0025<NOD<FL+4301<FL+4302<FL-4303<EVE0028
+<PRI<MSG<TUR<GIT1006Got a =Life Capsule=!
+Max health increased by 3!<ML+0003<WAI0025<NOD<FL+4301<FL+4302<FL-4303<EVE0028
 #0013
-<PRI<MSG<TUR<GIT1006Got a =Life Capsule=!<ML+0004
-Max health increased by 4!<WAI0025<NOD<FL-4301<FL-4302<FL+4303<EVE0028
+<PRI<MSG<TUR<GIT1006Got a =Life Capsule=!
+Max health increased by 4!<ML+0004<WAI0025<NOD<FL-4301<FL-4302<FL+4303<EVE0028
 #0014
-<PRI<MSG<TUR<GIT1006Got a =Life Capsule=!<ML+0005
-Max health increased by 5!<WAI0025<NOD<FL+4301<FL-4302<FL+4303<EVE0028
+<PRI<MSG<TUR<GIT1006Got a =Life Capsule=!
+Max health increased by 5!<ML+0005<WAI0025<NOD<FL+4301<FL-4302<FL+4303<EVE0028
 
 #0015
 <EVE0/00 increment the item counter
@@ -459,24 +510,25 @@ Got the last =Puppy=!<WAI0025<NOD<EVE0015
 <GIT0005Got the =Missile Launcher=!<WAI0025<NOD<EVE0029
 #0031
 <PRI<AM+0005:0005<MSG<TUR
-<GIT0006Max missiles increased by 5!<WAI0025<NOD<EVE0029
+<GIT0006Max missiles increased by <NUM0000!<WAI0025<NOD<EVE0029
 #0032
 <PRI<AM+0010:0005<MSG<TUR
-<GIT0011Max missiles increased by 5!<WAI0025<NOD<EVE0029
+<GIT0011Max missiles increased by <NUM0000!<WAI0025<NOD<EVE0029
 #0033
 <FL+2421<AMJ0005:0034<EVE0030
 #0034
 <PRI<FL+2420<FL-2421<FL+7009<MSG<TUR<GIT0010<TAM0005:0010:0000
-Your Missiles have been powered up!<WAI0025<NOD<EVE0015
+Your Missiles were powered up!!<WAI0025<NOD<EVE0015
 #0035
 <PRI<FL+4036<FLJ2420:0037<FLJ0201:0036<FL+0201<MSG<TUR<GIT0005<AM+0005:0029<FL+7008
 Got the =Missile Launcher=!<WAI0025<NOD<EVE0015
 #0036
-<PRI<AM+0005:0024<MSG<TUR<GIT0006Max missiles increased by 24!<WAI0025<NOD<EVE0015
+<PRI<AM+0005:0024<MSG<TUR<GIT0006Max missiles increased by <NUM0000!<WAI0025<NOD<EVE0015
 #0037
-<PRI<AM+0010:0024<MSG<TUR<GIT0011Max missiles increased by 24!<WAI0025<NOD<EVE0015
+<PRI<AM+0010:0024<MSG<TUR<GIT0011Max missiles increased by <NUM0000!<WAI0025<NOD<EVE0015
 #0038
-<FLJ2421:0034<EVE0030
+<AMJ0005:0034<PRI<FL+2420<FL+7009<FL+0201<FL+7008<MSG<TUR<GIT0010<AM+0010:0005
+Got the =Super Missile Launcher=!<WAI0025<NOD<EVE0015
 #0040
 <SK+0042
 <KEY<CMU0000<WAI0040<PRI<WAI0040<CMU0003
@@ -507,13 +559,21 @@ You were never seen again...<NOD<CLRWant to retry?<YNJ0049<CLO
 <CLO<FAO0004<ESC
 #0051
 <PRI<MSG<TUR<GIT1001<IT+0001<FL+7100
-Got =Arthur's Key=!<WAI0025<NOD<EVE0015
+Got =Arthur's Key=!<WAI0025<NOD<CLO
+<ITJ0040:0+20
+<ITJ0003:0+20<ITJ0009:0+20
+<ITJ0010:0+20<ITJ0017:0+20<ITJ0025:0+20
+<EVE0015
 #0052
 <PRI<MSG<TUR<GIT1002<IT+0002<EQ+0002<FL+7101
 Got the =Map System=!<WAI0025<NOD<EVE0015
 #0053
 <PRI<MSG<TUR<GIT1003<IT+0003<FL+7102
-Got =Santa's Key=!<WAI0025<NOD<EVE0015
+Got =Santa's Key=!<WAI0025<NOD<CLO
+<ITJ0040:0+20
+<ITJ0001:0+20<ITJ0009:0+20
+<ITJ0010:0+20<ITJ0017:0+20<ITJ0025:0+20
+<EVE0015
 #0054
 <PRI<MSG<TUR<GIT1004<IT+0004<FL+7103
 Got the =Silver Locket=!<WAI0025<NOD<EVE0015
@@ -528,10 +588,18 @@ Got the =ID Card=!<WAI0025<NOD<EVE0015
 Got the =Jellyfish Juice=!<WAI0025<NOD<EVE0015
 #0059
 <PRI<MSG<TUR<GIT1009<IT+0009<FL+7107
-Got the =Rusty Key=!<WAI0025<NOD<EVE0015
+Got the =Rusty Key=!<WAI0025<NOD<CLO
+<ITJ0040:0+20
+<ITJ0001:0+20<ITJ0003:0+20
+<ITJ0010:0+20<ITJ0017:0+20<ITJ0025:0+20
+<EVE0015
 #0060
 <PRI<MSG<TUR<GIT1010<IT+0010<FL+7108
-Got the =Gum Key=!<WAI0025<NOD<EVE0015
+Got the =Gum Key=!<WAI0025<NOD<CLO
+<ITJ0040:0+20
+<ITJ0001:0+20<ITJ0003:0+20<ITJ0009:0+20
+<ITJ0017:0+20<ITJ0025:0+20
+<EVE0015
 #0061
 <PRI<MSG<TUR<GIT1011<IT+0011<FL+7109
 Got the =Gum Base=!<WAI0025<NOD<EVE0015
@@ -551,7 +619,11 @@ Got the =Life Pot=!<WAI0025<NOD<EVE0015
 Got the =Cure-All=!<WAI0025<NOD<EVE0015
 #0067
 <PRI<MSG<TUR<GIT1017<IT+0017<FL+7115
-Got the =Clinic Key=!<WAI0025<NOD<EVE0015
+Got the =Clinic Key=!<WAI0025<NOD<CLO
+<ITJ0040:0+20
+<ITJ0001:0+20<ITJ0003:0+20<ITJ0009:0+20
+<ITJ0010:0+20<ITJ0025:0+20
+<EVE0015
 #0068
 <ITJ0018:0073
 <PRI<MSG<TUR<GIT1018<IT+0018<EQ+0001<FL+0742<FL+7116
@@ -577,7 +649,11 @@ Got the =Booster v2.0=!<WAI0025<NOD<EVE0015
 Got the =Mimiga Mask=!<WAI0025<NOD<EVE0015
 #0075
 <PRI<MSG<TUR<GIT1025<IT+0025<FL+7123
-Got the =Teleporter Room Key=!<WAI0025<NOD<EVE0015
+Got the =Teleporter Room Key=!<WAI0025<NOD<CLO
+<ITJ0040:0+20
+<ITJ0001:0+20<ITJ0003:0+20<ITJ0009:0+20
+<ITJ0010:0+20<ITJ0017:0+20
+<EVE0015
 #0076
 <PRI<MSG<TUR<GIT1026<IT+0026<FL+7124
 Got =Sue's Letter=!<WAI0025<NOD<EVE0015
@@ -586,34 +662,34 @@ Got =Sue's Letter=!<WAI0025<NOD<EVE0015
 Got the =Controller=!<WAI0025<NOD<EVE0015
 #0078
 <PRI<MSG<TUR<GIT1028<IT+0028<FL+7126
-Got the =Broken Sprinkler=!<WAI0025<NOD<EVE0015
+Got the =Broken Sprinkler=!<WAI0025<NOD<CLO<ITJ0043:0+23<ITJ0029:0+23<EVE0015
 #0079
 <PRI<MSG<TUR<GIT1029<IT+0029<FL+7127
-Got the =Sprinkler=!<WAI0025<NOD<EVE0015
+Got the =Sprinkler=!<WAI0025<NOD<CLO<ITJ0043:0+23<ITJ0028:0+23<EVE0015
 #0080
 <PRI<MSG<TUR<GIT1030<IT+0030<FL+7128
 Got the =Tow Rope=!<WAI0025<NOD<EVE0015
 #0081
 <PRI<MSG<TUR<GIT1031<IT+0031<FL+7129
-Got the =Clay Figure Medal=!<WAI0025<NOD<EVE0015
+Got the =Clay Figure Medal=!<WAI0025<NOD<CLO<ITJ0041:0+21<ITJ0036:0+21<EVE0015
 #0082
 <PRI<MSG<TUR<GIT1032<IT+0032<FL+7130
 Got the =Little Man=!<WAI0025<NOD<EVE0015
 #0083
 <PRI<MSG<TUR<GIT1033<IT+0033<FL+7131
-Got the =Mushroom Badge=!<WAI0025<NOD<EVE0015
+Got the =Mushroom Badge=!<WAI0025<NOD<CLO<ITJ0044:0+24<ITJ0034:0+24<EVE0015
 #0084
 <PRI<MSG<TUR<GIT1034<IT+0034<FL+7132
-Got =Ma Pignon=!<WAI0025<NOD<EVE0015
+Got =Ma Pignon=!<WAI0025<NOD<CLO<ITJ0044:0+24<ITJ0033:0+24<EVE0015
 #0085
 <PRI<MSG<TUR<GIT1035<IT+0035<FL+7133
-Got =Curly's Underwear=!<WAI0025<NOD<EVE0015
+Got =Curly's Underwear=!<WAI0025<NOD<CLO<ITJ0042:0+22<ITJ0037:0+22<EVE0015
 #0086
 <PRI<MSG<TUR<GIT1036<IT+0036<FL+7134
-Got the =Alien Medal=!<WAI0025<NOD<EVE0015
+Got the =Alien Medal=!<WAI0025<NOD<CLO<ITJ0041:0+21<ITJ0031:0+21<EVE0015
 #0087
 <PRI<MSG<TUR<GIT1037<IT+0037<FL+7135
-Got =Chaco's Lipstick=!<WAI0025<NOD<EVE0015
+Got =Chaco's Lipstick=!<WAI0025<NOD<CLO<ITJ0042:0+22<ITJ0035:0+22<EVE0015
 #0088
 <PRI<MSG<TUR<GIT1038<IT+0038<EQ+0128<FL+0722<FL+7136
 Got the =Whimsical Star=!<WAI0025<NOD<EVE0015
diff --git a/pre-edited-cs/data/ScriptSource/StageSelect.txt b/pre_edited_cs/data/ScriptSource/StageSelect.txt
similarity index 100%
rename from pre-edited-cs/data/ScriptSource/StageSelect.txt
rename to pre_edited_cs/data/ScriptSource/StageSelect.txt
diff --git a/pre-edited-cs/data/Stage/0.pxa b/pre_edited_cs/data/Stage/0.pxa
similarity index 100%
rename from pre-edited-cs/data/Stage/0.pxa
rename to pre_edited_cs/data/Stage/0.pxa
diff --git a/pre-edited-cs/data/Stage/0.pxe b/pre_edited_cs/data/Stage/0.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/0.pxe
rename to pre_edited_cs/data/Stage/0.pxe
diff --git a/pre-edited-cs/data/Stage/0.pxm b/pre_edited_cs/data/Stage/0.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/0.pxm
rename to pre_edited_cs/data/Stage/0.pxm
diff --git a/pre-edited-cs/data/Stage/0.tsc b/pre_edited_cs/data/Stage/0.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/0.tsc
rename to pre_edited_cs/data/Stage/0.tsc
diff --git a/pre-edited-cs/data/Stage/555.pxe b/pre_edited_cs/data/Stage/555.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/555.pxe
rename to pre_edited_cs/data/Stage/555.pxe
diff --git a/pre-edited-cs/data/Stage/Almond.pxa b/pre_edited_cs/data/Stage/Almond.pxa
similarity index 100%
rename from pre-edited-cs/data/Stage/Almond.pxa
rename to pre_edited_cs/data/Stage/Almond.pxa
diff --git a/pre-edited-cs/data/Stage/Almond.pxe b/pre_edited_cs/data/Stage/Almond.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/Almond.pxe
rename to pre_edited_cs/data/Stage/Almond.pxe
diff --git a/pre-edited-cs/data/Stage/Almond.pxm b/pre_edited_cs/data/Stage/Almond.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/Almond.pxm
rename to pre_edited_cs/data/Stage/Almond.pxm
diff --git a/pre-edited-cs/data/Stage/Almond.tsc b/pre_edited_cs/data/Stage/Almond.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/Almond.tsc
rename to pre_edited_cs/data/Stage/Almond.tsc
diff --git a/pre-edited-cs/data/Stage/Ballo1.pxe b/pre_edited_cs/data/Stage/Ballo1.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/Ballo1.pxe
rename to pre_edited_cs/data/Stage/Ballo1.pxe
diff --git a/pre-edited-cs/data/Stage/Ballo1.pxm b/pre_edited_cs/data/Stage/Ballo1.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/Ballo1.pxm
rename to pre_edited_cs/data/Stage/Ballo1.pxm
diff --git a/pre-edited-cs/data/Stage/Ballo1.tsc b/pre_edited_cs/data/Stage/Ballo1.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/Ballo1.tsc
rename to pre_edited_cs/data/Stage/Ballo1.tsc
diff --git a/pre-edited-cs/data/Stage/Ballo2.pxe b/pre_edited_cs/data/Stage/Ballo2.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/Ballo2.pxe
rename to pre_edited_cs/data/Stage/Ballo2.pxe
diff --git a/pre-edited-cs/data/Stage/Ballo2.pxm b/pre_edited_cs/data/Stage/Ballo2.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/Ballo2.pxm
rename to pre_edited_cs/data/Stage/Ballo2.pxm
diff --git a/pre-edited-cs/data/Stage/Ballo2.tsc b/pre_edited_cs/data/Stage/Ballo2.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/Ballo2.tsc
rename to pre_edited_cs/data/Stage/Ballo2.tsc
diff --git a/pre-edited-cs/data/Stage/Barr.pxa b/pre_edited_cs/data/Stage/Barr.pxa
similarity index 100%
rename from pre-edited-cs/data/Stage/Barr.pxa
rename to pre_edited_cs/data/Stage/Barr.pxa
diff --git a/pre-edited-cs/data/Stage/Barr.pxe b/pre_edited_cs/data/Stage/Barr.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/Barr.pxe
rename to pre_edited_cs/data/Stage/Barr.pxe
diff --git a/pre-edited-cs/data/Stage/Barr.pxm b/pre_edited_cs/data/Stage/Barr.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/Barr.pxm
rename to pre_edited_cs/data/Stage/Barr.pxm
diff --git a/pre-edited-cs/data/Stage/Barr.tsc b/pre_edited_cs/data/Stage/Barr.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/Barr.tsc
rename to pre_edited_cs/data/Stage/Barr.tsc
diff --git a/pre-edited-cs/data/Stage/Blcny1.pxe b/pre_edited_cs/data/Stage/Blcny1.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/Blcny1.pxe
rename to pre_edited_cs/data/Stage/Blcny1.pxe
diff --git a/pre-edited-cs/data/Stage/Blcny1.pxm b/pre_edited_cs/data/Stage/Blcny1.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/Blcny1.pxm
rename to pre_edited_cs/data/Stage/Blcny1.pxm
diff --git a/pre-edited-cs/data/Stage/Blcny1.tsc b/pre_edited_cs/data/Stage/Blcny1.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/Blcny1.tsc
rename to pre_edited_cs/data/Stage/Blcny1.tsc
diff --git a/pre-edited-cs/data/Stage/Blcny2.pxe b/pre_edited_cs/data/Stage/Blcny2.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/Blcny2.pxe
rename to pre_edited_cs/data/Stage/Blcny2.pxe
diff --git a/pre-edited-cs/data/Stage/Blcny2.pxm b/pre_edited_cs/data/Stage/Blcny2.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/Blcny2.pxm
rename to pre_edited_cs/data/Stage/Blcny2.pxm
diff --git a/pre-edited-cs/data/Stage/Blcny2.tsc b/pre_edited_cs/data/Stage/Blcny2.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/Blcny2.tsc
rename to pre_edited_cs/data/Stage/Blcny2.tsc
diff --git a/pre-edited-cs/data/Stage/Cave.pxa b/pre_edited_cs/data/Stage/Cave.pxa
similarity index 100%
rename from pre-edited-cs/data/Stage/Cave.pxa
rename to pre_edited_cs/data/Stage/Cave.pxa
diff --git a/pre-edited-cs/data/Stage/Cave.pxe b/pre_edited_cs/data/Stage/Cave.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/Cave.pxe
rename to pre_edited_cs/data/Stage/Cave.pxe
diff --git a/pre-edited-cs/data/Stage/Cave.pxm b/pre_edited_cs/data/Stage/Cave.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/Cave.pxm
rename to pre_edited_cs/data/Stage/Cave.pxm
diff --git a/pre-edited-cs/data/Stage/Cave.tsc b/pre_edited_cs/data/Stage/Cave.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/Cave.tsc
rename to pre_edited_cs/data/Stage/Cave.tsc
diff --git a/pre-edited-cs/data/Stage/Cemet.pxe b/pre_edited_cs/data/Stage/Cemet.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/Cemet.pxe
rename to pre_edited_cs/data/Stage/Cemet.pxe
diff --git a/pre-edited-cs/data/Stage/Cemet.pxm b/pre_edited_cs/data/Stage/Cemet.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/Cemet.pxm
rename to pre_edited_cs/data/Stage/Cemet.pxm
diff --git a/pre-edited-cs/data/Stage/Cemet.tsc b/pre_edited_cs/data/Stage/Cemet.tsc
similarity index 57%
rename from pre-edited-cs/data/Stage/Cemet.tsc
rename to pre_edited_cs/data/Stage/Cemet.tsc
index 838a856..e5d4000 100644
--- a/pre-edited-cs/data/Stage/Cemet.tsc
+++ b/pre_edited_cs/data/Stage/Cemet.tsc
@@ -1 +1 @@
->;Taaja>;m~rmt~�aabcmwrzaaaamvu>;Taajb>;m~rmt~�aabcmwrzaaabmvu>;Taajc>;m~rmt~�aabcmwrzaaacmvu>;Taajd>;m~rmt~�aabcmwrzaaadmvu>;Taaje>;m~rmt~�aabcmwrzaaaemvu>;Tabaa>;m��zmwr�aaaam��raabbkaajakaafgkaadd>;Tabba>;m|v�m���aabbmr�abbakaaaakaaac>;mwr�aaaem��raaidkaajekaaahkaa1a>;Tacaa>;m��zmu�acaa>;mv�vacac>;Tacac>;mv�vaaic>;Tadaa>;mt�adaakaaaakaaaamw}{adjakadacmw}\adjamv�vadab>;Tadab>;mv�vaafb>;Tadac>;m��zm~�xr�����X�Q�����_m�u>;�����X�Q�������Q��Q���>;���������km�umt}�m~�xm���y���Q������Q���Q�����Qr�����]>;����Q����Q��Q���Q~������_m�umt}�mvu
\ No newline at end of file
+GD]jjsjGDv��{v}��jjklv�{�jjjjv�~GD]jjskGDv��{v}��jjklv�{�jjjkv�~GD]jjslGDv��{v}��jjklv�{�jjjlv�~GD]jjsmGDv��{v}��jjklv�{�jjjmv�~GD]jjsnGDv��{v}��jjklv�{�jjjnv�~GD]jkjjGDv���v�{�jjjjv��{jjkktjjsjtjjoptjjmmGD]jkkjGDv��v���jjkkv{��jkkjtjjjjtjjjlGDv�{�jjjnv��{jjrmtjjsntjjjq:jjkjGD]jljjGDv���v~��jljjGDv�jljlGD]jljlGDv�jjrlGD]jmjjGDv}��jmjjtjjjjtjjjjv���jmsjtjmjlv��ejmsjv�jmjkGD]jmjkGDv�jjokGD]jmjlGDv���v��������a�Z�����hv��~GD�����a�Z�������Z��Z���GD���������tv��~v}��v���v�������Z������Z���Z�����Z�����fGD����Z����Z��Z���Z}��}hv��~v}��v�~
\ No newline at end of file
diff --git a/pre-edited-cs/data/Stage/Cent.pxa b/pre_edited_cs/data/Stage/Cent.pxa
similarity index 100%
rename from pre-edited-cs/data/Stage/Cent.pxa
rename to pre_edited_cs/data/Stage/Cent.pxa
diff --git a/pre-edited-cs/data/Stage/Cent.pxe b/pre_edited_cs/data/Stage/Cent.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/Cent.pxe
rename to pre_edited_cs/data/Stage/Cent.pxe
diff --git a/pre-edited-cs/data/Stage/Cent.pxm b/pre_edited_cs/data/Stage/Cent.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/Cent.pxm
rename to pre_edited_cs/data/Stage/Cent.pxm
diff --git a/pre_edited_cs/data/Stage/Cent.tsc b/pre_edited_cs/data/Stage/Cent.tsc
new file mode 100644
index 0000000..4d6e8c5
--- /dev/null
+++ b/pre_edited_cs/data/Stage/Cent.tsc
@@ -0,0 +1 @@
+?<Ubbkb?<n�snu�bbdfnxs{bbbbnw�v?<Ubbkc?<n�snu�bbdfnxs{bbbcnw�v?<Ubbkd?<n�snu�bbdfnxs{bbbdnw�v?<Ubbke?<n�snu�bbdfnxs{bbbenw�v?<Ubbkf?<n�snu�bbdfnxs{bbbfnw�v?<Ubcbb?<n}w�n���bbccns��bcbblbbbblbbbdnxs�bbbdn��sbbgglbbkdlbbbelbbbk?<Ubccb?<n}w�nxs�bbbdn��sbbgilbbkdlbbbglbbcf?<Ubccg?<n}w�n���bbccns��bccglbbbblbbbdnxs�bbbdn��sbbgilbbkdlbbbelbbbd?<Ubcdb?<n��{nx~|ccbglbcddn�yn�������Y�R���R��������qn��vn{�|bbdhlbcdcnw�v?<Ubcdc?<n�yn���?<T~�������R�������T`n��vnu~�?<n}w�n���bbccns��bcdblbbbblbbbdnxs�bbben��sbbgjlbbkelbbbklbbbf?<Ubcdd?<n}w�n���bbccns��bcdblbbbblbbbdnxs�bbben��sbbgjlbbkelbbbklbbbf?<Ubceb?<n}w�n���bbccns��bceblbbbblbbbdnxs�bbbbn��sbbgklbbkblbbdhlbbbj?<Ubceg?<n��{?<nx~|cbdelbcei?<nx~|icdelbceh?<n�yn���{�R����RT��Rw����T`n��v?<s��R��Y�R������`n��vnw�v?<Ubceh?<n���bbddn�yn���ny{�cbdg����R���Ro����������R����R}��o`n��vnu~�n{�_bbdg?<ny{�bbbbnx~]cbdenw�wbcei?<Ubcei?<n}w�n���bbccns��bceglbbbblbbbdnxs�bbbbn��sbbhblbbkblbbcjlbbbk?<Ubcfb?<n}w�nxs�bbbbn��sbbhclbbkblbbdklbbbk?<Ubcgb?<n��{nx~|cbeblcebbnx~|hfbblcebbn�y{�Y�R�����R���R�����R��R����?<����```n��vnw�v?<Ubcgc?<n}w�n���bbccns��bcgblbbbblbbbdnxs�bbbd?<n{�|bbdelbchb?<n}w�n��sbbhelbbkdlbbbilbbgd?<Ubchb?<n}w�n��sbbhilbbkdlbbbilbbgd?<Ubcib?<n}w�nxs�bbbdn��sbbjflbbkdlbbbclbbdc?<Ubckk?<n��bbiflbbiknw�v?<Ubdbb?<n��{nx~|cbdblbdbc?<nw�wbdkk?<Ubdbc?<n��{n�yn������R�������R��������R���R��������?<��R������R��R��^R��R��Y��R�������?<���R�������R��R�������`n��vnu~�{�R����R���Rv�����R����R��?<����^R�����R�������R������?<�����R����^R��R����`n��vnw�v?<Ubdcb?<n��{nx~|cbdblbdcc?<nw�wbdkk?<Ubdcc?<n��{n�yn�������R���R���R�������R��R���?<����^R�����R������R������Y��R��?<�R�����R��R����Sn��vnu~�t����R����^R��R�������R��������Sn��vnw�v?<Ubddb?<n��{nx~|cbdblbddc?<nw�wbdkk?<Ubddc?<n��{n�yn���~���R����R���Rv�����Sn��vnw�v?<Ubdeb?<n��{nx~|cbdblbdec?<nw�wbdkk?<Ubdec?<n��{n�yn���y��R��R����Sn��vnw�v?<Ubdfb?<n��{?<nx~|cbeilbdfd?<nx~|cbdblbdfc?<nw�wbdkk?<Ubdfc?<n��{nx~]cbein�yn������`n��vnu~����Y��R���R����^R����Y�R��`n��v?<nu~�{R���R���Y��R�����R��������^?<�����R������R��R���R�������?<����R���R��R�R������`n��vnu~�����^R����R��������`n��v?<v��Y�R���R��������R�����`n��v?<nu~�{�R���R���R����R���R���?<������^R����Y��R�����R���?<��R������`n��vnu~�s�R����R��R���R����R����R��?<���R�������^R���Y��R��R����^?<���R���Y��R���R��R���`n��vnw�v?<Ubdfd?<n��{n�yn���z��Y�R���R����R����Yqn��vnu~�����R���R����^R��Y��R��?<����R��R���R����^R��������?<����R��R��R����`n��vnu~�```{R����^R��R����^R���Y�R��qn��vnw�v?<Ubdgb?<n��{?<n{�|bbdklbdgf?<n{�|bbfelbdgf?<nx~|cbdklbdge?<nx~|cbdblbdgd?<n��{n�yn�����^R�����R����������R����```n��vnu~�������`?<���R��������R��R����R��R������`n��vnw�v?<Ubdgc?<n��{n�yn��������R����������R���R�����^R���?<����R����R�����R���R���R����`n��vnw�v?<Ubdgd?<n��{nx~]cbdkn�yn���{�R������R�����Sn��vnu~�`````n��vnu~�z��^R���`?<���Y��R���R���R���^R�����qn��v?<nu~�y�R����R����R������R���������?<��R���R��������R��R���R�R���?<���`n��vnw�v?<Ubdge?<n��{n�yn���z����R��R��SR���R������R����?<���R�������R�������`n��v?<nu~�y�R����R����R������R���������?<��R���R��������R��R���R�R���?<���`n��vnw�v?<Ubdgf?<n��{n�yn���{�Y�R���R���R�������R����?<����R��R��������R��������Sn��v?<nu~���R������R���R����R��������?<��R��R���R�����`n��v?<nu~���R���R����R��R������R���R������?<����Y�R����R��R���R������Sn��vnu~�z��_���_���```n��vnu~�t����^R������R�������```n��v?<�����R��R����^R{Y�R�������?<�R���R����R��R�������`n��vnw�v?<Ubdhb?<n��{n�s�?<nx~|cbdelbdhe?<nx~|cbddlbdhd?<nx~|cbeglbdhc?<nx~]cbeg?<n�y{R������R���������R�����?<����R���`n��v?<{�Y�R��R���R������R�����`n��vnw�v?<Ubdhc?<n��{n�y{�Y�R��R���R������R�����`n��vnw�v?<Ubdhd?<n��{n�y�����R����R����R���R��^R{R������qn��vnu~����Y�R�����R��Y�R�����?<��R����R���������R������R����```n��vnu~���^R{Y�R������```n��vnw�v?<Ubdhe?<n��{n�y{Y�R���R��������Rs���z{�y`n��vnw�v?<Ubdhg?<n��{?<nx~|cbddlbdhi?<nw�wbdhh?<Ubdhh?<nx~]cbdd?<nw�wbdhj?<Ubdhi?<n��{n�yn����������R��R����R�������```n��vnw�v?<Ubdhj?<nw�wbbig?<Ubdkk?<n��{n�y`````n��vnw�v?<Ubebb?<Ubebc?<Ubecb?<nw�wbbbb?<Ubecc?<n��{n�yx����R����R���R�����R��R���?<������`n��v?<nu~�����R���R�����Y�R����R��������?<���R���R��```n��vnu~�|���R�R�����R��R����^R{R�����`n��vnx~]cbffnw�wbecd?<Ubecd?<n��{n�y���R����R���R�������R��```n��v?<�����Y�R�R�������R����R��?<��������^R{Y�R����^n��vnu~�����R������R����R��������?<����R���R���R��```n��v?<������R��R��Y�R����R��R���qn��vnw�v?<Ubece?<n��{n�y����Y�R����q?<z��R��������R���R����qn��v?<nu~�����`R~����R��R������R���?<���R���`n��vnw�v?<Ubedb?<n��{n�s�?<nx~|cbfhlbedg?<nx~|cbfglbedf?<nx~|cbdblbedc?<nx~]cbfcn�ynxsubbdg���```R���R���```qn��vn{�|bbfflbed2n{�|bbeflbeddnw�v?<Ubedc?<n��{n�ynxsubbdg��```n��v?<���Y��R��R����```n��vnu~�v��Y�R��R���R���`n��v?<s��R�����R���R���R���?<���R������```n��vn{�|bbfflbeddn{�|bbeflbeddnw�v?<Ubedd?<n��{nxsubbbbn�yn���ny{�cbefn{�_bbefnu�bbbbnu~�nx~]cbfh?<|�����R��R����Ru����Y�R�����`n��vnu~�nu~�n�s{bbgbnw�_bbhfn�s{bbgb?<nx~]cbfgn��n{�|bbfflbedhnx~|cbdblbedenw�wbedf?<Ubede?<n��{nw�]bbhfnw�wbedf?<Ubedf?<nw�wbbjk?<Ubedg?<n��{n�ynxsubbck{Y�R����R���`n��vnw�v?<Ubedh?<n{�_bbffn{�]bbeenx~|cbdblbedenw�wbedf?<Ubegb?<n��{n�yn���v�R���R����R��R����R���?<������qn��|bbbbnu~�?<ns��begblbbcblbbbbnw�v?<Ubehb?<n��{n�yn���nxsubbdj{Y�R����Sn��vnu~���R���R��R������?<�������^R���R����qn��vnu~�s��R������^R���R������?<������Y�R��R��������?<�������R��R����Sn��vnu~�t�R���R���```n��vnu~�{�R���R������R���Rv�����^n��vnu~���R���R�����R{Y��R��?<����R��R������R�R�����?<�����```qn��vnw�v?<?<Ubeib?<n��{n�s�n�ynxsubbdds��R���R�����R��R����R��R���?<������R����qR~��Y�R���```n��vnw�wbeic?<?<Ubeic?<nx~|hbbelbejb?<nx~|djbblbeie?<n��{n�ynxsubbdd~����R����R���R�����R����R��?<����R��R��������`n��vnu~�n{�|bbbilbeidny{�cbbi?<n�ynxsubbddny{�cbbi���R�����R����R��R����R���?<o{vRu���o`n��vnu~�?<nx~|hbbclbeifnx~|hbbdlbeifnx~|hbbflbeifnw�wbekk?<Ubeid?<n��{n�ynxsubbddny{�cbbiy���^R���Y��R�����R���?<o{vRu���o`n��vnu~�?<nx~|hbbclbeifnx~|hbbdlbeifnx~|hbbflbeifnw�wbekk?<Ubeie?<n��{n�ynxsubbdd~����R����R���Y��R�������?<�����R��R��������`n��v?<nx~|hbbclbeifnx~|hbbdlbeifnx~|hbbflbeifnw�wbekk?<?<Ubeif?<n{�|bbdelbeig?<n��{n�ynxsubbddny{�cbde���R�����R����R��R����R���?<ot������Rd`bo`n��vnw�wbeih?<Ubeig?<n��{n�ynxsubbddny{�cbdey���^R���Y��R�����R���?<ot������Rd`bo`n��vnw�wbeih?<?<Ubeih?<n{�|bbeklbeii?<n��{n�ynxsubbddny{�cbek���R�����R����R��R����R���?<o{���Rt���o`n��vnx~|hbbdlbeijnx~|hbbflbeijnw�wbekk?<Ubeii?<n��{n�ynxsubbddny{�cbeky���^R���Y��R�����R���?<o{���Rt���o`n��vnx~|hbbdlbeijnx~|hbbflbeijnw�wbekk?<?<Ubeij?<n��{n�ynxsubbddny{�cbbgz���R���R��������R���R��R���?<������qR����R�R����R��R����?<ot����Rx���oR��R��R����`n��vnx~|hbbflbeiknw�wbekk?<?<Ubeik?<n��{n�ynxsubbddz���R���R�����R���R��R���?<�����qR���Y��R����RhhR��?<�����R���R������R����`n��vnu~�ny{�cbbdsRo��R������oR���?<����R���`n��vnw�wbekk?<?<Ubejb?<n��{n�ynxsubbdd�����R���R���Y�R��R����R��?<�����R���R������R����`Rs��?<���R�����R����R�����qn��vnw�wbekk?<?<Ubekk?<n��{n�ynxsubbdds��R����Y�R���`n��v?<nu~�v�������R�����R��R��R�?<����R��R���R������R����`n��vnu~����R������R��R����R��?<���R�����R�����R���?<������`n��vnw�v?<Ubfbb?<n��{nx~|ccbdlbfbcn�yn���{�Y�R�������R���R�����?<��R�R�����������R����`n��vnw�v?<Ubfbc?<n��{n�yn���z��SR��R����R����R����Sn��vnw�v?<Ubfcb?<n��{nx~|ccbdlbfccn�yn���{�Y�R�������R���R�����?<��R�R�����������R����`n��vnw�v?<Ubfcc?<n��{n�yn���z��SR��R����R����R����Sn��vnw�v?<Ubfcg?<n��{nx~|dfbilbbbcnx~|cbdblbfchn�yn���z��S?<v��Y�R�����R����^R�����Sn��vnw�v?<Ubfch?<n��{nx~|dfbilbbbcnx~]dfbin���bbddnu��bfcglbbdclbbbbnw�wbfci?<Ubfci?<nw�wbbij?<Ubfgb?<n��{nx~|cbfblbfgcnx~]cbfbn�yn���~���R����R��R���Sn��vnu~�n{�|bbcglbfgd?<ny{�cbcgn{�]bbcgy��R�Ro~���R���oSn�s{bbdgn��vny{�bbbbnw�wbfgd?<Ubfgc?<n��{n�yn�����R���Y��R�����R��R�����?<���Rv�����qRy���R����S?<�R����R����R����R���R���Sn��vnu~���^R����^R���R����Ru����R{?<����R��Sn��vnw�v?<Ubfgd?<nw�wbbcf?<Ubfhb?<n��{n�yn��������R���R���Ry������SRZ����l?<�����R���R���R����R��R���������?<��R��R��R�����R���R����`[n��vnw�v?<Ubfjb?<n}w�nzu?<nx��bfjclbbch?<n��bfjclbbeflbccjlbbbb?<ns��bfjclbbdblbbbdn�s{bedb?<ns��bfjclbbbblbbbb?<n��bbielbccbn�un�tbbbdnx�bbchnw�v?<Ubfjc?<Ubgbb?<n��{n���bbddnv��bgbbnw�wbgbc?<Ubgbc?<nw�wbbce?<Ucdbb?<n}w�ns��cdbblbbdblbbbb?<nx��cdbblbbchnxs{bbbc?<n�s{bcbbnxs�bbbcnx�n�s{bdbbn��sbbkclbcbblbbbclbbbc?<?<?<Ucebb?<nx~|hbbelbcgc?<nx~|djbblcebcnw�wcekk?<?<Ucebc?<nx~|hbbblbcgc?<n{�|bbdelcebdnw�wcekk?<?<Ucebd?<n{�|bbeklcebenw�wcekk?<?<Ucebe?<nx~|hbbclbcgc?<nx~|hcbblcebfnw�wcekk?<Ucebf?<nx~|hcbclcebgnw�wcekk?<Ucebg?<nx~|hcbdlcebhnw�wcekk?<Ucebh?<nx~|hcbelcebinw�wcekk?<Ucebi?<nx~|hcbflcebjnw�wcekk?<Ucebj?<nx~|hcbglcebknw�wcekk?<Ucebk?<nx~|hcbhlcecbnw�wcekk?<Ucecb?<nx~|hcbilceccnw�wcekk?<Ucecc?<nx~|hcbjlcecdnw�wcekk?<Ucecd?<nx~|hcbklcecenw�wcekk?<Ucece?<nx~|hccblcecfnw�wcekk?<?<Ucecf?<nx~|hccdlcecgnw�wcekk?<Ucecg?<nx~|hccelcechnw�wcekk?<Ucech?<nx~|hccflcecinw�wcekk?<?<Uceci?<nx~|hbbdlbcgcnw�wcecj?<Ucecj?<nx~|fbbilcecknw�wcekk?<?<Uceck?<nx~|fbbdlbcgcnx~|fbbclcedbnw�wcekk?<?<Ucedb?<nx~|cedblcekknw�wbcgc?<Ucekk?<nx~|cedblcfbb?<n��{n�y{�Y�R�����R���R�����R��R����?<����```R������R���R����R���R�����Y������`Rw����R������qn��|bbbbnw�wbcgc?<Ucfbb?<n��{n�y{�Y�R�����R���R�����R��R����?<����```?<w����R������qn��|bbbbnw�wbcgc
\ No newline at end of file
diff --git a/pre-edited-cs/data/Stage/CentW.pxe b/pre_edited_cs/data/Stage/CentW.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/CentW.pxe
rename to pre_edited_cs/data/Stage/CentW.pxe
diff --git a/pre-edited-cs/data/Stage/CentW.pxm b/pre_edited_cs/data/Stage/CentW.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/CentW.pxm
rename to pre_edited_cs/data/Stage/CentW.pxm
diff --git a/pre_edited_cs/data/Stage/CentW.tsc b/pre_edited_cs/data/Stage/CentW.tsc
new file mode 100644
index 0000000..d19ffaf
--- /dev/null
+++ b/pre_edited_cs/data/Stage/CentW.tsc
@@ -0,0 +1 @@
+>;Taaja>;m~rmt~�aaaamwrzaaaamvu>;Taajb>;m~rmt~�aaaamwrzaaabmvu>;Taajc>;m~rmt~�aaaamwrzaaacmvu>;Taajd>;m~rmt~�aaaamwrzaaadmvu>;Taaje>;m~rmt~�aaaamwrzaaaemvu>;Taajf>;Taajj>;m|v�m~rmt~�aaaa>;mr�abfakaaabkaaaamwrzaaae>;mt�adabkabbckaaacm�rzabaa>;mr�abfakaaaakaaaa>;m~�uaaacmu�adabm�~tmvu>;Tabaa>;m��zm�r�>;mw}{bacdkabac>;mw}{hbcdkabab>;m~�xz�X�Q������_m�umvu>;Tabab>;m���aaccm~�xm���mxz�bacf����Q���Qn����������Q����Q|��n_m�umt}�mz�^aacf>;mxz�aaaamw}\bacdmv�vabac>;Tabac>;m|v�m���aabbmr�abaakaaaakaaacmwr�aaacm��raafgkaajckaaabka1ad>;Tabfa>;m|v�m�r�mw}{bbeakabfcmz�{aacfkabfbmw}{bacdkabfbmv�vabfc>;Tabfb>;m|v�m~�xu�Q���Q����Q��Q��Q��Qr�����X�>;�����pm�{aaaamt}�>;mw}\baicmw}\bbeam��\aaafkgaaf>;m~�uaaac>;mr�acfakaabakaaaam�rzaaga>;mt�acgakabfakaaaamy~t>;mr�acgakaabakaaaam�rzaafa>;mwr�aaadm�rzabaam�~tmw}{bbebkabfcmw}\bbebm��raafhkaccakaabbkaabe>;Tabfc>;m��zm~�xu�Q���Q����Q��Q��Q��Qr�����X�>;�����pm�{aaaamt}�m��\aaafkgaaf>;m|v�mt�adaakabbbkaaacmy~tm�rzaagamr�abfakaaabkaaaa>;m�rzabaamwr�aaaem��raaabkaajjkaaafkaaai>;Tacfa>;m|v�m~�x_____m�umvu>;Tacga>;Tadaa>;Tadab
\ No newline at end of file
diff --git a/pre-edited-cs/data/Stage/Chako.pxe b/pre_edited_cs/data/Stage/Chako.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/Chako.pxe
rename to pre_edited_cs/data/Stage/Chako.pxe
diff --git a/pre-edited-cs/data/Stage/Chako.pxm b/pre_edited_cs/data/Stage/Chako.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/Chako.pxm
rename to pre_edited_cs/data/Stage/Chako.pxm
diff --git a/pre-edited-cs/data/Stage/Chako.tsc b/pre_edited_cs/data/Stage/Chako.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/Chako.tsc
rename to pre_edited_cs/data/Stage/Chako.tsc
diff --git a/pre-edited-cs/data/Stage/Clock.pxe b/pre_edited_cs/data/Stage/Clock.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/Clock.pxe
rename to pre_edited_cs/data/Stage/Clock.pxe
diff --git a/pre-edited-cs/data/Stage/Clock.pxm b/pre_edited_cs/data/Stage/Clock.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/Clock.pxm
rename to pre_edited_cs/data/Stage/Clock.pxm
diff --git a/pre-edited-cs/data/Stage/Clock.tsc b/pre_edited_cs/data/Stage/Clock.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/Clock.tsc
rename to pre_edited_cs/data/Stage/Clock.tsc
diff --git a/pre-edited-cs/data/Stage/Comu.pxe b/pre_edited_cs/data/Stage/Comu.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/Comu.pxe
rename to pre_edited_cs/data/Stage/Comu.pxe
diff --git a/pre-edited-cs/data/Stage/Comu.pxm b/pre_edited_cs/data/Stage/Comu.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/Comu.pxm
rename to pre_edited_cs/data/Stage/Comu.pxm
diff --git a/pre-edited-cs/data/Stage/Comu.tsc b/pre_edited_cs/data/Stage/Comu.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/Comu.tsc
rename to pre_edited_cs/data/Stage/Comu.tsc
diff --git a/pre-edited-cs/data/Stage/Cook.pxm b/pre_edited_cs/data/Stage/Cook.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/Cook.pxm
rename to pre_edited_cs/data/Stage/Cook.pxm
diff --git a/pre-edited-cs/data/Stage/Cthu.pxe b/pre_edited_cs/data/Stage/Cthu.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/Cthu.pxe
rename to pre_edited_cs/data/Stage/Cthu.pxe
diff --git a/pre-edited-cs/data/Stage/Cthu.pxm b/pre_edited_cs/data/Stage/Cthu.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/Cthu.pxm
rename to pre_edited_cs/data/Stage/Cthu.pxm
diff --git a/pre-edited-cs/data/Stage/Cthu.tsc b/pre_edited_cs/data/Stage/Cthu.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/Cthu.tsc
rename to pre_edited_cs/data/Stage/Cthu.tsc
diff --git a/pre-edited-cs/data/Stage/Cthu2.pxe b/pre_edited_cs/data/Stage/Cthu2.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/Cthu2.pxe
rename to pre_edited_cs/data/Stage/Cthu2.pxe
diff --git a/pre-edited-cs/data/Stage/Cthu2.pxm b/pre_edited_cs/data/Stage/Cthu2.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/Cthu2.pxm
rename to pre_edited_cs/data/Stage/Cthu2.pxm
diff --git a/pre-edited-cs/data/Stage/Cthu2.tsc b/pre_edited_cs/data/Stage/Cthu2.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/Cthu2.tsc
rename to pre_edited_cs/data/Stage/Cthu2.tsc
diff --git a/pre-edited-cs/data/Stage/Curly.pxe b/pre_edited_cs/data/Stage/Curly.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/Curly.pxe
rename to pre_edited_cs/data/Stage/Curly.pxe
diff --git a/pre-edited-cs/data/Stage/Curly.pxm b/pre_edited_cs/data/Stage/Curly.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/Curly.pxm
rename to pre_edited_cs/data/Stage/Curly.pxm
diff --git a/pre-edited-cs/data/Stage/Curly.tsc b/pre_edited_cs/data/Stage/Curly.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/Curly.tsc
rename to pre_edited_cs/data/Stage/Curly.tsc
diff --git a/pre-edited-cs/data/Stage/CurlyS.pxe b/pre_edited_cs/data/Stage/CurlyS.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/CurlyS.pxe
rename to pre_edited_cs/data/Stage/CurlyS.pxe
diff --git a/pre-edited-cs/data/Stage/CurlyS.pxm b/pre_edited_cs/data/Stage/CurlyS.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/CurlyS.pxm
rename to pre_edited_cs/data/Stage/CurlyS.pxm
diff --git a/pre_edited_cs/data/Stage/CurlyS.tsc b/pre_edited_cs/data/Stage/CurlyS.tsc
new file mode 100644
index 0000000..84cb27e
--- /dev/null
+++ b/pre_edited_cs/data/Stage/CurlyS.tsc
@@ -0,0 +1 @@
+\Yr�\Y����������������\Yr��\Y�����������������\Yr��\Y�����������������\Yr��\Y�����������������\Yr��\Y�����������������\Yr��\Y������������������\Y��������������������������\Y������������������������\Y\Yr�\Y������O��������������������������\Yr�\Y���������������������\Yr��\Y�����\Yr��\Y�����������������\Yr���\Y������\Yr�\Y�����������������o����oȾ�v��o��o�o�����}o��÷\YȾ��oƴ�����{oȾ�o�����o��o��IJ�}����\Y��o����oþo÷�o�ð�Î�������������\Y���z���������z\Y������\Yr��\Y����
\ No newline at end of file
diff --git a/pre-edited-cs/data/Stage/Dark.pxe b/pre_edited_cs/data/Stage/Dark.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/Dark.pxe
rename to pre_edited_cs/data/Stage/Dark.pxe
diff --git a/pre-edited-cs/data/Stage/Dark.pxm b/pre_edited_cs/data/Stage/Dark.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/Dark.pxm
rename to pre_edited_cs/data/Stage/Dark.pxm
diff --git a/pre-edited-cs/data/Stage/Dark.tsc b/pre_edited_cs/data/Stage/Dark.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/Dark.tsc
rename to pre_edited_cs/data/Stage/Dark.tsc
diff --git a/pre-edited-cs/data/Stage/Drain.pxe b/pre_edited_cs/data/Stage/Drain.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/Drain.pxe
rename to pre_edited_cs/data/Stage/Drain.pxe
diff --git a/pre-edited-cs/data/Stage/Drain.pxm b/pre_edited_cs/data/Stage/Drain.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/Drain.pxm
rename to pre_edited_cs/data/Stage/Drain.pxm
diff --git a/pre-edited-cs/data/Stage/Drain.tsc b/pre_edited_cs/data/Stage/Drain.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/Drain.tsc
rename to pre_edited_cs/data/Stage/Drain.tsc
diff --git a/pre-edited-cs/data/Stage/EgEnd1.pxe b/pre_edited_cs/data/Stage/EgEnd1.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/EgEnd1.pxe
rename to pre_edited_cs/data/Stage/EgEnd1.pxe
diff --git a/pre-edited-cs/data/Stage/EgEnd1.pxm b/pre_edited_cs/data/Stage/EgEnd1.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/EgEnd1.pxm
rename to pre_edited_cs/data/Stage/EgEnd1.pxm
diff --git a/pre-edited-cs/data/Stage/EgEnd1.tsc b/pre_edited_cs/data/Stage/EgEnd1.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/EgEnd1.tsc
rename to pre_edited_cs/data/Stage/EgEnd1.tsc
diff --git a/pre-edited-cs/data/Stage/EgEnd2.pxe b/pre_edited_cs/data/Stage/EgEnd2.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/EgEnd2.pxe
rename to pre_edited_cs/data/Stage/EgEnd2.pxe
diff --git a/pre-edited-cs/data/Stage/EgEnd2.pxm b/pre_edited_cs/data/Stage/EgEnd2.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/EgEnd2.pxm
rename to pre_edited_cs/data/Stage/EgEnd2.pxm
diff --git a/pre-edited-cs/data/Stage/EgEnd2.tsc b/pre_edited_cs/data/Stage/EgEnd2.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/EgEnd2.tsc
rename to pre_edited_cs/data/Stage/EgEnd2.tsc
diff --git a/pre-edited-cs/data/Stage/Egg1.pxe b/pre_edited_cs/data/Stage/Egg1.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/Egg1.pxe
rename to pre_edited_cs/data/Stage/Egg1.pxe
diff --git a/pre-edited-cs/data/Stage/Egg1.pxm b/pre_edited_cs/data/Stage/Egg1.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/Egg1.pxm
rename to pre_edited_cs/data/Stage/Egg1.pxm
diff --git a/pre-edited-cs/data/Stage/Egg1.tsc b/pre_edited_cs/data/Stage/Egg1.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/Egg1.tsc
rename to pre_edited_cs/data/Stage/Egg1.tsc
diff --git a/pre-edited-cs/data/Stage/Egg6.pxe b/pre_edited_cs/data/Stage/Egg6.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/Egg6.pxe
rename to pre_edited_cs/data/Stage/Egg6.pxe
diff --git a/pre-edited-cs/data/Stage/Egg6.pxm b/pre_edited_cs/data/Stage/Egg6.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/Egg6.pxm
rename to pre_edited_cs/data/Stage/Egg6.pxm
diff --git a/pre-edited-cs/data/Stage/Egg6.tsc b/pre_edited_cs/data/Stage/Egg6.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/Egg6.tsc
rename to pre_edited_cs/data/Stage/Egg6.tsc
diff --git a/pre-edited-cs/data/Stage/EggIn.pxa b/pre_edited_cs/data/Stage/EggIn.pxa
similarity index 100%
rename from pre-edited-cs/data/Stage/EggIn.pxa
rename to pre_edited_cs/data/Stage/EggIn.pxa
diff --git a/pre-edited-cs/data/Stage/EggR.pxe b/pre_edited_cs/data/Stage/EggR.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/EggR.pxe
rename to pre_edited_cs/data/Stage/EggR.pxe
diff --git a/pre-edited-cs/data/Stage/EggR.pxm b/pre_edited_cs/data/Stage/EggR.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/EggR.pxm
rename to pre_edited_cs/data/Stage/EggR.pxm
diff --git a/pre-edited-cs/data/Stage/EggR.tsc b/pre_edited_cs/data/Stage/EggR.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/EggR.tsc
rename to pre_edited_cs/data/Stage/EggR.tsc
diff --git a/pre-edited-cs/data/Stage/EggR2.pxe b/pre_edited_cs/data/Stage/EggR2.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/EggR2.pxe
rename to pre_edited_cs/data/Stage/EggR2.pxe
diff --git a/pre-edited-cs/data/Stage/EggR2.pxm b/pre_edited_cs/data/Stage/EggR2.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/EggR2.pxm
rename to pre_edited_cs/data/Stage/EggR2.pxm
diff --git a/pre-edited-cs/data/Stage/EggR2.tsc b/pre_edited_cs/data/Stage/EggR2.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/EggR2.tsc
rename to pre_edited_cs/data/Stage/EggR2.tsc
diff --git a/pre-edited-cs/data/Stage/EggX.pxa b/pre_edited_cs/data/Stage/EggX.pxa
similarity index 100%
rename from pre-edited-cs/data/Stage/EggX.pxa
rename to pre_edited_cs/data/Stage/EggX.pxa
diff --git a/pre-edited-cs/data/Stage/EggX.pxe b/pre_edited_cs/data/Stage/EggX.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/EggX.pxe
rename to pre_edited_cs/data/Stage/EggX.pxe
diff --git a/pre-edited-cs/data/Stage/EggX.pxm b/pre_edited_cs/data/Stage/EggX.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/EggX.pxm
rename to pre_edited_cs/data/Stage/EggX.pxm
diff --git a/pre-edited-cs/data/Stage/EggX.tsc b/pre_edited_cs/data/Stage/EggX.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/EggX.tsc
rename to pre_edited_cs/data/Stage/EggX.tsc
diff --git a/pre-edited-cs/data/Stage/EggX2.pxe b/pre_edited_cs/data/Stage/EggX2.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/EggX2.pxe
rename to pre_edited_cs/data/Stage/EggX2.pxe
diff --git a/pre-edited-cs/data/Stage/EggX2.pxm b/pre_edited_cs/data/Stage/EggX2.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/EggX2.pxm
rename to pre_edited_cs/data/Stage/EggX2.pxm
diff --git a/pre-edited-cs/data/Stage/EggX2.tsc b/pre_edited_cs/data/Stage/EggX2.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/EggX2.tsc
rename to pre_edited_cs/data/Stage/EggX2.tsc
diff --git a/pre-edited-cs/data/Stage/Eggs.pxa b/pre_edited_cs/data/Stage/Eggs.pxa
similarity index 100%
rename from pre-edited-cs/data/Stage/Eggs.pxa
rename to pre_edited_cs/data/Stage/Eggs.pxa
diff --git a/pre-edited-cs/data/Stage/Eggs.pxe b/pre_edited_cs/data/Stage/Eggs.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/Eggs.pxe
rename to pre_edited_cs/data/Stage/Eggs.pxe
diff --git a/pre-edited-cs/data/Stage/Eggs.pxm b/pre_edited_cs/data/Stage/Eggs.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/Eggs.pxm
rename to pre_edited_cs/data/Stage/Eggs.pxm
diff --git a/pre-edited-cs/data/Stage/Eggs.tsc b/pre_edited_cs/data/Stage/Eggs.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/Eggs.tsc
rename to pre_edited_cs/data/Stage/Eggs.tsc
diff --git a/pre-edited-cs/data/Stage/Eggs2.pxe b/pre_edited_cs/data/Stage/Eggs2.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/Eggs2.pxe
rename to pre_edited_cs/data/Stage/Eggs2.pxe
diff --git a/pre-edited-cs/data/Stage/Eggs2.pxm b/pre_edited_cs/data/Stage/Eggs2.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/Eggs2.pxm
rename to pre_edited_cs/data/Stage/Eggs2.pxm
diff --git a/pre-edited-cs/data/Stage/Eggs2.tsc b/pre_edited_cs/data/Stage/Eggs2.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/Eggs2.tsc
rename to pre_edited_cs/data/Stage/Eggs2.tsc
diff --git a/pre-edited-cs/data/Stage/Fall.pxa b/pre_edited_cs/data/Stage/Fall.pxa
similarity index 100%
rename from pre-edited-cs/data/Stage/Fall.pxa
rename to pre_edited_cs/data/Stage/Fall.pxa
diff --git a/pre-edited-cs/data/Stage/Fall.pxe b/pre_edited_cs/data/Stage/Fall.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/Fall.pxe
rename to pre_edited_cs/data/Stage/Fall.pxe
diff --git a/pre-edited-cs/data/Stage/Fall.pxm b/pre_edited_cs/data/Stage/Fall.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/Fall.pxm
rename to pre_edited_cs/data/Stage/Fall.pxm
diff --git a/pre-edited-cs/data/Stage/Fall.tsc b/pre_edited_cs/data/Stage/Fall.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/Fall.tsc
rename to pre_edited_cs/data/Stage/Fall.tsc
diff --git a/pre-edited-cs/data/Stage/Frog.pxe b/pre_edited_cs/data/Stage/Frog.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/Frog.pxe
rename to pre_edited_cs/data/Stage/Frog.pxe
diff --git a/pre-edited-cs/data/Stage/Frog.pxm b/pre_edited_cs/data/Stage/Frog.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/Frog.pxm
rename to pre_edited_cs/data/Stage/Frog.pxm
diff --git a/pre-edited-cs/data/Stage/Frog.tsc b/pre_edited_cs/data/Stage/Frog.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/Frog.tsc
rename to pre_edited_cs/data/Stage/Frog.tsc
diff --git a/pre-edited-cs/data/Stage/Gard.pxa b/pre_edited_cs/data/Stage/Gard.pxa
similarity index 100%
rename from pre-edited-cs/data/Stage/Gard.pxa
rename to pre_edited_cs/data/Stage/Gard.pxa
diff --git a/pre-edited-cs/data/Stage/Gard.pxe b/pre_edited_cs/data/Stage/Gard.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/Gard.pxe
rename to pre_edited_cs/data/Stage/Gard.pxe
diff --git a/pre-edited-cs/data/Stage/Gard.pxm b/pre_edited_cs/data/Stage/Gard.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/Gard.pxm
rename to pre_edited_cs/data/Stage/Gard.pxm
diff --git a/pre-edited-cs/data/Stage/Gard.tsc b/pre_edited_cs/data/Stage/Gard.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/Gard.tsc
rename to pre_edited_cs/data/Stage/Gard.tsc
diff --git a/pre-edited-cs/data/Stage/Hell.pxa b/pre_edited_cs/data/Stage/Hell.pxa
similarity index 100%
rename from pre-edited-cs/data/Stage/Hell.pxa
rename to pre_edited_cs/data/Stage/Hell.pxa
diff --git a/pre-edited-cs/data/Stage/Hell1.pxe b/pre_edited_cs/data/Stage/Hell1.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/Hell1.pxe
rename to pre_edited_cs/data/Stage/Hell1.pxe
diff --git a/pre-edited-cs/data/Stage/Hell1.pxm b/pre_edited_cs/data/Stage/Hell1.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/Hell1.pxm
rename to pre_edited_cs/data/Stage/Hell1.pxm
diff --git a/pre-edited-cs/data/Stage/Hell1.tsc b/pre_edited_cs/data/Stage/Hell1.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/Hell1.tsc
rename to pre_edited_cs/data/Stage/Hell1.tsc
diff --git a/pre-edited-cs/data/Stage/Hell2.pxe b/pre_edited_cs/data/Stage/Hell2.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/Hell2.pxe
rename to pre_edited_cs/data/Stage/Hell2.pxe
diff --git a/pre-edited-cs/data/Stage/Hell2.pxm b/pre_edited_cs/data/Stage/Hell2.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/Hell2.pxm
rename to pre_edited_cs/data/Stage/Hell2.pxm
diff --git a/pre-edited-cs/data/Stage/Hell2.tsc b/pre_edited_cs/data/Stage/Hell2.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/Hell2.tsc
rename to pre_edited_cs/data/Stage/Hell2.tsc
diff --git a/pre-edited-cs/data/Stage/Hell3.pxe b/pre_edited_cs/data/Stage/Hell3.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/Hell3.pxe
rename to pre_edited_cs/data/Stage/Hell3.pxe
diff --git a/pre-edited-cs/data/Stage/Hell3.pxm b/pre_edited_cs/data/Stage/Hell3.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/Hell3.pxm
rename to pre_edited_cs/data/Stage/Hell3.pxm
diff --git a/pre-edited-cs/data/Stage/Hell3.tsc b/pre_edited_cs/data/Stage/Hell3.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/Hell3.tsc
rename to pre_edited_cs/data/Stage/Hell3.tsc
diff --git a/pre-edited-cs/data/Stage/Hell4.pxe b/pre_edited_cs/data/Stage/Hell4.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/Hell4.pxe
rename to pre_edited_cs/data/Stage/Hell4.pxe
diff --git a/pre-edited-cs/data/Stage/Hell4.pxm b/pre_edited_cs/data/Stage/Hell4.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/Hell4.pxm
rename to pre_edited_cs/data/Stage/Hell4.pxm
diff --git a/pre-edited-cs/data/Stage/Hell4.tsc b/pre_edited_cs/data/Stage/Hell4.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/Hell4.tsc
rename to pre_edited_cs/data/Stage/Hell4.tsc
diff --git a/pre-edited-cs/data/Stage/Hell42.pxe b/pre_edited_cs/data/Stage/Hell42.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/Hell42.pxe
rename to pre_edited_cs/data/Stage/Hell42.pxe
diff --git a/pre-edited-cs/data/Stage/Hell42.pxm b/pre_edited_cs/data/Stage/Hell42.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/Hell42.pxm
rename to pre_edited_cs/data/Stage/Hell42.pxm
diff --git a/pre-edited-cs/data/Stage/Hell42.tsc b/pre_edited_cs/data/Stage/Hell42.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/Hell42.tsc
rename to pre_edited_cs/data/Stage/Hell42.tsc
diff --git a/pre-edited-cs/data/Stage/Island.pxe b/pre_edited_cs/data/Stage/Island.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/Island.pxe
rename to pre_edited_cs/data/Stage/Island.pxe
diff --git a/pre-edited-cs/data/Stage/Island.pxm b/pre_edited_cs/data/Stage/Island.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/Island.pxm
rename to pre_edited_cs/data/Stage/Island.pxm
diff --git a/pre-edited-cs/data/Stage/Island.tsc b/pre_edited_cs/data/Stage/Island.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/Island.tsc
rename to pre_edited_cs/data/Stage/Island.tsc
diff --git a/pre-edited-cs/data/Stage/Itoh.pxe b/pre_edited_cs/data/Stage/Itoh.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/Itoh.pxe
rename to pre_edited_cs/data/Stage/Itoh.pxe
diff --git a/pre-edited-cs/data/Stage/Itoh.pxm b/pre_edited_cs/data/Stage/Itoh.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/Itoh.pxm
rename to pre_edited_cs/data/Stage/Itoh.pxm
diff --git a/pre-edited-cs/data/Stage/Itoh.tsc b/pre_edited_cs/data/Stage/Itoh.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/Itoh.tsc
rename to pre_edited_cs/data/Stage/Itoh.tsc
diff --git a/pre-edited-cs/data/Stage/Jail.pxa b/pre_edited_cs/data/Stage/Jail.pxa
similarity index 100%
rename from pre-edited-cs/data/Stage/Jail.pxa
rename to pre_edited_cs/data/Stage/Jail.pxa
diff --git a/pre-edited-cs/data/Stage/Jail1.pxe b/pre_edited_cs/data/Stage/Jail1.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/Jail1.pxe
rename to pre_edited_cs/data/Stage/Jail1.pxe
diff --git a/pre-edited-cs/data/Stage/Jail1.pxm b/pre_edited_cs/data/Stage/Jail1.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/Jail1.pxm
rename to pre_edited_cs/data/Stage/Jail1.pxm
diff --git a/pre-edited-cs/data/Stage/Jail1.tsc b/pre_edited_cs/data/Stage/Jail1.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/Jail1.tsc
rename to pre_edited_cs/data/Stage/Jail1.tsc
diff --git a/pre-edited-cs/data/Stage/Jail2.pxe b/pre_edited_cs/data/Stage/Jail2.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/Jail2.pxe
rename to pre_edited_cs/data/Stage/Jail2.pxe
diff --git a/pre-edited-cs/data/Stage/Jail2.pxm b/pre_edited_cs/data/Stage/Jail2.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/Jail2.pxm
rename to pre_edited_cs/data/Stage/Jail2.pxm
diff --git a/pre-edited-cs/data/Stage/Jail2.tsc b/pre_edited_cs/data/Stage/Jail2.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/Jail2.tsc
rename to pre_edited_cs/data/Stage/Jail2.tsc
diff --git a/pre-edited-cs/data/Stage/Jenka1.pxe b/pre_edited_cs/data/Stage/Jenka1.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/Jenka1.pxe
rename to pre_edited_cs/data/Stage/Jenka1.pxe
diff --git a/pre-edited-cs/data/Stage/Jenka1.pxm b/pre_edited_cs/data/Stage/Jenka1.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/Jenka1.pxm
rename to pre_edited_cs/data/Stage/Jenka1.pxm
diff --git a/pre_edited_cs/data/Stage/Jenka1.tsc b/pre_edited_cs/data/Stage/Jenka1.tsc
new file mode 100644
index 0000000..a05950b
--- /dev/null
+++ b/pre_edited_cs/data/Stage/Jenka1.tsc
@@ -0,0 +1 @@
+�����������Ǻ���Ω������©�����ǽ�����������Ǻ���Ω������©�����ǽ�����������Ǻ���Ω������©�����ǽ�����������Ǻ���Ω������©�����ǽ�����������Ǻ���Ω������©�����ǽ������������é�����������é�������������é�����������é�����������é�������������ɩ����������������ɩ��������������������ǽ��������������µ��Ω������ɩ������ȩ�����˺�����������������������������ľҵ����������������ޙ������Ƚ�� �ޙ����������������ݙ�����ާ��Ƚ���ߙ����������ޙ�����ޙ���ͪ����������춥��Ƚ���˵�Ͼ���������������Ͼ���������������Ͼ��������������ľҵ�����������������������������Ƚ������ݙ������ݙ����熃������ޙ��������ݙ��놃�����������������븵�Ƚ��ǽ����������ľҵ���������������ޙ���ޙ�������Ƚ�����ݙ���䧵�Ƚ��ǽ����������ľҵ�����������™�������������솃���ޙ�����ڙ�������������Ƚ����������ޙ���觧���Ƚ��ǽ����������ľҵ�������������ޙ���ޙ���觧���Ƚ��™�����������������݆����������ޙ��ݙ������짵�Ƚ��ǽ����������ľҵ����������������������䧵�Ƚ���˵��ͪ��������������ݙ��ޙ�߆�������������짵�Ƚ���ˆ����ͩ������ɩ����������������ɩ��������������ޙ�����ޙ�����򶧵�Ƚ���˵�Ŧ���������������槧���Ƚ������ޙڙ����������憃��ޙ������ޥ���������Ƚ���˧������Ƚ����������������������톃���������ߙ���������ކ�������ޙ�����������ݧ��Ƚ�������������������������݆������������짵�Ƚ������ݙ��ޙ��������膃����ݙ������������槵�Ƚ���˼������ݥ���ޙ������솃��������������ݙ��ކ������������ݙ������쥵�Ƚ����ݙ���������������솃���ޙ������������ކ��������������ޙ�����짵�Ƚ������ݙ��ޙ��ݙ���������톃������ݥ���ޙ�����������톃���ޙ�������ݙ���������Ƚ��������ޙ�����ݧ����Ƚ��������ޙ���ޙ�������Ƚ���ݙ���䧵�Ƚ��Ť������ǽ����������ľҵ��������������᧵�Ƚ���˵��ͪ�����쥙��짵�Ƚ�������������������ޙ�߆�����������������짵�Ƚ���ˆ����ͩ������ɩ����������������ɩ��������������ޙ�����ޙ�����y����Ƚ���˵�Ŧ�������������������������򧆃�ޠ�ޙ��������ޙ��𧧧��Ƚ���˧������Ƚ�������ޙ�����������چ��������ݙ�����ڸ��Ƚ������ޙ�������ݙ�����������݆�������ޙ��ݙ������솃����ݙ����������������᧵�Ƚ��������ޙ���楙��ݙ���熃������������ޙ�����짵�Ƚ���ˆ�������맧���Ƚ���˽�����������톃�������ݙ�����憃���������층�Ƚ���˧������Ƚ��������ڙ��ݙ���ާ����Ƚ����ޙ������ݙ������쥆������������ޙ��������冃��������������쥵�Ƚ������������ݙ�������چ�����ާ��Ƚ���ߙ��������ޙ���ކ�������ݥ�������������݆�����ޙ������ޥ��Ƚ������ޙ���������ާ��Ƚ���˺������ߙ��������솃������������ݙ���熃��ޙ����᧧���Ƚ���ߙ�������ޙ���ާ����Ƚ���˽�������������ݙ����Ƚ����������������ݙ����������������ޙ��݆����������޸��Ƚ���˧������Ƚ����������ޙ���觧���Ƚ��Ť������ǽ����������ľҵ������������������������톃����ޙ���Ƚ�������������������ކ����������������熃��ݙ����짵�Ƚ���˵��ͪ������������짧���Ƚ���ˆ����ͩ��������������ޙ�����ޙ�����򶧵�Ƚ���˵��ɩ����������������ɩ�����Ŧ���������������������Ƚ��������ޙ�������ކ����������ޙ�������톃���Ƚ�����������ޙ��ޙ������膃��ޙ��ݙ������짧���Ƚ����™�������ޙ�������ޥ�����ޙ��������������ޙ����Ƚ����������ޙ���������ކ�����ݙ�����ޙ�������ކ�������������������秧���Ƚ������ޥ���襙����ާ����Ƚ��������ޠ�������ކ��������Ƚ��Ť������ǽ������������é����������ǽ������������é����������ǽ������������é����������ǽ������������é����������ǽ������������é����������ǽ����������ľҵ�����ߚ��Ƚ��ǽ����������ľҵ�����ߙ��ߚ��Ƚ��ǽ����������ľҵ�����ߙ��ߙ��ߚ��Ƚ��ǽ����������ľҵ�������駵�Ƚ��ǽ����������ľҵ������ޚ��Ƚ��ǽ������������������������ľҵ���������������ޙ����ޙ��ڙ����᧙���ᆃ����������쥙���������ޙ����䧵�Ƚ������������ޙ�������к©������é������Ȇ���¤�������Ω�����������Ͼ���������������Ͼ����
\ No newline at end of file
diff --git a/pre-edited-cs/data/Stage/Jenka2.pxe b/pre_edited_cs/data/Stage/Jenka2.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/Jenka2.pxe
rename to pre_edited_cs/data/Stage/Jenka2.pxe
diff --git a/pre-edited-cs/data/Stage/Jenka2.pxm b/pre_edited_cs/data/Stage/Jenka2.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/Jenka2.pxm
rename to pre_edited_cs/data/Stage/Jenka2.pxm
diff --git a/pre-edited-cs/data/Stage/Jenka2.tsc b/pre_edited_cs/data/Stage/Jenka2.tsc
similarity index 80%
rename from pre-edited-cs/data/Stage/Jenka2.tsc
rename to pre_edited_cs/data/Stage/Jenka2.tsc
index 78c0d78..e23d040 100644
--- a/pre-edited-cs/data/Stage/Jenka2.tsc
+++ b/pre_edited_cs/data/Stage/Jenka2.tsc
@@ -1 +1 @@
-ROhuu~uRO��������uuv~����uuuu����ROhuu~vRO��������uuv~����uuuv����ROhuu~wRO��������uuv~����uuuw����ROhuu~xRO��������uuv~����uuux����ROhuu~yRO��������uz~zuu~z��������uuvv����uuuy����uwuuROhuu~zRO��������uuv~����uuuy����ROhuu~}RO����uuuwuuuu����uuuyuuuuRO����uuu~uuuu����uuvwuuuu����uuvxuuuuRO����uzuuuwv{uuuu����uzuuuuv{uuvuuuuu����ROROhuvuuRO��������uuvv����uvuu����uuuy����uuvuuu~yuuxzuuw{ROhuwuuRO������������uuuu����uyuuuuxuuuuuRO��������uuvy�����e���e�����f��������RO����uuvx����ff��������RO����uyuuuuxuuuuw����uuxuRO����uyuuuuvuuuuw���puz~z���puw|}����uvuu����uuv~����ROhuwwuRO��������RO����uz~{uwxuRO���puz~{���puz~y���ruuvyRO����uwwuuvxxuuuu����uuzuRO��������vuvy����uuuu����e���e���e���������s��������uuuuRO����uxuuuvxuuuuuRO����uxuvuvxuuuuuRO����uxuwuvxuuuuuRO����uxuxuvxuuuuuRO����uxuyuvxuuuuuRO����uyuv���ruw|y����RO����uwwvROhuwwvRO���Euu{zROhuwxuRO��������u}xuuwxv������������uuvx������fRO���e����e����e����f��������ROhuwxvRO��������uuvzuwxwRO������������uuvx��qe���e����e��e�RO����e����s��������vuvz���puuvz����RO����uuuu��������e�e�����e����f����uuxu��������uuuu��������uuvx����e����e��e���e����RO����e�������e���s��������ROhuwxwRO����������������uuvx����e�e�����e����e��RO�����e���e���e�����sss�����������e�e���e��e���e��RO�����e��e�����e��e���sss��������ROhuxuuRO�����������f��������ROhuxuvRO�����������e���f��������ROhuxuwRO�����������e���e���f��������ROhuxuxRO�������������s��������ROhuxuyRO������������f��������ROhuyuuROhuyuvROhuzuuRO�������������e����e���l��e��e�e�����se����RO����e�������qe���e�����e��e�����s����RO��e����e��e���e����������uuyu����uuuu����RO���pvuuu����uuwu���pRO����{wuvuzuvRO����{wuwuzuwRO����uuvxuu~vuuvuuuu}ROROhuzuvRO����uuuvuu~yuuu}uuuyROROhuzuwRO����uuyuuu~yuuvyuuu~RO
\ No newline at end of file
+=:S``i`=:l}~qls}�``ailvqy````lu~t=:S``ia=:l}~qls}�``ailvqy```alu~t=:S``ib=:l}~qls}�``ailvqy```blu~t=:S``ic=:l}~qls}�``ailvqy```clu~t=:S``id=:l}~qlv|z`eiej``iel{u�ls}�``aalvqy```dlu�u`b``=:S``ie=:l}~qls}�``ailvqy```dlu~t=:S``ih=:lq}z```bj````lq}z```dj````=:lq}z```ij````lq}z``abj````lq}z``acj````=:ls~�`e``j`bafj````l}~�`e``j``afj``a`j````lu~t=:=:S`a``=:l��yl��``aalt~�`a``lvq```dl��q``a`j``idj``cej``bf=:S`b``=:l�q�l{u�l}�t````lq~�`d``j``c`j````=:l}�wlvqs``ads����P���P�����Ql~tls|�=:lvqs``ac����QQl~tls|=:lq~�`d``j``c`j```bl�qy``c`=:lq~�`d``j``a`j```blv|[`eielv|[`bghl�qy`a``ls}�``ailu~t=:S`bb`=:l�q�l{u�=:lv|z`eifj`bc`=:lv|[`eiflv|[`eidly�]``ad=:ls~�`bb`j`accj````l�qy``e`=:l}�wlwy�a`adlvqs````w���P���P���Pm�������m^l~tlwy�````=:ls~�`c``j`ac`j````=:ls~�`c`aj`ac`j````=:ls~�`c`bj`ac`j````=:ls~�`c`cj`ac`j````=:ls~�`c`dj`ac`j`0``=:lt~�`d`alv|]`bgdls|�=:lu�u`bba=:S`bba=:lu�u``fe=:S`bc`=:l{u�lv|z`hc`j`bcal}�wl���lvqs``ac������Q=:���P����P����P����Ql~tlu~t=:S`bca=:l{u�ly�z``aej`bcb=:l}�wl���lvqs``acq�\P���P����P��P�=:����P����^l~tlwy�a`aely�[``aels|�=:lvqs````��������P�Pm|���P���mQl�qy``c`l~tlwy�````ls|�lvqs``acs���P����P��P���P����=:����P�������P���^l~tlu~t=:S`bcb=:l{u�l}�wl���lvqs``acu���P�P�����P����P��=:�����P���P���P�����^^^l~tls|�q��PyP���P��P���P��=:�����P��P�����P��P���^^^l~tlu~t=:S`c``=:l{u�l}�wq��Ql~tlu~t=:S`c`a=:l{u�l}�wq��P���Ql~tlu~t=:S`c`b=:l{u�l}�wq��P���P���Ql~tlu~t=:S`c`c=:l{u�l}�wr����^l~tlu~t=:S`c`d=:l{u�l}�wv���Ql~tlu~t=:S`d``=:S`d`a=:S`e``=:l{u�l}�wl���|����P����P���W��P��P�P�����^P����=:����P�������\P���P�����P��P�����^l~t=:w�P����P��P���P�����ol�qy``d`l�~z````ls|=:l|y[a```l��``b`lqu[=:lu�u`e`a=:S`e`a=:lu�u````
\ No newline at end of file
diff --git a/pre-edited-cs/data/Stage/Kings.pxe b/pre_edited_cs/data/Stage/Kings.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/Kings.pxe
rename to pre_edited_cs/data/Stage/Kings.pxe
diff --git a/pre-edited-cs/data/Stage/Kings.pxm b/pre_edited_cs/data/Stage/Kings.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/Kings.pxm
rename to pre_edited_cs/data/Stage/Kings.pxm
diff --git a/pre-edited-cs/data/Stage/Kings.tsc b/pre_edited_cs/data/Stage/Kings.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/Kings.tsc
rename to pre_edited_cs/data/Stage/Kings.tsc
diff --git a/pre-edited-cs/data/Stage/Labo.pxa b/pre_edited_cs/data/Stage/Labo.pxa
similarity index 100%
rename from pre-edited-cs/data/Stage/Labo.pxa
rename to pre_edited_cs/data/Stage/Labo.pxa
diff --git a/pre-edited-cs/data/Stage/Little.pxe b/pre_edited_cs/data/Stage/Little.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/Little.pxe
rename to pre_edited_cs/data/Stage/Little.pxe
diff --git a/pre-edited-cs/data/Stage/Little.pxm b/pre_edited_cs/data/Stage/Little.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/Little.pxm
rename to pre_edited_cs/data/Stage/Little.pxm
diff --git a/pre-edited-cs/data/Stage/Little.tsc b/pre_edited_cs/data/Stage/Little.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/Little.tsc
rename to pre_edited_cs/data/Stage/Little.tsc
diff --git a/pre-edited-cs/data/Stage/Lounge.pxe b/pre_edited_cs/data/Stage/Lounge.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/Lounge.pxe
rename to pre_edited_cs/data/Stage/Lounge.pxe
diff --git a/pre-edited-cs/data/Stage/Lounge.pxm b/pre_edited_cs/data/Stage/Lounge.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/Lounge.pxm
rename to pre_edited_cs/data/Stage/Lounge.pxm
diff --git a/pre_edited_cs/data/Stage/Lounge.tsc b/pre_edited_cs/data/Stage/Lounge.tsc
new file mode 100644
index 0000000..02d25c8
--- /dev/null
+++ b/pre_edited_cs/data/Stage/Lounge.tsc
@@ -0,0 +1 @@
+yv�����yv������������������������yv�����yv������������������������yv�����yv������������������������yv�����yv������������������������yv�����yv������������������������yv�����yv���Ũ����������������������������������������������yv�����yv����yv�������������yv��±����yv�����yv����yv�������������yv�������������yv�������������yv��������ь��ь���������ߚ����yv��������׌��،��ь���ј������њ����yv�ی�ѓ�ь�����ߌ����͌���ь����yv�Ҍ������ߌ����嚨�������yv�����yv���Ũ������������������������������������Ќ���ތ��ь�������yv��������ީ����������������������������±����yv�����yv���Ũ�����������ߌ���ь�ь��Ќ�����������yv���������ߚ����������yv�����yv��±����yv�����yv������������������±����yv�����yv����yv�������������yv�������������yv��±����yv�����yv�������ߌ���ь����������ߌ����yv��ь������ь���ь��������yv���ߌ�����Ќ�ڌ��ь���������yv��Ќ�����������Ҍ�ߌ����yv�����К������yv�������ь����ӌ����ь������yv���������Ќ�����Ԛ����yv��������ь���嘌��ۘ���Ќ���lߚ����������yv�����yv��������ь����������ލ���������������ӌ��������ތ����ӌ�����yv��Ҍ���Ԍ��ٍ����yv�Ԙ��Ҍ���匵����ь����͌���yv������ޚ������yv���Ԍ͌����њ����������yv�����yv���Ũ������������yv��±����yv�����yv��������ړ��������ь͌���Ќ����yv�����ތ���ߍ�������������߫����ԍ����yv���ь�����ߌ�������Ќ�ی����ь�њ��������yv�����yv���Ũ������������yv��±����yv�����yv������ٌ�ی��������К����������yv�����yv�������Ũ�Ů���������Ԙ���嚨�����������ړ���ь���������ѫ����yv���Ԙ����׌�����ь������yv������њ����yv������ь�����Ќ������厌��������yv�ь�܌��Ќ���������ь���њ����yv������ژ������ь������Ӛ������������ߌ�����������ӌ�����ی��yv������ӌ��ތ͌�����ь�Ҍ���њ���������ی������ь�ی���ԫ����yv���ؘ���ь��������Ќ����ޚ��������yv�������������������í�������Ű�����í�����yv�������������������í�����yv���������������������������������������������í�����yv������������������������������������������������������yv�����yv�����yv���������������������
\ No newline at end of file
diff --git a/pre-edited-cs/data/Stage/Malco.pxe b/pre_edited_cs/data/Stage/Malco.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/Malco.pxe
rename to pre_edited_cs/data/Stage/Malco.pxe
diff --git a/pre-edited-cs/data/Stage/Malco.pxm b/pre_edited_cs/data/Stage/Malco.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/Malco.pxm
rename to pre_edited_cs/data/Stage/Malco.pxm
diff --git a/pre-edited-cs/data/Stage/Malco.tsc b/pre_edited_cs/data/Stage/Malco.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/Malco.tsc
rename to pre_edited_cs/data/Stage/Malco.tsc
diff --git a/pre-edited-cs/data/Stage/Mapi.pxe b/pre_edited_cs/data/Stage/Mapi.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/Mapi.pxe
rename to pre_edited_cs/data/Stage/Mapi.pxe
diff --git a/pre-edited-cs/data/Stage/Mapi.pxm b/pre_edited_cs/data/Stage/Mapi.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/Mapi.pxm
rename to pre_edited_cs/data/Stage/Mapi.pxm
diff --git a/pre_edited_cs/data/Stage/Mapi.tsc b/pre_edited_cs/data/Stage/Mapi.tsc
new file mode 100644
index 0000000..ab4d13f
--- /dev/null
+++ b/pre_edited_cs/data/Stage/Mapi.tsc
@@ -0,0 +1 @@
+yv�����yv������������������������yv�����yv������������������������yv�����yv������������������������yv�����yv������������������������yv�����yv������������������������yvyv�����yv���Ũ��������������������������������������yv�������������������������������yv�����yv�������������ړ�����ڍ��������yv�����yv���������������������������������������yv���Ũ�Ů�����í�����yv����������嚨���yv�����������ߌ������ތ������yv���Ԍ������͚����������ی����ߌ��������૨�����������yv�����yv�����������������������������������������������������±����yv�����yv��±����yv�����yv���Ũ�Ů�����í�����yv�������������yv�������������yv�������������yv���������������������������ь�������ߌ���Ԍ�ѫ�ź�����������ԍ����yv���������������������yv�����yv���Ũ�����ԙ��ԙ��Ԛ���ј����ښ��������yv�����yv���Ũ������������٫�����������ͫ����yv�������ؚ������±����yv�����yv���Ũ������l�����ښ��ی���������ь��yv���ь�����ь�������ٌ����ѫ�ź�������±����yv�����yv���Ũ��������ڌ������嘌�����ړ�yv�������������������૨ź�������±����yv�����yv���Ũ����������������������ԫ�ź�������±����yv�����yv���Ũ����������������������������������yv�ی�����ތ���૨ź�������±����yv�����yv���Ũ������������������ړ������yv��������૨ź�������±����yv�����yv���Ũ��������嫌���嚨�������yv�����yv���Ũ������Ԙ���ی����ߌ�������������yv�����yv���Ũ������ј����ь����ۍ������������������������������������yv��������������ь��������ٌ����ѩ��í�����������������yv�����yv���Ũ�������������������yv�����yv���Ũ�����������������э�����������������yv�������������������í�����yv��������������������������yv������������yv�����yv���Ũ��������������������������í�����yv�������������ښ���������������������������������������±����yv�����yv��±����
\ No newline at end of file
diff --git a/pre-edited-cs/data/Stage/Maze.pxa b/pre_edited_cs/data/Stage/Maze.pxa
similarity index 100%
rename from pre-edited-cs/data/Stage/Maze.pxa
rename to pre_edited_cs/data/Stage/Maze.pxa
diff --git a/pre-edited-cs/data/Stage/MazeA.pxe b/pre_edited_cs/data/Stage/MazeA.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/MazeA.pxe
rename to pre_edited_cs/data/Stage/MazeA.pxe
diff --git a/pre-edited-cs/data/Stage/MazeA.pxm b/pre_edited_cs/data/Stage/MazeA.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/MazeA.pxm
rename to pre_edited_cs/data/Stage/MazeA.pxm
diff --git a/pre-edited-cs/data/Stage/MazeA.tsc b/pre_edited_cs/data/Stage/MazeA.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/MazeA.tsc
rename to pre_edited_cs/data/Stage/MazeA.tsc
diff --git a/pre-edited-cs/data/Stage/MazeB.pxe b/pre_edited_cs/data/Stage/MazeB.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/MazeB.pxe
rename to pre_edited_cs/data/Stage/MazeB.pxe
diff --git a/pre-edited-cs/data/Stage/MazeB.pxm b/pre_edited_cs/data/Stage/MazeB.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/MazeB.pxm
rename to pre_edited_cs/data/Stage/MazeB.pxm
diff --git a/pre-edited-cs/data/Stage/MazeB.tsc b/pre_edited_cs/data/Stage/MazeB.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/MazeB.tsc
rename to pre_edited_cs/data/Stage/MazeB.tsc
diff --git a/pre-edited-cs/data/Stage/MazeD.pxe b/pre_edited_cs/data/Stage/MazeD.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/MazeD.pxe
rename to pre_edited_cs/data/Stage/MazeD.pxe
diff --git a/pre-edited-cs/data/Stage/MazeD.pxm b/pre_edited_cs/data/Stage/MazeD.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/MazeD.pxm
rename to pre_edited_cs/data/Stage/MazeD.pxm
diff --git a/pre-edited-cs/data/Stage/MazeD.tsc b/pre_edited_cs/data/Stage/MazeD.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/MazeD.tsc
rename to pre_edited_cs/data/Stage/MazeD.tsc
diff --git a/pre-edited-cs/data/Stage/MazeH.pxe b/pre_edited_cs/data/Stage/MazeH.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/MazeH.pxe
rename to pre_edited_cs/data/Stage/MazeH.pxe
diff --git a/pre-edited-cs/data/Stage/MazeH.pxm b/pre_edited_cs/data/Stage/MazeH.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/MazeH.pxm
rename to pre_edited_cs/data/Stage/MazeH.pxm
diff --git a/pre-edited-cs/data/Stage/MazeH.tsc b/pre_edited_cs/data/Stage/MazeH.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/MazeH.tsc
rename to pre_edited_cs/data/Stage/MazeH.tsc
diff --git a/pre-edited-cs/data/Stage/MazeI.pxe b/pre_edited_cs/data/Stage/MazeI.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/MazeI.pxe
rename to pre_edited_cs/data/Stage/MazeI.pxe
diff --git a/pre-edited-cs/data/Stage/MazeI.pxm b/pre_edited_cs/data/Stage/MazeI.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/MazeI.pxm
rename to pre_edited_cs/data/Stage/MazeI.pxm
diff --git a/pre-edited-cs/data/Stage/MazeI.tsc b/pre_edited_cs/data/Stage/MazeI.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/MazeI.tsc
rename to pre_edited_cs/data/Stage/MazeI.tsc
diff --git a/pre-edited-cs/data/Stage/MazeM.pxe b/pre_edited_cs/data/Stage/MazeM.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/MazeM.pxe
rename to pre_edited_cs/data/Stage/MazeM.pxe
diff --git a/pre-edited-cs/data/Stage/MazeM.pxm b/pre_edited_cs/data/Stage/MazeM.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/MazeM.pxm
rename to pre_edited_cs/data/Stage/MazeM.pxm
diff --git a/pre-edited-cs/data/Stage/MazeM.tsc b/pre_edited_cs/data/Stage/MazeM.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/MazeM.tsc
rename to pre_edited_cs/data/Stage/MazeM.tsc
diff --git a/pre-edited-cs/data/Stage/MazeO.pxe b/pre_edited_cs/data/Stage/MazeO.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/MazeO.pxe
rename to pre_edited_cs/data/Stage/MazeO.pxe
diff --git a/pre-edited-cs/data/Stage/MazeO.pxm b/pre_edited_cs/data/Stage/MazeO.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/MazeO.pxm
rename to pre_edited_cs/data/Stage/MazeO.pxm
diff --git a/pre-edited-cs/data/Stage/MazeO.tsc b/pre_edited_cs/data/Stage/MazeO.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/MazeO.tsc
rename to pre_edited_cs/data/Stage/MazeO.tsc
diff --git a/pre-edited-cs/data/Stage/MazeS.pxe b/pre_edited_cs/data/Stage/MazeS.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/MazeS.pxe
rename to pre_edited_cs/data/Stage/MazeS.pxe
diff --git a/pre-edited-cs/data/Stage/MazeS.pxm b/pre_edited_cs/data/Stage/MazeS.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/MazeS.pxm
rename to pre_edited_cs/data/Stage/MazeS.pxm
diff --git a/pre-edited-cs/data/Stage/MazeS.tsc b/pre_edited_cs/data/Stage/MazeS.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/MazeS.tsc
rename to pre_edited_cs/data/Stage/MazeS.tsc
diff --git a/pre-edited-cs/data/Stage/MazeW.pxe b/pre_edited_cs/data/Stage/MazeW.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/MazeW.pxe
rename to pre_edited_cs/data/Stage/MazeW.pxe
diff --git a/pre-edited-cs/data/Stage/MazeW.pxm b/pre_edited_cs/data/Stage/MazeW.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/MazeW.pxm
rename to pre_edited_cs/data/Stage/MazeW.pxm
diff --git a/pre-edited-cs/data/Stage/MazeW.tsc b/pre_edited_cs/data/Stage/MazeW.tsc
similarity index 91%
rename from pre-edited-cs/data/Stage/MazeW.tsc
rename to pre_edited_cs/data/Stage/MazeW.tsc
index df03473..b5030c6 100644
--- a/pre-edited-cs/data/Stage/MazeW.tsc
+++ b/pre_edited_cs/data/Stage/MazeW.tsc
@@ -1 +1 @@
-=:S``i`=:l}~qls}�``cglvqy````lu~t=:S``ia=:l}~qls}�``cglvqy```alu~t=:S``ib=:l}~qls}�``cglvqy```blu~t=:S``ic=:l}~qls}�``cglvqy```clu~t=:S``id=:l}~qls}�``cglvqy```dlu~t=:S`a``=:l��ylvq```bl��q``chj``ibj```ej```c=:S`a`a=:S`a`b=:l��yl��``aalt~�`a`blvq```dl��q``d`j``ibj```dj```e=:S`a`c=:lv|z`fhaj`a`e=:ly�z``agj`a`d=:l��yl}�w|�����^l~tlu~t=:S`a`d=:l��yl��``bblwy�a`aglv|[`fhaly�]``ag=:l}�wl�������P���Pms�����P{��m^l~tls|lu�u`a`e=:S`a`e=:l��yl��``aalt~�`a`clvq````l��q``daj``i`j``aej```i=:S`a`f=:l{u�l��``aalq~�`a`fj``0`j```blvq```dl��q``dbj``idj```ej```i=:S`aa`=:lu�u`aaa=:S`aaa=:l{u�l��``aalq~�`aa`j````j```blvq```bl��q``dcj``ibj```dj``ac=:S`ab`=:l{u�lvq```dl��q``d`j``idj``abj```b=:S`c``=:S`c`a=:lt~�`c`alrq```alv|]`fh`lu~t=:S`c`b=:lt~�`c`bls}�```glrq``a`ls~�`c``j``acj````lr�|````lu~t=:Sa```=:l{u�lvr````j``afl�qy`be`ls}�````=:l}�cl���ls}�``ae=:t�������P}������P�^lv}``afl�qy`af`lv|[fa`fl~tls|ls}�``cg=:ls~�`c``j````j````lv|[`fh`lu~t=:Sab``=:l{u�lq~�ab``j``b`j```b=:lv~ab``j``aflvqy```a=:l�qy`a``lvq```al��q``dgjab``j``chj``af
\ No newline at end of file
+=:S``i`=:l}~qls}�``cglvqy````lu~t=:S``ia=:l}~qls}�``cglvqy```alu~t=:S``ib=:l}~qls}�``cglvqy```blu~t=:S``ic=:l}~qls}�``cglvqy```clu~t=:S``id=:l}~qls}�``cglvqy```dlu~t=:S`a``=:l��ylvq```bl��q``chj``ibj```ej```c=:S`a`a=:S`a`b=:l��yl��``aalt~�`a`blvq```dl��q``d`j``ibj```dj```e=:S`a`c=:lv|z`fhaj`a`e=:lv|zgaaej`a`d=:l��yl}�w|�����^l~tlu~t=:S`a`d=:l��yl��``bblwy�a`aglv|[`fhaly�]``ag=:l}�wl�������P���Pms�����P{��m^l~tls|lu�u`a`e=:S`a`e=:l��yl��``aalt~�`a`clvq````l��q``daj``i`j``aej```i=:S`a`f=:l{u�l��``aalq~�`a`fj``0`j```blvq```dl��q``dbj``idj```ej```i=:S`aa`=:lu�u`aaa=:S`aaa=:l{u�l��``aalq~�`aa`j````j```blvq```bl��q``dcj``ibj```dj``ac=:S`ab`=:l{u�lvq```dl��q``d`j``idj``abj```b=:S`c``=:S`c`a=:lt~�`c`alrq```alv|]`fh`lu~t=:S`c`b=:lt~�`c`bls}�```glrq``a`ls~�`c``j``acj````lr�|````lu~t=:Sa```=:l{u�lvr````j``afl�qy`be`ls}�````=:l}�cl���ls}�``ae=:t�������P}������P�^lv}``afl�qy`af`lv|[fa`fl~tls|ls}�``cg=:ls~�`c``j````j````lv|[`fh`lu~t=:Sab``=:l{u�lq~�ab``j``b`j```b=:lv~ab``j``aflvqy```a=:l�qy`a``lvq```al��q``dgjab``j``chj``af
\ No newline at end of file
diff --git a/pre-edited-cs/data/Stage/MiBox.pxe b/pre_edited_cs/data/Stage/MiBox.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/MiBox.pxe
rename to pre_edited_cs/data/Stage/MiBox.pxe
diff --git a/pre-edited-cs/data/Stage/MiBox.pxm b/pre_edited_cs/data/Stage/MiBox.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/MiBox.pxm
rename to pre_edited_cs/data/Stage/MiBox.pxm
diff --git a/pre-edited-cs/data/Stage/MiBox.tsc b/pre_edited_cs/data/Stage/MiBox.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/MiBox.tsc
rename to pre_edited_cs/data/Stage/MiBox.tsc
diff --git a/pre-edited-cs/data/Stage/Mimi.pxa b/pre_edited_cs/data/Stage/Mimi.pxa
similarity index 100%
rename from pre-edited-cs/data/Stage/Mimi.pxa
rename to pre_edited_cs/data/Stage/Mimi.pxa
diff --git a/pre-edited-cs/data/Stage/Mimi.pxe b/pre_edited_cs/data/Stage/Mimi.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/Mimi.pxe
rename to pre_edited_cs/data/Stage/Mimi.pxe
diff --git a/pre-edited-cs/data/Stage/Mimi.pxm b/pre_edited_cs/data/Stage/Mimi.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/Mimi.pxm
rename to pre_edited_cs/data/Stage/Mimi.pxm
diff --git a/pre-edited-cs/data/Stage/Mimi.tsc b/pre_edited_cs/data/Stage/Mimi.tsc
similarity index 98%
rename from pre-edited-cs/data/Stage/Mimi.tsc
rename to pre_edited_cs/data/Stage/Mimi.tsc
index e681955..b10af98 100644
--- a/pre-edited-cs/data/Stage/Mimi.tsc
+++ b/pre_edited_cs/data/Stage/Mimi.tsc
@@ -1 +1 @@
-vs�����vs�������������������������������������vs�����vs�������������������������������������vs�����vs�������������������������������������vs�����vs�������������������������������������vs�����vs�������������������������������������vs�����vs��������������������vs�����vs��������������������vs�����vs��������������������vs�����vs��������������������vs�����vs��������������������vs�����vs�����������������vs�������������vs���������͗��������vs�����vs��������������������������������vs�����������͉������ې܉��⦗��������������������������������vs�����vs���������������������������������������������������������vs�����vs�����������������������������������vs�����vs�������������vs�������������vs���¥�����������������։���ԕvs��Ή�����ۖ��؉�����͉���Η��������vs�����vs���¥����������������������������������������������vs�����vs���¥������������������������������vs�����vs�������������������������������������������������������������vs�����vs�����������������������������������vs�����vs�����������������������������������vs�����vs�����������������������������������vs�����vs���¥����������������������������������ݨ���������vs��­����vs��������������������������vs��������������������������vs����������������������������������vs��������vs������������������������������vs�����vs�����������������������������������vs�����vs�����������������������������������������������������������vs�����vs����������������А܉������׉���Η���������������؉���Љ�܉��މ�����׉���ۉ������vs�ω����������ו���������މ�����vs���͉���ۉ�����ݗ����܉��������Η��������vs�����vs��������vs�����vs�����vs���¥����������������������������vs�����������������vs��«��������������­������������������������������������������������vs���������������ݨ���ސ�Ή��݉�׉����⨥���vs��������݉��ۉ���Ή��vs��܉���֗������������։���З����vs��։��Ή�����ۖ��Ή��vs���܉������Η����vs��݉���݉���݉�����vsʉ����Ή��ݕ����щ����vs����ω�܉���ݗ�����������Օ�����׉�������Љ��Η����������ΐ܉��݉��Ή�ω�ܕvs�����ї����vs��ΐ܉���݉�׉��������vs��؉�����͉�ى�������◥�������vs�����vs���¥������������������������������������������������vs������������vs�������������vs��������������������������������������������������������vs������������������vs������������������vs��������vs������������������vs��������vs��������vs��������vs������������������������vs�����vs���¥���������������݉���݉�����ؗ������vs��Ή��׉��ω��������Ή����vs��މ���՗��������vs�����vs���¥����������������ۊ�������������؊����vs��ސ�Ή��݉������Љ����vs���݉�����⊥�������vs�����vs�����vs���¥�­����������������������������vs���������������Ή�Ή��Ή��⊥����������������؊��������vs��������������������������vs��������������������������������������������������������������vs�����vs�����vs���¥��������ى����ٓ�����������������vs��«��������������������������������­����vs�������������vs�������������vs�������������vs�����ъ���މ�������͉�Η������������Ψ����vs�ѕ�����ݗ����������Ή���Չ�׉�����ې܉����Ε�����ݨ����vs��ΐ܉�����Љ���щ�����ؗ������������݉���Օ����ݗ����vs���܉��ΐ܉��������Љ��ۉ�vs���≭����׋�������vs������܉���݉���ۉ��Ή��i�ܗ��vs�؉����Ή����ʉ�����܉������vs����ݨ��������������������������vs�����vs�����ѕ���މ����ח����������Ή��܉������݉�ى��ٗ����vs��������ݐ܉��ۉ����݉������vs��݉�������͗��������������������������vs�����vs���¥����݉���Ή�����܉�������ۉ��vs�����ې܉����Η������������Ή���������Љʉ�������vs��������Ш��������������������������vs�����vs���¥������ݨ����vs�����ؐ܉���׉��������ͨ�����������Օ����ݐ܉�؉���͗����vs������Ή�������Չ���݉�׉���vs������Ή�܉��Η����������������������������vs�����vs���¥������������������������������������������������������������������vs��������������݉�Ή��݉���܉������݊�������������������������������������������������������͉���ۉ�����Ί��������¸�������Ή�����׉������vs��݉��������͊����������ۉ���������Ή�܉��vs���׉��މ���ۉ�؉���։���vs���Ή��ۉ��Ή���ݗ������������������������������������މ����ٖ���͉����Ԋ�����������������������������������ω�Ή��א݉��݉�����؉����vs�����╉������ۉ���Չ����vs��މ���ˉ���։���ˊ����������������vs��������������������vs�����vs�����vs�����vs���¥�����������vs������������������vs������������������vs���������������������������������������؉�ΐ�Η��������ܨ�����������������������������������ݐ܉����ݗ����������Ή�����ۉ����܉�؉���vs��Ή��͉������܉�؉����vs��މ�����ԉ��Ή�����ܗ�������������������������܉�Ή����vs�؉�؉���ݨ��������������������݉��׉�ܗ��vs����܉���Ήʉ����ח������������������͉�ΐ܉����Љ�؉���vs����Ή������܉�׉�����ب�����������������܉��ۉ�܉����׉���Օvs�ΐ܉����Չ������Љ���vs���֗���������Ή��׉�������Ή��vs����א݉���͉���֗�����������������ϗ�����������ω�Ή����܉�����vs������ܕ������ؗ��������������������Ή����͉�؉���͗��vs�������׉�ω����ї���������������������Չ����ۉ����������vs�؉�����׊��������vs����������������vs�������������������������������vs�����vs���¥��������������������٣���������ʉ����vs�������ݣ���������ۉ������ݣ����������vs��������������ף������ې܉����Υ���vs����vs�����vs���¥�������vs����������������������ʉ���֥�������vs�����vs���¥�������vs�������������������������ۥ�������vs�����vs���¥�������vs������������������ʉ���������vs������������������ۊ��؉����⥷������vs�����vs���¥�������vs�������������������ې܉����Υ�������vs�����vs���¥�������vs����������������������≱��ե�������vs�����vs�������������vs�������������vs���¥��������������������vs��������������ٕ���։����ԗ������������Ή�����ې܉�������vs��������͉ʉ�����ʕvs�������Љ��Ή��܉�Η����vs��ۉ���ΐ܉�����ؕ����vs��͉���׉���Ή�ω���vs����ۉ������܉����͉����vs�������Љ�؉�؉���щ�Ε����vs��Ή����Ή��܉��������vs��͉���͗�����������������������������������������א݉��މ�؉��vs������Ψ����������������ې܉�׉�vs�������׉������vs��������ח����vs���͉��։��͉����Љ���vs���Η��������vs�����vs���¥��������������͉��������ۉ���vs����Љ��։���Η����vs��މ��׉��݉�؉���������vs����Љ��Ή���������ۉ��vs�����ې܉����Η��������vs�����vs���¥��������������Ή��މ����͉��vs������ۉ��ݨ��������vs�����vs�������������vs���¥��������������܉�܉��Ή���Ή�ω���vs��؉������ˉ��Ή����ۉ��vs��ۉ������Η��������vs�����vs���¥���������������Չ������З����������
\ No newline at end of file
+vs�����vs�������������������������������������vs�����vs�������������������������������������vs�����vs�������������������������������������vs�����vs�������������������������������������vs�����vs�������������������������������������vs�����vs��������������������vs�����vs��������������������vs�����vs��������������������vs�����vs��������������������vs�����vs��������������������vs�����vs�����������������vs�������������vs���������͗��������vs�����vs��������������������������������vs�����������͉������ې܉��⦗��������������������������������vs�����vs���������������������������������������������������������vs�����vs�����������������������������������vs�����vs�������������vs�������������vs���¥�����������������։���ԕvs��Ή�����ۖ��؉�����͉���Η��������vs�����vs���¥����������������������������������������������vs�����vs���¥������������������������������vs�����vs�������������������������������������������������������������vs�����vs�����������������������������������vs�����vs�����������������������������������vs�����vs�����������������������������������vs�����vs���¥����������������������������������ݨ���������vs��­����vs��������������������������vs��������������������������vs����������������������������������vs��������vs������������������������������vs�����vs�����������������������������������vs�����vs�����������������������������������������������������������vs�����vs����������������А܉������׉���Η���������������؉���Љ�܉��މ�����׉���ۉ������vs�ω����������ו���������މ�����vs���͉���ۉ�����ݗ����܉��������Η��������vs�����vs��������vs�����vs�����vs���¥����������������������������vs�����������������vs��«��������������­������������������������������������������������vs���������������ݨ���ސ�Ή��݉�׉����⨥���vs��������݉��ۉ���Ή��vs��܉���֗������������։���З����vs��։��Ή�����ۖ��Ή��vs���܉������Η����vs��݉���݉���݉�����vsʉ����Ή��ݕ����щ����vs����ω�܉���ݗ�����������Օ�����׉�������Љ��Η����������ΐ܉��݉��Ή�ω�ܕvs�����ї����vs��ΐ܉���݉�׉��������vs��؉�����͉�ى�������◥�������vs�����vs���¥������������������������������������������������vs������������vs�������������vs��������������������������������������������������������vs������������������vs������������������vs��������vs������������������vs��������vs��������vs��������vs������������������������vs�����vs���¥���������������݉���݉�����ؗ������vs��Ή��׉��ω��������Ή����vs��މ���՗��������vs�����vs���¥����������������ۊ�������������؊����vs��ސ�Ή��݉������Љ����vs���݉�����⊥�������vs�����vs�����vs���¥�­����������������������������vs���������������Ή�Ή��Ή��⊥����������������؊��������vs��������������������������vs��������������������������������������������������������������vs�����vs�����vs���¥��������ى����ٓ�����������������vs��«��������������������������������­����vs�������������vs�������������vs�������������vs�����ъ���މ�������͉�Η������������Ψ����vs�ѕ�����ݗ����������Ή���Չ�׉�����ې܉����Ε�����ݨ����vs��ΐ܉�����Љ���щ�����ؗ������������݉���Օ����ݗ����vs���܉��ΐ܉��������Љ��ۉ�vs���≭����׋�������vs������܉���݉���ۉ��Ή��i�ܗ��vs�؉����Ή����ʉ�����܉������vs����ݨ��������������������������vs�����vs�����ѕ���މ����ח����������Ή��܉������݉�ى��ٗ����vs��������ݐ܉��ۉ����݉������vs��݉�������͗��������������������������vs�����vs���¥����݉���Ή�����܉�������ۉ��vs�����ې܉����Η������������Ή���������Љʉ�������vs��������Ш��������������������������vs�����vs���¥������ݨ����vs�����ؐ܉���׉��������ͨ�����������Օ����ݐ܉�؉���͗����vs������Ή�������Չ���݉�׉���vs������Ή�܉��Η����������������������������vs�����vs���¥������������������������������������������������������������������vs��������������݉�Ή��݉���܉������݊�������������������������������������������������������͉���ۉ�����Ί��������¸�������Ή�����׉������vs��݉��������͊����������ۉ���������Ή�܉��vs���׉��މ���ۉ�؉���։���vs���Ή��ۉ��Ή���ݗ������������������������������������މ����ٖ���͉����Ԋ�����������������������������������ω�Ή��א݉��݉�����؉����vs�����╉������ۉ���Չ����vs��މ���ˉ���։���ˊ����������������vs��������������������vs�����vs�����vs�����vs���¥�����������vs������������������vs������������������vs���������������������������������������؉�ΐ�Η��������ܨ�����������������������������������ݐ܉����ݗ����������Ή�����ۉ����܉�؉���vs��Ή��͉������܉�؉����vs��މ�����ԉ��Ή�����ܗ�������������������������܉�Ή����vs�؉�؉���ݨ��������������������݉��׉�ܗ��vs����܉���Ήʉ����ח������������������͉�ΐ܉����Љ�؉���vs����Ή������܉�׉�����ب�����������������܉��ۉ�܉����׉���Օvs�ΐ܉����Չ������Љ���vs���֗���������Ή��׉�������Ή��vs����א݉���͉���֗�����������������ϗ�����������ω�Ή����܉�����vs������ܕ������ؗ��������������������Ή����͉�؉���͗��vs�������׉�ω����ї���������������������Չ����ۉ����������vs�؉�����׊��������vs����������������vs�������������������������������vs�����vs���¥��������������������٣���������ʉ����vs�������ݣ���������ۉ������ݣ����������vs��������������ף������ې܉����Υ���vs����vs�����vs���¥�������vs����������������������ʉ���֥�������vs�����vs���¥�������vs�������������������������ۥ�������vs�����vs���¥�������vs������������������ʉ���������vs������������������ۊ��؉����⥷������vs�����vs���¥�������vs�������������������ې܉����Υ�������vs�����vs���¥�������vs����������������������≱��ե�������vs�����vs�������������vs�������������vs���¥��������������������vs��������������ٕ���։����ԗ������������Ή�����ې܉�������vs��������͉ʉ�����ʕvs�������Љ��Ή��܉�Η����vs��ۉ���ΐ܉�����ؕ����vs��͉���׉���Ή�ω���vs����ۉ������܉����͉����vs�������Љ�؉�؉���щ�Ε����vs��Ή����Ή��܉��������vs��͉���͗�����������������������������������������א݉��މ�؉��vs������Ψ����������������ې܉�׉�vs�������׉������vs��������ח����vs���͉��։��͉����Љ���vs���Η��������vs�����vs���¥��������������͉��������ۉ���vs����Љ��։���Η����vs��މ��׉��݉�؉���������vs����Љ��Ή���������ۉ��vs�����ې܉����Η��������vs�����vs���¥��������������Ή��މ����͉��vs������ۉ��ݨ��������vs�����vs�������������vs���¥��������������܉�܉��Ή���Ή�ω���vs��؉������ˉ��Ή����ۉ��vs��ۉ������Η��������vs�����vs���¥���������������Չ������З����������
\ No newline at end of file
diff --git a/pre-edited-cs/data/Stage/Momo.pxe b/pre_edited_cs/data/Stage/Momo.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/Momo.pxe
rename to pre_edited_cs/data/Stage/Momo.pxe
diff --git a/pre-edited-cs/data/Stage/Momo.pxm b/pre_edited_cs/data/Stage/Momo.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/Momo.pxm
rename to pre_edited_cs/data/Stage/Momo.pxm
diff --git a/pre-edited-cs/data/Stage/Momo.tsc b/pre_edited_cs/data/Stage/Momo.tsc
similarity index 62%
rename from pre-edited-cs/data/Stage/Momo.tsc
rename to pre_edited_cs/data/Stage/Momo.tsc
index 38d1503..19e277c 100644
--- a/pre-edited-cs/data/Stage/Momo.tsc
+++ b/pre_edited_cs/data/Stage/Momo.tsc
@@ -1 +1 @@
-QNgtt}tQN��������tttv����tttt����QNgtt}uQN��������tttv����tttu����QNgtt}vQN��������tttv����tttv����QNgtt}wQN��������tttv����tttw����QNgtt}xQN��������tttv����tttx����QNgtuttQN��������ttuu����tutt����tttt����ttyz~tt}t~tt{v~tt|xQNgtuutQN����QN����ttuuQN����tuut~tttt~tttv����ttut����QN����tuut~tttt~ttttQN����ttuy~ttuv����ttytQN����ttuuQN����tuuu~tttt~tttv����tttt��������ttutQN����tuuu~tttt~tttt����QNgtuuuQN����QN����ttuuQN����tuuu~tttt~tttv����ttut����QN����tuuu~tttt~ttttQN����ttuy~ttt{����ttytQN����ttuuQN����tuut~tttt~tttv����tttt��������ttutQN����tuut~tttt~tttt����QNgtvttQN����QN����uutw~tvuvQN����uutt~tvtzQN����ttu|~tvtv����ttvw~tvtvQN������������ttvv����d�d����d�����d���QN��d�d�������r�����������pd���d�����d����d���QN��d�����rrr��������QNgtvtuQN����tt{xQNgtvtvQN����tvtt~tttw~ttty����ttutQN����tvtt~tttt~ttty����ttutQN���ouutt���ot}zu��������ttvv������������d��d����pQN���d��d����d���r���D��������tttt���ouutu���outv{���outv|QN����tvtuQNgtvtyQN���ouutvQN������������ttvv�����d��d����utu|�d��������utvw�����p��������ttttd�QN����utv}�����������p��������ttttd���d�QN����utv{��������������������ttttd���d�k��d�����QN���d�d������r��������QNgtvtzQN����ttu|~tvt|����tvt{QNgtvt{QN����ttvw~tvt|����tvtyQNgtvt|QN����ttv{~tvt}����tvtyQNgtvt}QN����ttv}~tvut����tvtyQNgtvutQN�������ouut{����tvyt~tt{v~tttv���qttv}���qttv{���ouutw��������tvuvQNgtvuvQN����������������ttvv���d���k�d���d����QN����d��d����d������������QNgtvytQNgtv|tQN��������������d���d����d��d���������tttt��������tttx����tttt����ttvtQN����uutw~tv|uQN���outtt����ttvt����tttv��������������d��������r������������tttv����tttx����QNgtv|uQN���quutw���ouuty���outwt���outwu���outwv���outww���outtx���qutw|���outw}QN���qutvz���outwzQN����tvtt����twytQN���outtt����ttvt����tttv����ttut����tttv����tttx����QNgtwytQN���������d������rrr���������
\ No newline at end of file
+SPivvvSP��������vvvx����vvvv����SPivvwSP��������vvvx����vvvw����SPivvxSP��������vvvx����vvvx����SPivvySP��������vvvx����vvvy����SPivvzSP��������vvvx����vvvz����SPivwvvSP��������vvww����vwvv����vvvv����vv{|�vvv�vv}x�vv~zSPivwwvSP����SP����vvwwSP����vwwv�vvvv�vvvx����vvwv����SP����vwwv�vvvv�vvvvSP����vvw{�vvwx����vv{vSP����vvwwSP����vwww�vvvv�vvvx����vvvv��������vvwvSP����vwww�vvvv�vvvv����SPivwwwSP����SP����vvwwSP����vwww�vvvv�vvvx����vvwv����SP����vwww�vvvv�vvvvSP����vvw{�vvv}����vv{vSP����vvwwSP����vwwv�vvvv�vvvx����vvvv��������vvwvSP����vwwv�vvvv�vvvv����SPivxvvSP����SP����wwvy�vxwxSP����wwvv�vxv|SP����vvw~�vxvx����vvxy�vxvxSP������������vvxx����f�f����f�����f���SP��f�f�������t�����������rf���f�����f����f���SP��f�����ttt��������SPivxvwSP����vv}zSPivxvxSP����vxvv�vvvy�vvv{����vvwvSP����vxvv�vvvv�vvv{����vvwvSP���qwwvv���qv|w��������vvxx������������f��f����rSP���f��f����f���t������������vvvv���qwwvw���qwvx}�F�qwvx~SP����vxvwSPivxv{SP���qwwvxSP������������vvxx�����f��f����wvw~�f��������wvxy�����r��������vvvvf�SP����wvx�����������r��������vvvvf���f�SP����wvx}��������������������vvvvf���f�m��f�����SP���f�f������t��������SPivxv|SP����vvw~�vxv~����vxv}SPivxv}SP����vvxy�vxv~����vxv{SPivxv~SP����vvx}�vxv����vxv{SPivxvSP����vvx�vxwv����vvzy�vxwv����vxv{SPivxwvSP�������qwwv}����vx{v�vv}x�vvvx���svvx���svvx}���qwwvy����vvzy�vxww��������vxwxSPivxwwSP���svvzy���qvvx~����vxwxSPivxwxSP����������������vvxx���f���m�f���f����SP����f��f����f������������SPivx{vSPivx~vSP��������������f���f����f��f���������vvvv��������vvvz����vvvv����vvxvSP����wwvy�vx~wSP���qwvvv����vvxv����vvvx��������������f��������t������������vvvx����vvvz����SPivx~wSP���swwvy���qwwv{���qwvyv���qwvyw���qwvyx���qwvyy���qwvvz���swvy~���qwvySP���swvx|���qwvy|SP����vxvv����vy{vSP���qwvvv����vvxv����vvvx����vvwv����vvvx����vvvz����SPivy{vSP���������f������ttt���������
\ No newline at end of file
diff --git a/pre-edited-cs/data/Stage/New.pxe b/pre_edited_cs/data/Stage/New.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/New.pxe
rename to pre_edited_cs/data/Stage/New.pxe
diff --git a/pre-edited-cs/data/Stage/Oside.pxa b/pre_edited_cs/data/Stage/Oside.pxa
similarity index 100%
rename from pre-edited-cs/data/Stage/Oside.pxa
rename to pre_edited_cs/data/Stage/Oside.pxa
diff --git a/pre-edited-cs/data/Stage/Oside.pxe b/pre_edited_cs/data/Stage/Oside.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/Oside.pxe
rename to pre_edited_cs/data/Stage/Oside.pxe
diff --git a/pre-edited-cs/data/Stage/Oside.pxm b/pre_edited_cs/data/Stage/Oside.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/Oside.pxm
rename to pre_edited_cs/data/Stage/Oside.pxm
diff --git a/pre-edited-cs/data/Stage/Oside.tsc b/pre_edited_cs/data/Stage/Oside.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/Oside.tsc
rename to pre_edited_cs/data/Stage/Oside.tsc
diff --git a/pre-edited-cs/data/Stage/Ostep.pxe b/pre_edited_cs/data/Stage/Ostep.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/Ostep.pxe
rename to pre_edited_cs/data/Stage/Ostep.pxe
diff --git a/pre-edited-cs/data/Stage/Ostep.pxm b/pre_edited_cs/data/Stage/Ostep.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/Ostep.pxm
rename to pre_edited_cs/data/Stage/Ostep.pxm
diff --git a/pre-edited-cs/data/Stage/Ostep.tsc b/pre_edited_cs/data/Stage/Ostep.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/Ostep.tsc
rename to pre_edited_cs/data/Stage/Ostep.tsc
diff --git a/pre-edited-cs/data/Stage/Pens.pxa b/pre_edited_cs/data/Stage/Pens.pxa
similarity index 100%
rename from pre-edited-cs/data/Stage/Pens.pxa
rename to pre_edited_cs/data/Stage/Pens.pxa
diff --git a/pre-edited-cs/data/Stage/Pens1.pxe b/pre_edited_cs/data/Stage/Pens1.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/Pens1.pxe
rename to pre_edited_cs/data/Stage/Pens1.pxe
diff --git a/pre-edited-cs/data/Stage/Pens1.pxm b/pre_edited_cs/data/Stage/Pens1.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/Pens1.pxm
rename to pre_edited_cs/data/Stage/Pens1.pxm
diff --git a/pre_edited_cs/data/Stage/Pens1.tsc b/pre_edited_cs/data/Stage/Pens1.tsc
new file mode 100644
index 0000000..0b3f5a4
--- /dev/null
+++ b/pre_edited_cs/data/Stage/Pens1.tsc
@@ -0,0 +1 @@
+�~������~��µ���ɤ�������������¸�~������~��µ���ɤ�������������¸�~������~��µ���ɤ�������������¸�~������~��µ���ɤ�������������¸�~������~��µ����������������ɤ�������������ʹ�����~������~���ɤ�������������¸�~������~���ɤ����~���Ĥ����������������������~���Ĥ��������������˵������~���Ĥ��������������~��͸�����������Ĥ�����¸�~������~���Ͱ�µ����������������ɤ����~���Ĥ����������������������~���Ĥ��������������˵������~���Ĥ��������������~��͸�����������Ĥ�����¸�~������~��ƽ���ä�����Ƶ��������������������~������~��ƽ���ä�����Ƶ��������������������~������~��ƽ��������������~��������������~��ǻ�����آ��ø��¸�~������~���ɤ������ȥ��������������������~��ǻ�������ؔ�������甿������ø��ȡ�������Ȥ������ð�ʹ�����~������~��ƽ���ɤ������Ĥ������ä�����Ƶ��������������������~������~���������~��ǟ�����������ǟ�����������ǟ�����������ǟ�����������ǟ����������~���ͰǵȰ�ǻ������电�����ர�ø���ā~������~���������������ǻ��������٢��ø���ā~������~����������������������������ǻ��������٢��ø���ā~������~���Ͱ�ǻ���Ȥ�������ٔ��������ٔ���Ք�������೰�¾�����ȵ������������������ā~������~���Ͱ�ǻ���Ȥ�������ٔ���攺�����������Ք����ٳ��¾�����ȵ������������������ā~������~���������������ǻ��������٢��ø���ā~������~����������������������������ǻ��������٢��ø���ā~������~���Ͱ�ǻ���Ȥ�������ٔ���收���ٔ���Ք������糰�¾�����ȵ������������������ā~������~���Ͱ�ǻ���Ȥ�������ٔ��������������Ք����ٳ��¾�����ȵ������������������ā~������~���Ͱ�ǻ������碢����ø��¸�~������~���������������ǻ��������٢��ø���ā~������~��������������~���Ͱ�ǻ���Ȥ������ߔ�����收�����泰�¾��������������������ā~������~���Ͱ�ǻ���Ȥ���������ڔ���收�����泰�¾���������������ā~������~���ā~������~��¸�~������~������~������~������~���������~��ǟ�����������ǟ�����������ǟ�����������ǟ�����������ǟ����������~���ͰǵȰ�ǻ�����������械�ø���ā~������~��������������~���Ͱ�ǻ��������������ٔ���ߢ��ø������ٛ����ߢ��ø�~��ٛ����������ؔ����~��ٔ���ٔ������٢��ø�~������ٔ���������������~���٠��ٛ�ٔ����۔�����~��������������ߢ��ø�~���������ٔ�����٠�~�����٢��ø���ƽ������������٠������렁~�������������ٔ�ڔ�碰�ø�~�������������������~����������٢��ø��¸�~������~���Ͱ�ǻ�������������ٔ����������٢����ø��¸�~������~���Ͱ��ɤ��������������������~���Ĥ��������������~�˵��������Ĥ��������������˵������~���������~���Ĥ��������������~���Ĥ��������������˵������~��ǻ�������������ܢ����ø���ư������������ٔ����������ø���ð��������~�˵��������Ĥ��������������~��ǻ�������������ᢰ�ø���������ٔ������ؔ�����ف~�����碰�ø���ư��������������ø���ð��������~���Ĥ��������������˵������~���Ĥ����������������ɤ����~���Ĥ��������������~��ǻ�������������Օ���ø���Ĥ����������������Ƶ�ؔ��������收�����数�ø���ư��������ܕ��ø���ð��������~���Ĥ��������������˵������~���Ĥ��������������~��ǻ������������ٔ��������蠔���ⳕ��ø���ư����������ࠔ���ٔ�����碰�ø���ð��������~���Ĥ��������������~���Ĥ��������������˵������~���Ĥ��������������˵������~���Ĥ��������������~���ɤ������Ĥ��������������˵������~���Ĥ��������������~��ǻ���������������ø���ư��������������������ճ��ø���ð��������~�˵������~���Ĥ��������������˵������~���Ĥ��������������˵������~���Ĥ��������������˵������~��ǻ������������甿��ۢ��ø���Ƶ������ؔ�ڔ���ٔ���ٔ��~��ٔ������٢��ø��������ٔ���ؔ���ٔ�����ځ~����������٢��ø�~�����������ڔ���᠁~�����ܠ����ٔ������������؁~����ٔ�����������碰�ø���ƹ��┿��۔�������~������碢���ø���Á~���ɤ����~���Ĥ��������������~���Ĥ��������������˵������~���Ĥ��������������~��͸�����������Ĥ�������������¸�~������~���Ͱ��������������ǻ����������ٔ��������������ف~���������۔���������~�������٢����ø�~�ڔ�ٔ��������������ہ~���⢢���ø��¸�~������~���Ͱ��������������ǻ������������������������䢰�ø��������������������������~������������٠������~������ٔ��آ��ø��¸�~������~���Ͱ��������������ǻ����������������Ք����܁~�����⢢���ø�~�㕔����������������蕰�ø��¸�~������~���Ͱ��������������Ͷ�����˵�������͸�������Ĥ���������������ǻ�~��������������ٔ���ߕ��ø������������ٔ����ٔ���~���������٢��ø�~���ܔ�������������䠰�ø�~�ٔ�����ؔ�ٔ���ٔ�����~�����ؔ��ٔ�������ؔ���~���t���ۢ��ø���ð��������~���Ĥ��������������˵������~���Ĥ���������������ǻ��������������数�ø���Ʒ���ٔ���ٔ���������ف~������ܔ�������ٔ�㳰�ø���ð��������~���Ĥ��������������˵������~���Ĥ��������������~��ǻ�����������ɤ����������ø���Ɓ~����������������械�ø���ư������������ø���ư���������٠������梢���ø�~�ٔ���ٔ��������ؔ���~�����٢��ø������ٔ���������������؁~��ٔ��ؔ������碰�ø���Ĥ����������������Ɓ~�������������ø���ư����������賰�ø���ư�����������ٔ�ٔ���������~�������ؔ���᠔��������~Ք�������ڔ���٢��ø�~��ٔ������������ٔ���؁~���٢��ø������ٔ���������ٔ����������~���ٔ����ؔ��������ٔ��~��ٔ���ؔ���٢��ø���Ɓ~����������ٔ���ؔ���ٳ��ø����������⠔���������ف~�ٛ������ؔ��ٔ�����泰�ø���ư����������࠰�ø����ٔ��������ف~�ڔ����������碰�ø�~�ڔ�ٔ���������������ف~������������ٔ�������~���������������ᢢ���ø���Ƽ�����栔��ٔ���ؔ���ٔ��~�������������������碰�ø�~������������۔�ٔ���ٔ��ف~���䠰�ø�~����ٛ�����������ٔ����~�ٔ����ؔ����������٢����ø���Ɓ~������������ٔ�����۔�䳰�ø���ư��������������������ø��������ٛ���ٔ�ڔ������~Ք�����������ܔ�������~��֢��ø���ð��������~���Ĥ����������������Ĥ��������������˵������~���Ĥ��������������˵��������Ĥ��������������~��ǻ�������������颰�ø���Ɓ~���ɤ����������������㔽ǔ�ٳ��ø���ư������������袢���ø������������ٔ�ڔ��ٔ����؁~������������������ف~���������ؔ�����������ذ�ø�~����������㢰�ø���ư�������������賕��ø���ư��������������������������~������ؔ��������������~����ؔ��蠰��Ĥ���������������ø�~��蔽������������ف~����������碰�ø�~������������������ٔ����~��ٔ�ڔ��������ؔ���٢����ø���ư���������������械�ø�~���ٔ��������ؔ����ٔ���؁~���٢��ø���ư�����������٢��ø���ð��������~���Ĥ��������������˵������~���Ĥ��������������~���Ĥ��������������˵�������ǻ�������������ٔ��ٔ���������؁~����������۔���������آ��ø���������٢����ٔ��������آ��ø����������ǟ�����������¸�~������~���Ͱ�ǻ������������������ܔ��ٔ���؁~���ٔ��Ք��ٔ���������械�ø�~���ؔ��ٔ��ؔ���������؁~��������������ٔ��ٔ�ځ~���ᢰ�ø��¸�~������~���Ͱ�ǻ��������������ٔ��ٔ�ڔ��٢����ø���ƽ����������������آ��ø��������������������������ف~��������袰�ø��¸�~������~���Ͱ�ǻ����������ٔ���ؔ���٢����ø��¸�~������~���Ͱ�ǻ���������ڔ��������ؔ�ڔ��ف~������研�ٛ����ٔ���ٔ��~���������ٔ��������뢰�ø���ƽ��Ք��۔�����������������ø��¸�~������~���Ͱ�ǻ�����������ٔ��ٔ���ܔ�����؁~���ٔ���������آ����ø�~����۔��颢���ø��¸�~������~���Ĥ������Ͱ�͸�����~���Ĥ��������������˵������~���Ĥ�������������������~���Ĥ��������������~���Ĥ��������������˵������~���Ĥ��������������~���Ĥ��������������˵������~���Ĥ��������������˵������~���Ĥ��������������~�˵������~���Ĥ��������������˵������~���Ĥ��������������˵������~���Ĥ��������������~�����������������~���Ĥ��������������~��������������������������ʹ�����~������~��ʹ�����~������~���Ͱ��������������ǻ�����������ٔ��ٔ���ܔ�����؁~���ٔ���������آ����ø�~����۔��颢���ø��¸�~������~���Ͱ�ǻ��������������������������ف~��������������������~���������آ��ø�����ٔ�������������ٔ��ف~����٢��ø��¸�~������~���Ͱ��ɤ������ä�����Ƶ��������������������~������~��ƽ��ǻ���Ƹ����������������ف~��۔�������泰�¾��������������������ð�ʹ�����~������~��ƽ��ǻ���Ƹ�������������㔻�������⳰�¾�������Á~���Ͱ��Ĥ������������������˵��������Ĥ��������������~�˵��������ä�����Ƶ��������������������~������~��ƽ��ǻ���Ƹ����������������ف~���ؔ���ٳ��¾�������Á~���Ͱ��Ĥ������������������˵��������Ĥ��������������~�˵��������ä�����Ƶ��������������������~������~��ƽ��ǻ���Ƹ����������������ف~��������ܳ��¾�������Á~���Ͱ��Ĥ������������������˵��������Ĥ��������������~�˵��������ä�����Ƶ��������������������~������~��ƽ��ǻ���Ƹ����������������ف~���������⳰�¾�������Á~���Ͱ��Ĥ������������������˵��������Ĥ��������������~�˵��������ä�����Ƶ��������������������~������~���ð��Ͱ��Ĥ������������������˵��������Ĥ��������������~�˵��������ä�����Ƶ��������������������~������~��ƽ��ǻ���������س��¾�������Á~���Ͱ��Ĥ������������������˵��������Ĥ��������������~�˵��������ä�����Ƶ�������������������
\ No newline at end of file
diff --git a/pre-edited-cs/data/Stage/Pens2.pxe b/pre_edited_cs/data/Stage/Pens2.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/Pens2.pxe
rename to pre_edited_cs/data/Stage/Pens2.pxe
diff --git a/pre-edited-cs/data/Stage/Pens2.pxm b/pre_edited_cs/data/Stage/Pens2.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/Pens2.pxm
rename to pre_edited_cs/data/Stage/Pens2.pxm
diff --git a/pre-edited-cs/data/Stage/Pens2.tsc b/pre_edited_cs/data/Stage/Pens2.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/Pens2.tsc
rename to pre_edited_cs/data/Stage/Pens2.tsc
diff --git a/pre-edited-cs/data/Stage/Pixel.pxe b/pre_edited_cs/data/Stage/Pixel.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/Pixel.pxe
rename to pre_edited_cs/data/Stage/Pixel.pxe
diff --git a/pre-edited-cs/data/Stage/Pixel.pxm b/pre_edited_cs/data/Stage/Pixel.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/Pixel.pxm
rename to pre_edited_cs/data/Stage/Pixel.pxm
diff --git a/pre-edited-cs/data/Stage/Pixel.tsc b/pre_edited_cs/data/Stage/Pixel.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/Pixel.tsc
rename to pre_edited_cs/data/Stage/Pixel.tsc
diff --git a/pre-edited-cs/data/Stage/Plant.pxe b/pre_edited_cs/data/Stage/Plant.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/Plant.pxe
rename to pre_edited_cs/data/Stage/Plant.pxe
diff --git a/pre-edited-cs/data/Stage/Plant.pxm b/pre_edited_cs/data/Stage/Plant.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/Plant.pxm
rename to pre_edited_cs/data/Stage/Plant.pxm
diff --git a/pre-edited-cs/data/Stage/Plant.tsc b/pre_edited_cs/data/Stage/Plant.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/Plant.tsc
rename to pre_edited_cs/data/Stage/Plant.tsc
diff --git a/pre-edited-cs/data/Stage/Pole.pxe b/pre_edited_cs/data/Stage/Pole.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/Pole.pxe
rename to pre_edited_cs/data/Stage/Pole.pxe
diff --git a/pre-edited-cs/data/Stage/Pole.pxm b/pre_edited_cs/data/Stage/Pole.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/Pole.pxm
rename to pre_edited_cs/data/Stage/Pole.pxm
diff --git a/pre-edited-cs/data/Stage/Pole.tsc b/pre_edited_cs/data/Stage/Pole.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/Pole.tsc
rename to pre_edited_cs/data/Stage/Pole.tsc
diff --git a/pre-edited-cs/data/Stage/Pool.pxe b/pre_edited_cs/data/Stage/Pool.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/Pool.pxe
rename to pre_edited_cs/data/Stage/Pool.pxe
diff --git a/pre-edited-cs/data/Stage/Pool.pxm b/pre_edited_cs/data/Stage/Pool.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/Pool.pxm
rename to pre_edited_cs/data/Stage/Pool.pxm
diff --git a/pre-edited-cs/data/Stage/Pool.tsc b/pre_edited_cs/data/Stage/Pool.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/Pool.tsc
rename to pre_edited_cs/data/Stage/Pool.tsc
diff --git a/pre-edited-cs/data/Stage/Prefa1.pxe b/pre_edited_cs/data/Stage/Prefa1.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/Prefa1.pxe
rename to pre_edited_cs/data/Stage/Prefa1.pxe
diff --git a/pre-edited-cs/data/Stage/Prefa1.pxm b/pre_edited_cs/data/Stage/Prefa1.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/Prefa1.pxm
rename to pre_edited_cs/data/Stage/Prefa1.pxm
diff --git a/pre-edited-cs/data/Stage/Prefa1.tsc b/pre_edited_cs/data/Stage/Prefa1.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/Prefa1.tsc
rename to pre_edited_cs/data/Stage/Prefa1.tsc
diff --git a/pre-edited-cs/data/Stage/Prefa2.pxe b/pre_edited_cs/data/Stage/Prefa2.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/Prefa2.pxe
rename to pre_edited_cs/data/Stage/Prefa2.pxe
diff --git a/pre-edited-cs/data/Stage/Prefa2.pxm b/pre_edited_cs/data/Stage/Prefa2.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/Prefa2.pxm
rename to pre_edited_cs/data/Stage/Prefa2.pxm
diff --git a/pre-edited-cs/data/Stage/Prefa2.tsc b/pre_edited_cs/data/Stage/Prefa2.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/Prefa2.tsc
rename to pre_edited_cs/data/Stage/Prefa2.tsc
diff --git a/pre-edited-cs/data/Stage/Priso1.pxe b/pre_edited_cs/data/Stage/Priso1.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/Priso1.pxe
rename to pre_edited_cs/data/Stage/Priso1.pxe
diff --git a/pre-edited-cs/data/Stage/Priso1.pxm b/pre_edited_cs/data/Stage/Priso1.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/Priso1.pxm
rename to pre_edited_cs/data/Stage/Priso1.pxm
diff --git a/pre-edited-cs/data/Stage/Priso1.tsc b/pre_edited_cs/data/Stage/Priso1.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/Priso1.tsc
rename to pre_edited_cs/data/Stage/Priso1.tsc
diff --git a/pre-edited-cs/data/Stage/Priso2.pxe b/pre_edited_cs/data/Stage/Priso2.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/Priso2.pxe
rename to pre_edited_cs/data/Stage/Priso2.pxe
diff --git a/pre-edited-cs/data/Stage/Priso2.pxm b/pre_edited_cs/data/Stage/Priso2.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/Priso2.pxm
rename to pre_edited_cs/data/Stage/Priso2.pxm
diff --git a/pre-edited-cs/data/Stage/Priso2.tsc b/pre_edited_cs/data/Stage/Priso2.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/Priso2.tsc
rename to pre_edited_cs/data/Stage/Priso2.tsc
diff --git a/pre-edited-cs/data/Stage/Prt0.bmp b/pre_edited_cs/data/Stage/Prt0.bmp
similarity index 100%
rename from pre-edited-cs/data/Stage/Prt0.bmp
rename to pre_edited_cs/data/Stage/Prt0.bmp
diff --git a/pre-edited-cs/data/Stage/PrtAlmond.bmp b/pre_edited_cs/data/Stage/PrtAlmond.bmp
similarity index 100%
rename from pre-edited-cs/data/Stage/PrtAlmond.bmp
rename to pre_edited_cs/data/Stage/PrtAlmond.bmp
diff --git a/pre-edited-cs/data/Stage/PrtBarr.bmp b/pre_edited_cs/data/Stage/PrtBarr.bmp
similarity index 100%
rename from pre-edited-cs/data/Stage/PrtBarr.bmp
rename to pre_edited_cs/data/Stage/PrtBarr.bmp
diff --git a/pre-edited-cs/data/Stage/PrtCave.bmp b/pre_edited_cs/data/Stage/PrtCave.bmp
similarity index 100%
rename from pre-edited-cs/data/Stage/PrtCave.bmp
rename to pre_edited_cs/data/Stage/PrtCave.bmp
diff --git a/pre-edited-cs/data/Stage/PrtCent.bmp b/pre_edited_cs/data/Stage/PrtCent.bmp
similarity index 100%
rename from pre-edited-cs/data/Stage/PrtCent.bmp
rename to pre_edited_cs/data/Stage/PrtCent.bmp
diff --git a/pre-edited-cs/data/Stage/PrtEggIn.bmp b/pre_edited_cs/data/Stage/PrtEggIn.bmp
similarity index 100%
rename from pre-edited-cs/data/Stage/PrtEggIn.bmp
rename to pre_edited_cs/data/Stage/PrtEggIn.bmp
diff --git a/pre-edited-cs/data/Stage/PrtEggX.bmp b/pre_edited_cs/data/Stage/PrtEggX.bmp
similarity index 100%
rename from pre-edited-cs/data/Stage/PrtEggX.bmp
rename to pre_edited_cs/data/Stage/PrtEggX.bmp
diff --git a/pre-edited-cs/data/Stage/PrtEggs.bmp b/pre_edited_cs/data/Stage/PrtEggs.bmp
similarity index 100%
rename from pre-edited-cs/data/Stage/PrtEggs.bmp
rename to pre_edited_cs/data/Stage/PrtEggs.bmp
diff --git a/pre-edited-cs/data/Stage/PrtFall.bmp b/pre_edited_cs/data/Stage/PrtFall.bmp
similarity index 100%
rename from pre-edited-cs/data/Stage/PrtFall.bmp
rename to pre_edited_cs/data/Stage/PrtFall.bmp
diff --git a/pre-edited-cs/data/Stage/PrtGard.bmp b/pre_edited_cs/data/Stage/PrtGard.bmp
similarity index 100%
rename from pre-edited-cs/data/Stage/PrtGard.bmp
rename to pre_edited_cs/data/Stage/PrtGard.bmp
diff --git a/pre-edited-cs/data/Stage/PrtHell.bmp b/pre_edited_cs/data/Stage/PrtHell.bmp
similarity index 100%
rename from pre-edited-cs/data/Stage/PrtHell.bmp
rename to pre_edited_cs/data/Stage/PrtHell.bmp
diff --git a/pre-edited-cs/data/Stage/PrtJail.bmp b/pre_edited_cs/data/Stage/PrtJail.bmp
similarity index 100%
rename from pre-edited-cs/data/Stage/PrtJail.bmp
rename to pre_edited_cs/data/Stage/PrtJail.bmp
diff --git a/pre-edited-cs/data/Stage/PrtLabo.bmp b/pre_edited_cs/data/Stage/PrtLabo.bmp
similarity index 100%
rename from pre-edited-cs/data/Stage/PrtLabo.bmp
rename to pre_edited_cs/data/Stage/PrtLabo.bmp
diff --git a/pre-edited-cs/data/Stage/PrtMaze.bmp b/pre_edited_cs/data/Stage/PrtMaze.bmp
similarity index 100%
rename from pre-edited-cs/data/Stage/PrtMaze.bmp
rename to pre_edited_cs/data/Stage/PrtMaze.bmp
diff --git a/pre-edited-cs/data/Stage/PrtMimi.bmp b/pre_edited_cs/data/Stage/PrtMimi.bmp
similarity index 100%
rename from pre-edited-cs/data/Stage/PrtMimi.bmp
rename to pre_edited_cs/data/Stage/PrtMimi.bmp
diff --git a/pre-edited-cs/data/Stage/PrtOside.bmp b/pre_edited_cs/data/Stage/PrtOside.bmp
similarity index 100%
rename from pre-edited-cs/data/Stage/PrtOside.bmp
rename to pre_edited_cs/data/Stage/PrtOside.bmp
diff --git a/pre-edited-cs/data/Stage/PrtPens.bmp b/pre_edited_cs/data/Stage/PrtPens.bmp
similarity index 100%
rename from pre-edited-cs/data/Stage/PrtPens.bmp
rename to pre_edited_cs/data/Stage/PrtPens.bmp
diff --git a/pre-edited-cs/data/Stage/PrtRiver.bmp b/pre_edited_cs/data/Stage/PrtRiver.bmp
similarity index 100%
rename from pre-edited-cs/data/Stage/PrtRiver.bmp
rename to pre_edited_cs/data/Stage/PrtRiver.bmp
diff --git a/pre-edited-cs/data/Stage/PrtSand.bmp b/pre_edited_cs/data/Stage/PrtSand.bmp
similarity index 100%
rename from pre-edited-cs/data/Stage/PrtSand.bmp
rename to pre_edited_cs/data/Stage/PrtSand.bmp
diff --git a/pre-edited-cs/data/Stage/PrtStore.bmp b/pre_edited_cs/data/Stage/PrtStore.bmp
similarity index 100%
rename from pre-edited-cs/data/Stage/PrtStore.bmp
rename to pre_edited_cs/data/Stage/PrtStore.bmp
diff --git a/pre-edited-cs/data/Stage/PrtWeed.bmp b/pre_edited_cs/data/Stage/PrtWeed.bmp
similarity index 100%
rename from pre-edited-cs/data/Stage/PrtWeed.bmp
rename to pre_edited_cs/data/Stage/PrtWeed.bmp
diff --git a/pre-edited-cs/data/Stage/PrtWhite.bmp b/pre_edited_cs/data/Stage/PrtWhite.bmp
similarity index 100%
rename from pre-edited-cs/data/Stage/PrtWhite.bmp
rename to pre_edited_cs/data/Stage/PrtWhite.bmp
diff --git a/pre-edited-cs/data/Stage/Ring1.pxe b/pre_edited_cs/data/Stage/Ring1.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/Ring1.pxe
rename to pre_edited_cs/data/Stage/Ring1.pxe
diff --git a/pre-edited-cs/data/Stage/Ring1.pxm b/pre_edited_cs/data/Stage/Ring1.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/Ring1.pxm
rename to pre_edited_cs/data/Stage/Ring1.pxm
diff --git a/pre-edited-cs/data/Stage/Ring1.tsc b/pre_edited_cs/data/Stage/Ring1.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/Ring1.tsc
rename to pre_edited_cs/data/Stage/Ring1.tsc
diff --git a/pre-edited-cs/data/Stage/Ring2.pxe b/pre_edited_cs/data/Stage/Ring2.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/Ring2.pxe
rename to pre_edited_cs/data/Stage/Ring2.pxe
diff --git a/pre-edited-cs/data/Stage/Ring2.pxm b/pre_edited_cs/data/Stage/Ring2.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/Ring2.pxm
rename to pre_edited_cs/data/Stage/Ring2.pxm
diff --git a/pre-edited-cs/data/Stage/Ring2.tsc b/pre_edited_cs/data/Stage/Ring2.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/Ring2.tsc
rename to pre_edited_cs/data/Stage/Ring2.tsc
diff --git a/pre-edited-cs/data/Stage/Ring3.pxe b/pre_edited_cs/data/Stage/Ring3.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/Ring3.pxe
rename to pre_edited_cs/data/Stage/Ring3.pxe
diff --git a/pre-edited-cs/data/Stage/Ring3.pxm b/pre_edited_cs/data/Stage/Ring3.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/Ring3.pxm
rename to pre_edited_cs/data/Stage/Ring3.pxm
diff --git a/pre-edited-cs/data/Stage/Ring3.tsc b/pre_edited_cs/data/Stage/Ring3.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/Ring3.tsc
rename to pre_edited_cs/data/Stage/Ring3.tsc
diff --git a/pre-edited-cs/data/Stage/River.pxa b/pre_edited_cs/data/Stage/River.pxa
similarity index 100%
rename from pre-edited-cs/data/Stage/River.pxa
rename to pre_edited_cs/data/Stage/River.pxa
diff --git a/pre-edited-cs/data/Stage/River.pxe b/pre_edited_cs/data/Stage/River.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/River.pxe
rename to pre_edited_cs/data/Stage/River.pxe
diff --git a/pre-edited-cs/data/Stage/River.pxm b/pre_edited_cs/data/Stage/River.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/River.pxm
rename to pre_edited_cs/data/Stage/River.pxm
diff --git a/pre-edited-cs/data/Stage/River.tsc b/pre_edited_cs/data/Stage/River.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/River.tsc
rename to pre_edited_cs/data/Stage/River.tsc
diff --git a/pre-edited-cs/data/Stage/Sand.pxa b/pre_edited_cs/data/Stage/Sand.pxa
similarity index 100%
rename from pre-edited-cs/data/Stage/Sand.pxa
rename to pre_edited_cs/data/Stage/Sand.pxa
diff --git a/pre-edited-cs/data/Stage/Sand.pxe b/pre_edited_cs/data/Stage/Sand.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/Sand.pxe
rename to pre_edited_cs/data/Stage/Sand.pxe
diff --git a/pre-edited-cs/data/Stage/Sand.pxm b/pre_edited_cs/data/Stage/Sand.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/Sand.pxm
rename to pre_edited_cs/data/Stage/Sand.pxm
diff --git a/pre-edited-cs/data/Stage/Sand.tsc b/pre_edited_cs/data/Stage/Sand.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/Sand.tsc
rename to pre_edited_cs/data/Stage/Sand.tsc
diff --git a/pre-edited-cs/data/Stage/SandE.pxe b/pre_edited_cs/data/Stage/SandE.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/SandE.pxe
rename to pre_edited_cs/data/Stage/SandE.pxe
diff --git a/pre-edited-cs/data/Stage/SandE.pxm b/pre_edited_cs/data/Stage/SandE.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/SandE.pxm
rename to pre_edited_cs/data/Stage/SandE.pxm
diff --git a/pre-edited-cs/data/Stage/SandE.tsc b/pre_edited_cs/data/Stage/SandE.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/SandE.tsc
rename to pre_edited_cs/data/Stage/SandE.tsc
diff --git a/pre-edited-cs/data/Stage/Santa.pxe b/pre_edited_cs/data/Stage/Santa.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/Santa.pxe
rename to pre_edited_cs/data/Stage/Santa.pxe
diff --git a/pre-edited-cs/data/Stage/Santa.pxm b/pre_edited_cs/data/Stage/Santa.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/Santa.pxm
rename to pre_edited_cs/data/Stage/Santa.pxm
diff --git a/pre-edited-cs/data/Stage/Santa.tsc b/pre_edited_cs/data/Stage/Santa.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/Santa.tsc
rename to pre_edited_cs/data/Stage/Santa.tsc
diff --git a/pre-edited-cs/data/Stage/ScriptSource/0.txt b/pre_edited_cs/data/Stage/ScriptSource/0.txt
similarity index 100%
rename from pre-edited-cs/data/Stage/ScriptSource/0.txt
rename to pre_edited_cs/data/Stage/ScriptSource/0.txt
diff --git a/pre-edited-cs/data/Stage/ScriptSource/Almond.txt b/pre_edited_cs/data/Stage/ScriptSource/Almond.txt
similarity index 100%
rename from pre-edited-cs/data/Stage/ScriptSource/Almond.txt
rename to pre_edited_cs/data/Stage/ScriptSource/Almond.txt
diff --git a/pre-edited-cs/data/Stage/ScriptSource/Ballo1.txt b/pre_edited_cs/data/Stage/ScriptSource/Ballo1.txt
similarity index 100%
rename from pre-edited-cs/data/Stage/ScriptSource/Ballo1.txt
rename to pre_edited_cs/data/Stage/ScriptSource/Ballo1.txt
diff --git a/pre-edited-cs/data/Stage/ScriptSource/Ballo2.txt b/pre_edited_cs/data/Stage/ScriptSource/Ballo2.txt
similarity index 100%
rename from pre-edited-cs/data/Stage/ScriptSource/Ballo2.txt
rename to pre_edited_cs/data/Stage/ScriptSource/Ballo2.txt
diff --git a/pre-edited-cs/data/Stage/ScriptSource/Barr.txt b/pre_edited_cs/data/Stage/ScriptSource/Barr.txt
similarity index 100%
rename from pre-edited-cs/data/Stage/ScriptSource/Barr.txt
rename to pre_edited_cs/data/Stage/ScriptSource/Barr.txt
diff --git a/pre-edited-cs/data/Stage/ScriptSource/Blcny1.txt b/pre_edited_cs/data/Stage/ScriptSource/Blcny1.txt
similarity index 100%
rename from pre-edited-cs/data/Stage/ScriptSource/Blcny1.txt
rename to pre_edited_cs/data/Stage/ScriptSource/Blcny1.txt
diff --git a/pre-edited-cs/data/Stage/ScriptSource/Blcny2.txt b/pre_edited_cs/data/Stage/ScriptSource/Blcny2.txt
similarity index 100%
rename from pre-edited-cs/data/Stage/ScriptSource/Blcny2.txt
rename to pre_edited_cs/data/Stage/ScriptSource/Blcny2.txt
diff --git a/pre-edited-cs/data/Stage/ScriptSource/Cave.txt b/pre_edited_cs/data/Stage/ScriptSource/Cave.txt
similarity index 100%
rename from pre-edited-cs/data/Stage/ScriptSource/Cave.txt
rename to pre_edited_cs/data/Stage/ScriptSource/Cave.txt
diff --git a/pre-edited-cs/data/Stage/ScriptSource/Cemet.txt b/pre_edited_cs/data/Stage/ScriptSource/Cemet.txt
similarity index 77%
rename from pre-edited-cs/data/Stage/ScriptSource/Cemet.txt
rename to pre_edited_cs/data/Stage/ScriptSource/Cemet.txt
index 4fecf6a..c85ebf1 100644
--- a/pre-edited-cs/data/Stage/ScriptSource/Cemet.txt
+++ b/pre_edited_cs/data/Stage/ScriptSource/Cemet.txt
@@ -30,8 +30,8 @@
 <EVE0051
 
 #0302
-<PRI<MSGArthur's grave.<NOD
+<PRI<MSGKenzo's grave.<NOD
 There's writing on the
-tombstone:<NOD<CLR<MSG<TURHere sleeps the noble Arthur,
-true hero to the Mimigas.<NOD<CLR<END
+tombstone:<NOD<CLR<MSG<TURHere sleeps the noble Kenzo,
+true hero to the CSMC.<NOD<CLR<END
 
diff --git a/pre-edited-cs/data/Stage/ScriptSource/Cent.txt b/pre_edited_cs/data/Stage/ScriptSource/Cent.txt
similarity index 97%
rename from pre-edited-cs/data/Stage/ScriptSource/Cent.txt
rename to pre_edited_cs/data/Stage/ScriptSource/Cent.txt
index 18ca66f..780ff65 100644
--- a/pre-edited-cs/data/Stage/ScriptSource/Cent.txt
+++ b/pre_edited_cs/data/Stage/ScriptSource/Cent.txt
@@ -28,7 +28,7 @@
 #0135
 <PRI
 <FLJ1023:0137
-<ITJ0025:0136
+<FLJ7123:0136
 <MSG<TURIt says "No Entry".<NOD
 And it's locked.<NOD<END
 #0136
@@ -100,6 +100,7 @@ days in no time.<NOD<CLR...I mean, we will, won't we?<NOD<END
 #0250
 <PRI
 <ITJ0029:0254
+<ITJ0043:0254
 <FLJ1029:0253
 <FLJ1020:0252
 <PRI<MSG<TURMan, these sprinklers just...<NOD<CLRWhoops.
@@ -184,22 +185,24 @@ old way.<NOD<END
 <FLJ1046:0325
 <FLJ1045:0324
 <FLJ1020:0321
-<FL+1041<MSG<FAC0025Who... are you...?<NOD<ITJ0034:0322<END
+<FL+1041<MSG<FAC0025Who... are you...?<NOD<ITJ0044:0322<ITJ0034:0322<END
 #0321
 <PRI<MSG<FAC0025Oh...<NOD
 You're so cute...<NOD<CLRDon't go too far.<NOD
 And watch out for the
-bad robots...<NOD<ITJ0034:0322<END
+bad robots...<NOD<ITJ0044:0322<ITJ0034:0322<END
 #0322
 <PRI<FAC0000<MSG<TUR<GIT1034<IT-0034<CMU0000<CLR<FL+1046
 Jammed it into Curly's mouth.<NOD<CLR<CLO<WAI0050<EQ-0064<WAI0050
-<FL+1045<RMU<FLJ1020:0323<EVE0324
+<FL+1045<RMU<ITJ0044:0326<FLJ1020:0323<EVE0324
 #0323
 <PRI<EQ+0064<EVE0324
 #0324
 <EVE0089
 #0325
 <PRI<MSG<FAC0019I'm fine now.<NOD<END
+#0326
+<IT-0044<IT+0033<FLJ1020:0323<EVE0324
 #0350
 <PRI<MSG<TURDo you want to flip the
 switch?<YNJ0000<CLO
diff --git a/pre-edited-cs/data/Stage/ScriptSource/CentW.txt b/pre_edited_cs/data/Stage/ScriptSource/CentW.txt
similarity index 98%
rename from pre-edited-cs/data/Stage/ScriptSource/CentW.txt
rename to pre_edited_cs/data/Stage/ScriptSource/CentW.txt
index 5df90f0..4248659 100644
--- a/pre-edited-cs/data/Stage/ScriptSource/CentW.txt
+++ b/pre_edited_cs/data/Stage/ScriptSource/CentW.txt
@@ -23,7 +23,7 @@
 #0100
 <PRI<SAT
 <FLJ1023:0102
-<ITJ0025:0101
+<FLJ7123:0101
 <MSGIt's locked.<NOD<END
 #0101
 <SOU0022<MSG<TUR<GIT1025Used the =Teleporter Room Key=.<NOD<CLO<IT-0025
diff --git a/pre-edited-cs/data/Stage/ScriptSource/Chako.txt b/pre_edited_cs/data/Stage/ScriptSource/Chako.txt
similarity index 100%
rename from pre-edited-cs/data/Stage/ScriptSource/Chako.txt
rename to pre_edited_cs/data/Stage/ScriptSource/Chako.txt
diff --git a/pre-edited-cs/data/Stage/ScriptSource/Clock.txt b/pre_edited_cs/data/Stage/ScriptSource/Clock.txt
similarity index 100%
rename from pre-edited-cs/data/Stage/ScriptSource/Clock.txt
rename to pre_edited_cs/data/Stage/ScriptSource/Clock.txt
diff --git a/pre-edited-cs/data/Stage/ScriptSource/Comu.txt b/pre_edited_cs/data/Stage/ScriptSource/Comu.txt
similarity index 100%
rename from pre-edited-cs/data/Stage/ScriptSource/Comu.txt
rename to pre_edited_cs/data/Stage/ScriptSource/Comu.txt
diff --git a/pre-edited-cs/data/Stage/ScriptSource/Cthu.txt b/pre_edited_cs/data/Stage/ScriptSource/Cthu.txt
similarity index 100%
rename from pre-edited-cs/data/Stage/ScriptSource/Cthu.txt
rename to pre_edited_cs/data/Stage/ScriptSource/Cthu.txt
diff --git a/pre-edited-cs/data/Stage/ScriptSource/Curly.txt b/pre_edited_cs/data/Stage/ScriptSource/Curly.txt
similarity index 100%
rename from pre-edited-cs/data/Stage/ScriptSource/Curly.txt
rename to pre_edited_cs/data/Stage/ScriptSource/Curly.txt
diff --git a/pre-edited-cs/data/Stage/ScriptSource/CurlyS.txt b/pre_edited_cs/data/Stage/ScriptSource/CurlyS.txt
similarity index 76%
rename from pre-edited-cs/data/Stage/ScriptSource/CurlyS.txt
rename to pre_edited_cs/data/Stage/ScriptSource/CurlyS.txt
index e536a2b..a93e048 100644
--- a/pre-edited-cs/data/Stage/ScriptSource/CurlyS.txt
+++ b/pre_edited_cs/data/Stage/ScriptSource/CurlyS.txt
@@ -30,18 +30,11 @@ Spawn Softlock Debug Cat if only weapon to break blocks is Bubbler
 <EVE0085
 
 #0500
-<MSG<TURLooks like you're in a pinch. With
+<KEY<MSG<TURLooks like you're in a pinch. With
 your weapons, you might be stuck.<NOD
 Go back to the start?<WAI0040<YNJ0000<CLO
 <LI+1000<SOU0020<AE+
-<FLJ6201:0501
-<FLJ6202:0502
-<TRA0013:0091:0010:0008
-Start Point (Default)
+<EVE0501
 #0501
-<TRA0001:0094:0008:0004
-Arthur's House
-#0502
-<TRA0040:0094:0014:0009
-Camp
+<EVE0000
 
diff --git a/pre-edited-cs/data/Stage/ScriptSource/Dark.txt b/pre_edited_cs/data/Stage/ScriptSource/Dark.txt
similarity index 100%
rename from pre-edited-cs/data/Stage/ScriptSource/Dark.txt
rename to pre_edited_cs/data/Stage/ScriptSource/Dark.txt
diff --git a/pre-edited-cs/data/Stage/ScriptSource/Drain.txt b/pre_edited_cs/data/Stage/ScriptSource/Drain.txt
similarity index 100%
rename from pre-edited-cs/data/Stage/ScriptSource/Drain.txt
rename to pre_edited_cs/data/Stage/ScriptSource/Drain.txt
diff --git a/pre-edited-cs/data/Stage/ScriptSource/EgEnd2.txt b/pre_edited_cs/data/Stage/ScriptSource/EgEnd2.txt
similarity index 100%
rename from pre-edited-cs/data/Stage/ScriptSource/EgEnd2.txt
rename to pre_edited_cs/data/Stage/ScriptSource/EgEnd2.txt
diff --git a/pre-edited-cs/data/Stage/ScriptSource/Egg1.txt b/pre_edited_cs/data/Stage/ScriptSource/Egg1.txt
similarity index 100%
rename from pre-edited-cs/data/Stage/ScriptSource/Egg1.txt
rename to pre_edited_cs/data/Stage/ScriptSource/Egg1.txt
diff --git a/pre-edited-cs/data/Stage/ScriptSource/Egg6.txt b/pre_edited_cs/data/Stage/ScriptSource/Egg6.txt
similarity index 100%
rename from pre-edited-cs/data/Stage/ScriptSource/Egg6.txt
rename to pre_edited_cs/data/Stage/ScriptSource/Egg6.txt
diff --git a/pre-edited-cs/data/Stage/ScriptSource/EggR.txt b/pre_edited_cs/data/Stage/ScriptSource/EggR.txt
similarity index 100%
rename from pre-edited-cs/data/Stage/ScriptSource/EggR.txt
rename to pre_edited_cs/data/Stage/ScriptSource/EggR.txt
diff --git a/pre-edited-cs/data/Stage/ScriptSource/EggR2.txt b/pre_edited_cs/data/Stage/ScriptSource/EggR2.txt
similarity index 100%
rename from pre-edited-cs/data/Stage/ScriptSource/EggR2.txt
rename to pre_edited_cs/data/Stage/ScriptSource/EggR2.txt
diff --git a/pre-edited-cs/data/Stage/ScriptSource/EggX.txt b/pre_edited_cs/data/Stage/ScriptSource/EggX.txt
similarity index 100%
rename from pre-edited-cs/data/Stage/ScriptSource/EggX.txt
rename to pre_edited_cs/data/Stage/ScriptSource/EggX.txt
diff --git a/pre-edited-cs/data/Stage/ScriptSource/EggX2.txt b/pre_edited_cs/data/Stage/ScriptSource/EggX2.txt
similarity index 100%
rename from pre-edited-cs/data/Stage/ScriptSource/EggX2.txt
rename to pre_edited_cs/data/Stage/ScriptSource/EggX2.txt
diff --git a/pre-edited-cs/data/Stage/ScriptSource/Eggs.txt b/pre_edited_cs/data/Stage/ScriptSource/Eggs.txt
similarity index 100%
rename from pre-edited-cs/data/Stage/ScriptSource/Eggs.txt
rename to pre_edited_cs/data/Stage/ScriptSource/Eggs.txt
diff --git a/pre-edited-cs/data/Stage/ScriptSource/Eggs2.txt b/pre_edited_cs/data/Stage/ScriptSource/Eggs2.txt
similarity index 100%
rename from pre-edited-cs/data/Stage/ScriptSource/Eggs2.txt
rename to pre_edited_cs/data/Stage/ScriptSource/Eggs2.txt
diff --git a/pre-edited-cs/data/Stage/ScriptSource/Fall.txt b/pre_edited_cs/data/Stage/ScriptSource/Fall.txt
similarity index 100%
rename from pre-edited-cs/data/Stage/ScriptSource/Fall.txt
rename to pre_edited_cs/data/Stage/ScriptSource/Fall.txt
diff --git a/pre-edited-cs/data/Stage/ScriptSource/Frog.txt b/pre_edited_cs/data/Stage/ScriptSource/Frog.txt
similarity index 100%
rename from pre-edited-cs/data/Stage/ScriptSource/Frog.txt
rename to pre_edited_cs/data/Stage/ScriptSource/Frog.txt
diff --git a/pre-edited-cs/data/Stage/ScriptSource/Gard.txt b/pre_edited_cs/data/Stage/ScriptSource/Gard.txt
similarity index 100%
rename from pre-edited-cs/data/Stage/ScriptSource/Gard.txt
rename to pre_edited_cs/data/Stage/ScriptSource/Gard.txt
diff --git a/pre-edited-cs/data/Stage/ScriptSource/Hell1.txt b/pre_edited_cs/data/Stage/ScriptSource/Hell1.txt
similarity index 100%
rename from pre-edited-cs/data/Stage/ScriptSource/Hell1.txt
rename to pre_edited_cs/data/Stage/ScriptSource/Hell1.txt
diff --git a/pre-edited-cs/data/Stage/ScriptSource/Hell2.txt b/pre_edited_cs/data/Stage/ScriptSource/Hell2.txt
similarity index 100%
rename from pre-edited-cs/data/Stage/ScriptSource/Hell2.txt
rename to pre_edited_cs/data/Stage/ScriptSource/Hell2.txt
diff --git a/pre-edited-cs/data/Stage/ScriptSource/Hell3.txt b/pre_edited_cs/data/Stage/ScriptSource/Hell3.txt
similarity index 100%
rename from pre-edited-cs/data/Stage/ScriptSource/Hell3.txt
rename to pre_edited_cs/data/Stage/ScriptSource/Hell3.txt
diff --git a/pre-edited-cs/data/Stage/ScriptSource/Hell4.txt b/pre_edited_cs/data/Stage/ScriptSource/Hell4.txt
similarity index 100%
rename from pre-edited-cs/data/Stage/ScriptSource/Hell4.txt
rename to pre_edited_cs/data/Stage/ScriptSource/Hell4.txt
diff --git a/pre-edited-cs/data/Stage/ScriptSource/Hell42.txt b/pre_edited_cs/data/Stage/ScriptSource/Hell42.txt
similarity index 100%
rename from pre-edited-cs/data/Stage/ScriptSource/Hell42.txt
rename to pre_edited_cs/data/Stage/ScriptSource/Hell42.txt
diff --git a/pre-edited-cs/data/Stage/ScriptSource/Island.txt b/pre_edited_cs/data/Stage/ScriptSource/Island.txt
similarity index 100%
rename from pre-edited-cs/data/Stage/ScriptSource/Island.txt
rename to pre_edited_cs/data/Stage/ScriptSource/Island.txt
diff --git a/pre-edited-cs/data/Stage/ScriptSource/Itoh.txt b/pre_edited_cs/data/Stage/ScriptSource/Itoh.txt
similarity index 100%
rename from pre-edited-cs/data/Stage/ScriptSource/Itoh.txt
rename to pre_edited_cs/data/Stage/ScriptSource/Itoh.txt
diff --git a/pre-edited-cs/data/Stage/ScriptSource/Jail1.txt b/pre_edited_cs/data/Stage/ScriptSource/Jail1.txt
similarity index 100%
rename from pre-edited-cs/data/Stage/ScriptSource/Jail1.txt
rename to pre_edited_cs/data/Stage/ScriptSource/Jail1.txt
diff --git a/pre-edited-cs/data/Stage/ScriptSource/Jail2.txt b/pre_edited_cs/data/Stage/ScriptSource/Jail2.txt
similarity index 100%
rename from pre-edited-cs/data/Stage/ScriptSource/Jail2.txt
rename to pre_edited_cs/data/Stage/ScriptSource/Jail2.txt
diff --git a/pre-edited-cs/data/Stage/ScriptSource/Jenka1.txt b/pre_edited_cs/data/Stage/ScriptSource/Jenka1.txt
similarity index 94%
rename from pre-edited-cs/data/Stage/ScriptSource/Jenka1.txt
rename to pre_edited_cs/data/Stage/ScriptSource/Jenka1.txt
index 05af921..adad97b 100644
--- a/pre-edited-cs/data/Stage/ScriptSource/Jenka1.txt
+++ b/pre_edited_cs/data/Stage/ScriptSource/Jenka1.txt
@@ -31,6 +31,9 @@ five <GIT1014=Puppies=,<NOD<CLR<EVE0201
 #0201
 <EVE0000
 
+#0202
+<EVE0000
+
 
 
 #0210
@@ -151,17 +154,10 @@ left.<NOD<FL+0593<END
 #0401
 
 #0500
-<MSG<TURLooks like you're in a pinch. With
+<KEY<MSG<TURLooks like you're in a pinch. With
 your weapons, you might be stuck.<NOD
 Go back to the start?<WAI0040<YNJ0000<CLO
 <LI+1000<SOU0020<AE+
-<FLJ6201:0501
-<FLJ6202:0502
-<TRA0013:0091:0010:0008
-Start Point (Default)
+<EVE0501
 #0501
-<TRA0001:0094:0008:0004
-Arthur's House
-#0502
-<TRA0040:0094:0014:0009
-Camp
+<EVE0000
diff --git a/pre-edited-cs/data/Stage/ScriptSource/Jenka2.txt b/pre_edited_cs/data/Stage/ScriptSource/Jenka2.txt
similarity index 89%
rename from pre-edited-cs/data/Stage/ScriptSource/Jenka2.txt
rename to pre_edited_cs/data/Stage/ScriptSource/Jenka2.txt
index fb6e1ac..174a4eb 100644
--- a/pre-edited-cs/data/Stage/ScriptSource/Jenka2.txt
+++ b/pre_edited_cs/data/Stage/ScriptSource/Jenka2.txt
@@ -77,17 +77,10 @@ place my faith in you...<NOD<END
 #0401
 
 #0500
-<MSG<TURLooks like you're in a pinch. With
+<KEY<MSG<TURLooks like you're in a pinch. With
 your weapons, you might be stuck.<NOD
 Go back to the start?<WAI0040<YNJ0000<CLO
 <LI+1000<SOU0020<AE+
-<FLJ6201:0501
-<FLJ6202:0502
-<TRA0013:0091:0010:0008
-Start Point (Default)
+<EVE0501
 #0501
-<TRA0001:0094:0008:0004
-Arthur's House
-#0502
-<TRA0040:0094:0014:0009
-Camp
+<EVE0000
diff --git a/pre-edited-cs/data/Stage/ScriptSource/Little.txt b/pre_edited_cs/data/Stage/ScriptSource/Little.txt
similarity index 100%
rename from pre-edited-cs/data/Stage/ScriptSource/Little.txt
rename to pre_edited_cs/data/Stage/ScriptSource/Little.txt
diff --git a/pre-edited-cs/data/Stage/ScriptSource/Malco.txt b/pre_edited_cs/data/Stage/ScriptSource/Malco.txt
similarity index 100%
rename from pre-edited-cs/data/Stage/ScriptSource/Malco.txt
rename to pre_edited_cs/data/Stage/ScriptSource/Malco.txt
diff --git a/pre-edited-cs/data/Stage/ScriptSource/Mapi.txt b/pre_edited_cs/data/Stage/ScriptSource/Mapi.txt
similarity index 99%
rename from pre-edited-cs/data/Stage/ScriptSource/Mapi.txt
rename to pre_edited_cs/data/Stage/ScriptSource/Mapi.txt
index 07b5324..9b9ea39 100644
--- a/pre-edited-cs/data/Stage/ScriptSource/Mapi.txt
+++ b/pre_edited_cs/data/Stage/ScriptSource/Mapi.txt
@@ -34,6 +34,7 @@ with amnesia.<NOD<CLRWho needs it, right?<NOD<CLO<END
 #0400
 <KEY<MYB0002<WAI0020
 <ITJ0033:0420
+<ITJ0044:0420
 <FLJ1562:0411
 <FLJ1561:0403<MSGYou got some business with me?<YNJ0401<CLRHah!<NOD
 I doubt that.<NOD<END
diff --git a/pre-edited-cs/data/Stage/ScriptSource/MazeA.txt b/pre_edited_cs/data/Stage/ScriptSource/MazeA.txt
similarity index 100%
rename from pre-edited-cs/data/Stage/ScriptSource/MazeA.txt
rename to pre_edited_cs/data/Stage/ScriptSource/MazeA.txt
diff --git a/pre-edited-cs/data/Stage/ScriptSource/MazeB.txt b/pre_edited_cs/data/Stage/ScriptSource/MazeB.txt
similarity index 100%
rename from pre-edited-cs/data/Stage/ScriptSource/MazeB.txt
rename to pre_edited_cs/data/Stage/ScriptSource/MazeB.txt
diff --git a/pre-edited-cs/data/Stage/ScriptSource/MazeD.txt b/pre_edited_cs/data/Stage/ScriptSource/MazeD.txt
similarity index 100%
rename from pre-edited-cs/data/Stage/ScriptSource/MazeD.txt
rename to pre_edited_cs/data/Stage/ScriptSource/MazeD.txt
diff --git a/pre-edited-cs/data/Stage/ScriptSource/MazeI.txt b/pre_edited_cs/data/Stage/ScriptSource/MazeI.txt
similarity index 100%
rename from pre-edited-cs/data/Stage/ScriptSource/MazeI.txt
rename to pre_edited_cs/data/Stage/ScriptSource/MazeI.txt
diff --git a/pre-edited-cs/data/Stage/ScriptSource/MazeM.txt b/pre_edited_cs/data/Stage/ScriptSource/MazeM.txt
similarity index 100%
rename from pre-edited-cs/data/Stage/ScriptSource/MazeM.txt
rename to pre_edited_cs/data/Stage/ScriptSource/MazeM.txt
diff --git a/pre-edited-cs/data/Stage/ScriptSource/MazeO.txt b/pre_edited_cs/data/Stage/ScriptSource/MazeO.txt
similarity index 100%
rename from pre-edited-cs/data/Stage/ScriptSource/MazeO.txt
rename to pre_edited_cs/data/Stage/ScriptSource/MazeO.txt
diff --git a/pre-edited-cs/data/Stage/ScriptSource/MazeS.txt b/pre_edited_cs/data/Stage/ScriptSource/MazeS.txt
similarity index 100%
rename from pre-edited-cs/data/Stage/ScriptSource/MazeS.txt
rename to pre_edited_cs/data/Stage/ScriptSource/MazeS.txt
diff --git a/pre-edited-cs/data/Stage/ScriptSource/MazeW.txt b/pre_edited_cs/data/Stage/ScriptSource/MazeW.txt
similarity index 98%
rename from pre-edited-cs/data/Stage/ScriptSource/MazeW.txt
rename to pre_edited_cs/data/Stage/ScriptSource/MazeW.txt
index d36c54e..a227ee8 100644
--- a/pre-edited-cs/data/Stage/ScriptSource/MazeW.txt
+++ b/pre_edited_cs/data/Stage/ScriptSource/MazeW.txt
@@ -20,7 +20,7 @@
 
 #0103
 <FLJ0681:0105
-<ITJ0017:0104
+<FLJ7115:0104
 <PRI<MSGLocked.<NOD<END
 #0104
 <PRI<SOU0022<GIT1017<FL+0681<IT-0017
diff --git a/pre-edited-cs/data/Stage/ScriptSource/Mimi.txt b/pre_edited_cs/data/Stage/ScriptSource/Mimi.txt
similarity index 99%
rename from pre-edited-cs/data/Stage/ScriptSource/Mimi.txt
rename to pre_edited_cs/data/Stage/ScriptSource/Mimi.txt
index c3ee794..c2fbb30 100644
--- a/pre-edited-cs/data/Stage/ScriptSource/Mimi.txt
+++ b/pre_edited_cs/data/Stage/ScriptSource/Mimi.txt
@@ -24,7 +24,7 @@
 
 #0100
 <PRI<FLJ0324:0102
-<ITJ0001:0101
+<FLJ7100:0101
 <MSGLocked.<NOD<END
 #0101
 <SOU0022<GIT1001<FL+0324<FL+0441
diff --git a/pre-edited-cs/data/Stage/ScriptSource/Momo.txt b/pre_edited_cs/data/Stage/ScriptSource/Momo.txt
similarity index 91%
rename from pre-edited-cs/data/Stage/ScriptSource/Momo.txt
rename to pre_edited_cs/data/Stage/ScriptSource/Momo.txt
index 7dc2a15..81dc0f3 100644
--- a/pre-edited-cs/data/Stage/ScriptSource/Momo.txt
+++ b/pre_edited_cs/data/Stage/ScriptSource/Momo.txt
@@ -63,11 +63,12 @@ you a rocket.<NOD<END
 #0208
 <ITJ0027:0209<EVE0205
 #0209
-<ITJ0029:0210<EVE0205
+<ITJ0029:0210<ITJ0043:0210<EVE0205
 
 #0210
-<KEY<FL+1107<CNP0250:0072:0002<IT-0029<IT-0027<FL+1103<SAT<EVE0212
-
+<KEY<FL+1107<CNP0250:0072:0002<IT-0029<IT-0027<FL+1103<ITJ0043:0211<SAT<EVE0212
+#0211
+<IT-0043<IT+0028<EVE0212
 #0212
 <KEY<MSG<TUR<FAC0022Why don't you rest
 over on that bed?<NOD<END
diff --git a/pre-edited-cs/data/Stage/ScriptSource/Oside.txt b/pre_edited_cs/data/Stage/ScriptSource/Oside.txt
similarity index 100%
rename from pre-edited-cs/data/Stage/ScriptSource/Oside.txt
rename to pre_edited_cs/data/Stage/ScriptSource/Oside.txt
diff --git a/pre-edited-cs/data/Stage/ScriptSource/Ostep.txt b/pre_edited_cs/data/Stage/ScriptSource/Ostep.txt
similarity index 100%
rename from pre-edited-cs/data/Stage/ScriptSource/Ostep.txt
rename to pre_edited_cs/data/Stage/ScriptSource/Ostep.txt
diff --git a/pre-edited-cs/data/Stage/ScriptSource/Pens1.txt b/pre_edited_cs/data/Stage/ScriptSource/Pens1.txt
similarity index 99%
rename from pre-edited-cs/data/Stage/ScriptSource/Pens1.txt
rename to pre_edited_cs/data/Stage/ScriptSource/Pens1.txt
index 99c450b..1f7d92e 100644
--- a/pre-edited-cs/data/Stage/ScriptSource/Pens1.txt
+++ b/pre_edited_cs/data/Stage/ScriptSource/Pens1.txt
@@ -29,7 +29,7 @@
 <PRI<FAO0004<TRA0012:0094:0037:0011
 #0102
 <PRI<FLJ0324:0104
-<ITJ0001:0103
+<FLJ7100:0103
 <MSGLocked.<NOD<END
 #0103
 <SOU0022<GIT1001<FL+0324<FL+0441
diff --git a/pre-edited-cs/data/Stage/ScriptSource/Pixel.txt b/pre_edited_cs/data/Stage/ScriptSource/Pixel.txt
similarity index 100%
rename from pre-edited-cs/data/Stage/ScriptSource/Pixel.txt
rename to pre_edited_cs/data/Stage/ScriptSource/Pixel.txt
diff --git a/pre-edited-cs/data/Stage/ScriptSource/Plant.txt b/pre_edited_cs/data/Stage/ScriptSource/Plant.txt
similarity index 100%
rename from pre-edited-cs/data/Stage/ScriptSource/Plant.txt
rename to pre_edited_cs/data/Stage/ScriptSource/Plant.txt
diff --git a/pre-edited-cs/data/Stage/ScriptSource/Pole.txt b/pre_edited_cs/data/Stage/ScriptSource/Pole.txt
similarity index 100%
rename from pre-edited-cs/data/Stage/ScriptSource/Pole.txt
rename to pre_edited_cs/data/Stage/ScriptSource/Pole.txt
diff --git a/pre-edited-cs/data/Stage/ScriptSource/Pool.txt b/pre_edited_cs/data/Stage/ScriptSource/Pool.txt
similarity index 100%
rename from pre-edited-cs/data/Stage/ScriptSource/Pool.txt
rename to pre_edited_cs/data/Stage/ScriptSource/Pool.txt
diff --git a/pre-edited-cs/data/Stage/ScriptSource/Prefa1.txt b/pre_edited_cs/data/Stage/ScriptSource/Prefa1.txt
similarity index 100%
rename from pre-edited-cs/data/Stage/ScriptSource/Prefa1.txt
rename to pre_edited_cs/data/Stage/ScriptSource/Prefa1.txt
diff --git a/pre-edited-cs/data/Stage/ScriptSource/Prefa2.txt b/pre_edited_cs/data/Stage/ScriptSource/Prefa2.txt
similarity index 100%
rename from pre-edited-cs/data/Stage/ScriptSource/Prefa2.txt
rename to pre_edited_cs/data/Stage/ScriptSource/Prefa2.txt
diff --git a/pre-edited-cs/data/Stage/ScriptSource/Priso2.txt b/pre_edited_cs/data/Stage/ScriptSource/Priso2.txt
similarity index 100%
rename from pre-edited-cs/data/Stage/ScriptSource/Priso2.txt
rename to pre_edited_cs/data/Stage/ScriptSource/Priso2.txt
diff --git a/pre-edited-cs/data/Stage/ScriptSource/Ring1.txt b/pre_edited_cs/data/Stage/ScriptSource/Ring1.txt
similarity index 100%
rename from pre-edited-cs/data/Stage/ScriptSource/Ring1.txt
rename to pre_edited_cs/data/Stage/ScriptSource/Ring1.txt
diff --git a/pre-edited-cs/data/Stage/ScriptSource/Ring2.txt b/pre_edited_cs/data/Stage/ScriptSource/Ring2.txt
similarity index 100%
rename from pre-edited-cs/data/Stage/ScriptSource/Ring2.txt
rename to pre_edited_cs/data/Stage/ScriptSource/Ring2.txt
diff --git a/pre-edited-cs/data/Stage/ScriptSource/Ring3.txt b/pre_edited_cs/data/Stage/ScriptSource/Ring3.txt
similarity index 100%
rename from pre-edited-cs/data/Stage/ScriptSource/Ring3.txt
rename to pre_edited_cs/data/Stage/ScriptSource/Ring3.txt
diff --git a/pre-edited-cs/data/Stage/ScriptSource/River.txt b/pre_edited_cs/data/Stage/ScriptSource/River.txt
similarity index 100%
rename from pre-edited-cs/data/Stage/ScriptSource/River.txt
rename to pre_edited_cs/data/Stage/ScriptSource/River.txt
diff --git a/pre-edited-cs/data/Stage/ScriptSource/Sand.txt b/pre_edited_cs/data/Stage/ScriptSource/Sand.txt
similarity index 100%
rename from pre-edited-cs/data/Stage/ScriptSource/Sand.txt
rename to pre_edited_cs/data/Stage/ScriptSource/Sand.txt
diff --git a/pre-edited-cs/data/Stage/ScriptSource/SandE.txt b/pre_edited_cs/data/Stage/ScriptSource/SandE.txt
similarity index 100%
rename from pre-edited-cs/data/Stage/ScriptSource/SandE.txt
rename to pre_edited_cs/data/Stage/ScriptSource/SandE.txt
diff --git a/pre-edited-cs/data/Stage/ScriptSource/Santa.txt b/pre_edited_cs/data/Stage/ScriptSource/Santa.txt
similarity index 100%
rename from pre-edited-cs/data/Stage/ScriptSource/Santa.txt
rename to pre_edited_cs/data/Stage/ScriptSource/Santa.txt
diff --git a/pre-edited-cs/data/Stage/ScriptSource/Shelt.txt b/pre_edited_cs/data/Stage/ScriptSource/Shelt.txt
similarity index 100%
rename from pre-edited-cs/data/Stage/ScriptSource/Shelt.txt
rename to pre_edited_cs/data/Stage/ScriptSource/Shelt.txt
diff --git a/pre-edited-cs/data/Stage/ScriptSource/Start.txt b/pre_edited_cs/data/Stage/ScriptSource/Start.txt
similarity index 100%
rename from pre-edited-cs/data/Stage/ScriptSource/Start.txt
rename to pre_edited_cs/data/Stage/ScriptSource/Start.txt
diff --git a/pre-edited-cs/data/Stage/ScriptSource/Statue.txt b/pre_edited_cs/data/Stage/ScriptSource/Statue.txt
similarity index 100%
rename from pre-edited-cs/data/Stage/ScriptSource/Statue.txt
rename to pre_edited_cs/data/Stage/ScriptSource/Statue.txt
diff --git a/pre-edited-cs/data/Stage/ScriptSource/Stream.txt b/pre_edited_cs/data/Stage/ScriptSource/Stream.txt
similarity index 100%
rename from pre-edited-cs/data/Stage/ScriptSource/Stream.txt
rename to pre_edited_cs/data/Stage/ScriptSource/Stream.txt
diff --git a/pre-edited-cs/data/Stage/ScriptSource/Weed.txt b/pre_edited_cs/data/Stage/ScriptSource/Weed.txt
similarity index 97%
rename from pre-edited-cs/data/Stage/ScriptSource/Weed.txt
rename to pre_edited_cs/data/Stage/ScriptSource/Weed.txt
index 8be18c9..740c7b7 100644
--- a/pre-edited-cs/data/Stage/ScriptSource/Weed.txt
+++ b/pre_edited_cs/data/Stage/ScriptSource/Weed.txt
@@ -44,7 +44,7 @@ house?<FL-0227<YNJ0000<CLO
 #0104
 <PRI
 <FLJ0214:0106
-<ITJ0009:0105
+<FLJ7107:0105
 <MSG<TURIt's locked.<NOD<END
 #0105
 <SOU0022<MSG<TUR<GIT1009Used the =Rusty Key=.<NOD<GIT0000<CLO<FL+0214<EVE0106
@@ -61,7 +61,7 @@ house?<FL-0227<YNJ0000<CLO
 #0109
 <PRI
 <FLJ0222:0111
-<ITJ0010:0110
+<FLJ7108:0110
 <MSG<TURIt seems to be locked.
 The word "Gum" is written on
 the door.<NOD<END
@@ -139,7 +139,7 @@ we'll just have to break the
 door down...<NOD<END
 
 #0236
-<PRI<FLJ0223:0001<ITJ0009:0237
+<PRI<FLJ0223:0001<FLJ7107:0237
 <MSG<TURIt's locked.<NOD
 <GIT1009Looks like a =Rusty Key= would fit.<WAI0025<NOD<END
 #0237
@@ -179,7 +179,7 @@ door down...<NOD<END
 
 #0500
 <PRI
-<ITJ0003:0503
+<FLJ7102:0503
 <FLJ0211:0501
 <FL+0211
 <MSG<TUR...I'm locked out of my own house.<NOD<END
@@ -190,7 +190,7 @@ Now what...<NOD<END
 
 
 #0502
-<ITJ0003:0503<END
+<FLJ7102:0503<END
 #0503
 <KEY<FL+0212<MM0<MYD0000<WAI0030
 <IT-0003<KEY<ANP0500:0003:0000<WAI0176<ANP0500:0000:0002
diff --git a/pre-edited-cs/data/Stage/ScriptSource/WeedB.txt b/pre_edited_cs/data/Stage/ScriptSource/WeedB.txt
similarity index 100%
rename from pre-edited-cs/data/Stage/ScriptSource/WeedB.txt
rename to pre_edited_cs/data/Stage/ScriptSource/WeedB.txt
diff --git a/pre-edited-cs/data/Stage/ScriptSource/WeedD.txt b/pre_edited_cs/data/Stage/ScriptSource/WeedD.txt
similarity index 100%
rename from pre-edited-cs/data/Stage/ScriptSource/WeedD.txt
rename to pre_edited_cs/data/Stage/ScriptSource/WeedD.txt
diff --git a/pre-edited-cs/data/Stage/ScriptSource/e_Blcn.txt b/pre_edited_cs/data/Stage/ScriptSource/e_Blcn.txt
similarity index 100%
rename from pre-edited-cs/data/Stage/ScriptSource/e_Blcn.txt
rename to pre_edited_cs/data/Stage/ScriptSource/e_Blcn.txt
diff --git a/pre-edited-cs/data/Stage/ScriptSource/e_Labo.txt b/pre_edited_cs/data/Stage/ScriptSource/e_Labo.txt
similarity index 100%
rename from pre-edited-cs/data/Stage/ScriptSource/e_Labo.txt
rename to pre_edited_cs/data/Stage/ScriptSource/e_Labo.txt
diff --git a/pre-edited-cs/data/Stage/ScriptSource/e_Maze.txt b/pre_edited_cs/data/Stage/ScriptSource/e_Maze.txt
similarity index 100%
rename from pre-edited-cs/data/Stage/ScriptSource/e_Maze.txt
rename to pre_edited_cs/data/Stage/ScriptSource/e_Maze.txt
diff --git a/pre-edited-cs/data/Stage/ScriptSource/e_Oside.txt b/pre_edited_cs/data/Stage/ScriptSource/e_Oside.txt
similarity index 100%
rename from pre-edited-cs/data/Stage/ScriptSource/e_Oside.txt
rename to pre_edited_cs/data/Stage/ScriptSource/e_Oside.txt
diff --git a/pre-edited-cs/data/Stage/ScriptSource/e_Sky.txt b/pre_edited_cs/data/Stage/ScriptSource/e_Sky.txt
similarity index 100%
rename from pre-edited-cs/data/Stage/ScriptSource/e_Sky.txt
rename to pre_edited_cs/data/Stage/ScriptSource/e_Sky.txt
diff --git a/pre-edited-cs/data/Stage/ScriptSource/lounge.txt b/pre_edited_cs/data/Stage/ScriptSource/lounge.txt
similarity index 95%
rename from pre-edited-cs/data/Stage/ScriptSource/lounge.txt
rename to pre_edited_cs/data/Stage/ScriptSource/lounge.txt
index ca16df1..e33d290 100644
--- a/pre-edited-cs/data/Stage/ScriptSource/lounge.txt
+++ b/pre_edited_cs/data/Stage/ScriptSource/lounge.txt
@@ -22,6 +22,7 @@
 <KEY
 <FLJ1121:0203
 <ITJ0028:0202
+<ITJ0043:0202
 <MSGThese are sprinklers.<NOD
 They break all the time, you see.<NOD
 So we've always gotta have lots
@@ -29,7 +30,7 @@ of new ones ready.<NOD<END
 
 #0202
 <KEY<MSG<TUR<FL+1121<GIT1028<IT-0028Handed over the =Broken
-Sprinkler=.<NOD<DNP0280<EVE0204
+Sprinkler=.<NOD<DNP0280<ITJ0043:0205<EVE0204
 
 #0203
 <KEY<MSG<TURLooks like we had just enough
@@ -37,6 +38,8 @@ sprinklers...<NOD<END
 
 #0204
 <EVE0079
+#0205
+<IT-0043<IT+0029<EVE0204
 
 
 #0210
diff --git a/pre-edited-cs/data/Stage/Shelt.pxa b/pre_edited_cs/data/Stage/Shelt.pxa
similarity index 100%
rename from pre-edited-cs/data/Stage/Shelt.pxa
rename to pre_edited_cs/data/Stage/Shelt.pxa
diff --git a/pre-edited-cs/data/Stage/Shelt.pxe b/pre_edited_cs/data/Stage/Shelt.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/Shelt.pxe
rename to pre_edited_cs/data/Stage/Shelt.pxe
diff --git a/pre-edited-cs/data/Stage/Shelt.pxm b/pre_edited_cs/data/Stage/Shelt.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/Shelt.pxm
rename to pre_edited_cs/data/Stage/Shelt.pxm
diff --git a/pre-edited-cs/data/Stage/Shelt.tsc b/pre_edited_cs/data/Stage/Shelt.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/Shelt.tsc
rename to pre_edited_cs/data/Stage/Shelt.tsc
diff --git a/pre-edited-cs/data/Stage/Start.pxe b/pre_edited_cs/data/Stage/Start.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/Start.pxe
rename to pre_edited_cs/data/Stage/Start.pxe
diff --git a/pre-edited-cs/data/Stage/Start.pxm b/pre_edited_cs/data/Stage/Start.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/Start.pxm
rename to pre_edited_cs/data/Stage/Start.pxm
diff --git a/pre-edited-cs/data/Stage/Start.tsc b/pre_edited_cs/data/Stage/Start.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/Start.tsc
rename to pre_edited_cs/data/Stage/Start.tsc
diff --git a/pre-edited-cs/data/Stage/Statue.pxe b/pre_edited_cs/data/Stage/Statue.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/Statue.pxe
rename to pre_edited_cs/data/Stage/Statue.pxe
diff --git a/pre-edited-cs/data/Stage/Statue.pxm b/pre_edited_cs/data/Stage/Statue.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/Statue.pxm
rename to pre_edited_cs/data/Stage/Statue.pxm
diff --git a/pre-edited-cs/data/Stage/Statue.tsc b/pre_edited_cs/data/Stage/Statue.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/Statue.tsc
rename to pre_edited_cs/data/Stage/Statue.tsc
diff --git a/pre-edited-cs/data/Stage/Store.pxa b/pre_edited_cs/data/Stage/Store.pxa
similarity index 100%
rename from pre-edited-cs/data/Stage/Store.pxa
rename to pre_edited_cs/data/Stage/Store.pxa
diff --git a/pre-edited-cs/data/Stage/Stream.pxe b/pre_edited_cs/data/Stage/Stream.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/Stream.pxe
rename to pre_edited_cs/data/Stage/Stream.pxe
diff --git a/pre-edited-cs/data/Stage/Stream.pxm b/pre_edited_cs/data/Stage/Stream.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/Stream.pxm
rename to pre_edited_cs/data/Stage/Stream.pxm
diff --git a/pre-edited-cs/data/Stage/Stream.tsc b/pre_edited_cs/data/Stage/Stream.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/Stream.tsc
rename to pre_edited_cs/data/Stage/Stream.tsc
diff --git a/pre-edited-cs/data/Stage/Weed.pxa b/pre_edited_cs/data/Stage/Weed.pxa
similarity index 100%
rename from pre-edited-cs/data/Stage/Weed.pxa
rename to pre_edited_cs/data/Stage/Weed.pxa
diff --git a/pre-edited-cs/data/Stage/Weed.pxe b/pre_edited_cs/data/Stage/Weed.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/Weed.pxe
rename to pre_edited_cs/data/Stage/Weed.pxe
diff --git a/pre-edited-cs/data/Stage/Weed.pxm b/pre_edited_cs/data/Stage/Weed.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/Weed.pxm
rename to pre_edited_cs/data/Stage/Weed.pxm
diff --git a/pre-edited-cs/data/Stage/Weed.tsc b/pre_edited_cs/data/Stage/Weed.tsc
similarity index 91%
rename from pre-edited-cs/data/Stage/Weed.tsc
rename to pre_edited_cs/data/Stage/Weed.tsc
index fe0d36e..085f91a 100644
--- a/pre-edited-cs/data/Stage/Weed.tsc
+++ b/pre_edited_cs/data/Stage/Weed.tsc
@@ -1 +1 @@
-WTmzz�zWT��������zzz����zzzz����|~{z�zz�����WTmzz�{WT��������zzz����zzz{����|~{z�zz�����WTmzz�|WT��������zzz����zzz|����|~{z�zz�����WTmzz�}WT��������zzz����zzz}����|~{z�zz�����WTmzz�~WT��������zzz����zzz~����|~{z�zz�����WTmzz�WT����z{�|�zz{{�zzz{����WTmzz��WT������������zzz���uz||~WT����z{zz�zzz{�zzzz����zzz~WT����z~z{�z{{|�zzz|����z{zzWT����z{zz�zzzz�zzzzWT����zzz|��������z~z{����WTmzz��WT������������zzzWT����zz���zz{z�zzzzWT����zzz~����zz�zWT����zz���zzzz�zzzz����zz}z���u|~{z����zz�WTmz{zzWT��������������jù�j����j��j��j��j������q�WT���������wz||�����zzzz����WT����z~zz�z{{{�zzz|��������zz�z����z{zz�zzz{�zzzzWT����z{zz����zzz~����zzz{�zz���zzz�zzz�WTmz{z{WT�������wz||�����z|{|�z{z|����������q�j������x��������WTmz{z|WT��������zz{{����z{z{����zzz~����zzz��zz�~�zz{�zzz�WTmz{z}WT��������zz{{����z{z}����zzz~����zzz��zz�~�zzz��zz{{WTmz{z~WT����WT����z|{~�z{z�WT����zzz��z{zWT����������q�j������x��������WTmz{zWT����zz||������������{zz�����j���j������j��Çx��������zzzz�������uz|{~����z{z�WTmz{z�WT��������zz{{����z{z~����zzz~����zz|�zz�~�zz{��zzz�WTmz{z�WT��������zz{{����z{z�����zzz~����zz|��zz�~�zz{z�zzz�WTmz{z�WT��������zz{{����z{z�����zzz~����zz|��zz�~�zz{z�zzz�WTmz{z�WT����WT����z|||�z{{{WT����zz{z�z{{zWT����������j�����j��j��j������xWT���j����jl���lj��j�������j��WT���j����x��������WTmz{{zWT����zz||������������{z{z����j���j����j��Çx�������wzz{z����zzzz�������uz|||����z{{{WTmz{{{WT��������zz{{����z{z�����zzz~����zz|��zz�~�zzz��zz{}WTmz{{|WT��������zzz~����zz{��zz�~�zzz��zz{zWTmz{{}WT��������zz{{����z{{}����zzz~����zz}z�zz�~�zzz��zzz�WTmz{|{WT������������WTjjjjjjjjjjjjjjj�����q�j�������������WTmz{|}WT������������WTjjjjjjjjjjjjjjjj�����j������������WTmz{}zWT�������wz}|����wz|{�����zzz|����zz{{�z~|z�zz|~�zz|�WTmz|zzWT��������z|zz���uz|{z����z�zzWTmz|z{WT����zzzzWTmz|z|WT����|~}z�z|z~����zz�~�z|z}����z|z|���u|~}z��������z�z|WTmz|z}WT����zz�|����z|z|�zz{�zzz|����WTmz|z~WT����z|z|�zzz{�zzzz����WTmz|zWT����zzzzWTmz|z�WT��������������jù�q��j�����j��j�����vWT�����j���j���j�����j�����WT��������x����������������j����j����j��jù�vj��j�����x��������WTmz|{zWT���������������j���������j��Ŀ��j���j�������xWT��q�j���j�������j��j���j��÷���x��������WTmz||zWT���Jzz{}�z|zWT����z||{�z|~zWT����z~�~�z|}�WT����z|{�z|}~WT��������������j���q�j����xxx��������WT����z|}z�z{z��zzzz����zzz|����WTmz|}zWT���uz|{�����z|}z����z�zzWTmz|}~WT�����������������q�j��j��ò���xWT���j����j����j��j������j����x��������WTmz|}WT����z|{�z|}�WT��������������j�����q�j��j��ò���vj����WT��q��j����j����j��j�����j���WT����j����xxx��������WTmz|}�WT��������z||}�zzz{����zzz��z|}�WT����������q�j������x����WT����{zz������j����j�j������j��Çj�����j���x����zz|��������WTmz|}�WT�������uz||}WT����zz||����z|}��zz|{�zzzz����z�z{WTmz|}�WT������������������j����vj����j��j����ýxxx��������WT����z|}z�z{z��zzzz����zzz|����WTmz|~zWT������������������j����vj����j��j����ýxxx��������WTmz|zWT�������uz|{���uz||���wzz{}WT������������{z{}���j���j��º�������x����zz|��������WT����zz}z����zz~~WT����zzz~���uz|z���wz||���uz|}���uz|���uz||����uz||����u|~�z����zzz��z�zz�z|{��zz{�WTmz}z|WT��������z|{��zzz{���uz|{�WT����zz||����z}z|�zz|{�zzzz����z}z}WTmz}z}WT����zz}zWTmz}zWT��������z}z����zz||����z�z{WTmz~zzWTmz~z{WTmz~zWT�������������j���������vj��ì����������WTmz~{WTmz~|WTmzzzWT����WT����zzz}�zz}WT����z|{{�zz{WT���uz|{{WT��������xxx�q�j������j���j��j��j���j�����x��������WTmzz{WT����������������j��j���j����vj�q�j������WT���xxxWT���j����xxx��������WTmzz|WT����zzz}�zz}����WTmzz}WT�������uz|{|���z����zzzz����zz}zWT���wzzz}��������zzz�zzz}�zzzz����z{������zzz�zzzz�zzz|WT����zz{{����z{z{�zzzz�zzzz����zz{zWT����zzz�zzz�zzz|����zz{z����zzzWT����zz{{����z{z{�zz{��zzzz����zz|����zz|}����WTmz�zzWT�������uz|{�����zzzz����zzz~����zzz|WT����z~|�zzzz�zzzz����zz{zWT����zz{z����z~{�zzzz�zzz|����zz{z����z~|�zzzz�zzz|����z~z�zz{�����zzzWT����z~{�zzz}�zzz|����zz~zWT����z~|�zzz}�zzz|����zz~zWT����z~{�zzz�zzzz����zz}�WT����z~|�zzzz�zzzz����zzzWT����z~{�zzzz�zzz|WT����z~{�zzz�zzzzWT����z~|�zzz�zzzz����zz|zWT����z~z�zz{z�zzzz����z~{����z~|����zz}zWT����z~z�zz|z�zzzz����zz�z����zz{�����zzzzWT����z|zz����������j���q�j�����������kk����zz�z��������zzzWT����z~z���wz|}���uz||����WTmz�zzWT����zz}WTmz�z{WT����zz{~WTmz�z|WT����zz�WTmz�zzWT����zz�WTmz�z{WT����zz�zWTm{|zzWT��������{|zz�zz|z�zzz|WT����{|zz�zz{�����zzz{WT����z{zz����zzz{����zz{z�{|zz�zzz�zz}~
\ No newline at end of file
+WTmzz�zWT��������zzz����zzzz����|~{z�zz�����WTmzz�{WT��������zzz����zzz{����|~{z�zz�����WTmzz�|WT��������zzz����zzz|����|~{z�zz�����WTmzz�}WT��������zzz����zzz}����|~{z�zz�����WTmzz�~WT��������zzz����zzz~����|~{z�zz�����WTmzz�WT����z{�|�zz{{�zzz{����WTmzz��WT������������zzz���uz||~WT����z{zz�zzz{�zzzz����zzz~WT����z~z{�z{{|�zzz|����z{zzWT����z{zz�zzzz�zzzzWT����zzz|��������z~z{����WTmzz��WT������������zzzWT����zz���zz{z�zzzzWT����zzz~����zz�zWT����zz���zzzz�zzzz����zz}z���u|~{z����zz�WTmz{zzWT��������������jù�j����j��j��j��j������q�WT���������wz||�����zzzz����WT����z~zz�z{{{�zzz|��������zz�z����z{zz�zzz{�zzzzWT����z{zz����zzz~����zzz{�zz���zzz�zzz�WTmz{z{WT�������wz||�����z|{|�z{z|����������q�j������x��������WTmz{z|WT��������zz{{����z{z{����zzz~����zzz��zz�~�zz{�zzz�WTmz{z}WT��������zz{{����z{z}����zzz~����zzz��zz�~�zzz��zz{{WTmz{z~WT����WT����z|{~�z{z�WT�����{z��z{zWT����������q�j������x��������WTmz{zWT����zz||������������{zz�����j���j������j��Çx��������zzzz�������uz|{~����z{z�WTmz{z�WT��������zz{{����z{z~����zzz~����zz|�zz�~�zz{��zzz�WTmz{z�WT��������zz{{����z{z�����zzz~����zz|��zz�~�zz{z�zzz�WTmz{z�WT��������zz{{����z{z�����zzz~����zz|��zz�~�zz{z�zzz�WTmz{z�WT����WT����z|||�z{{{WT�����{z��z{{zWT����������j�����j��j��j������xWT���j����jl���lj��j�������j��WT���j����x��������WTmz{{zWT����zz||������������{z{z����j���j����j��Çx�������wzz{z����zzzz�������uz|||����z{{{WTmz{{{WT��������zz{{����z{z�����zzz~����zz|��zz�~�zzz��zz{}WTmz{{|WT��������zzz~����zz{��zz�~�zzz��zz{zWTmz{{}WT��������zz{{����z{{}����zzz~����zz}z�zz�~�zzz��zzz�WTmz{|{WT������������WTjjjjjjjjjjjjjjj�����q�j�������������WTmz{|}WT������������WTjjjjjjjjjjjjjjjj�����j������������WTmz{}zWT�������wz}|����wz|{�����zzz|����zz{{�z~|z�zz|~�zz|�WTmz|zzWT��������z|zz���uz|{z����z�zzWTmz|z{WT����zzzzWTmz|z|WT����|~}z�z|z~����zz�~�z|z}����z|z|���u|~}z��������z�z|WTmz|z}WT����zz�|����z|z|�zz{�zzz|����WTmz|z~WT����z|z|�zzz{�zzzz����WTmz|zWT����zzzzWTmz|z�WT��������������jù�q��j�����j��j�����vWT�����j���j���j�����j�����WT��������x����������������j����j����j��jù�vj��j�����x��������WTmz|{zWT���������������j���������j��Ŀ��j���j�������xWT��q�j���j�������j��j���j��÷���x��������WTmz||zWT���Jzz{}�z|zWT����z||{�z|~zWT����z~�~�z|}�WT����z|{�z|}~WT��������������j���q�j����xxx��������WT����z|}z�z{z��zzzz����zzz|����WTmz|}zWT���uz|{�����z|}z����z�zzWTmz|}~WT�����������������q�j��j��ò���xWT���j����j����j��j������j����x��������WTmz|}WT����z|{�z|}�WT��������������j�����q�j��j��ò���vj����WT��q��j����j����j��j�����j���WT����j����xxx��������WTmz|}�WT��������z||}�zzz{�����{z��z|}�WT����������q�j������x����WT����{zz������j����j�j������j��Çj�����j���x����zz|��������WTmz|}�WT�������uz||}WT����zz||����z|}��zz|{�zzzz����z�z{WTmz|}�WT������������������j����vj����j��j����ýxxx��������WT����z|}z�z{z��zzzz����zzz|����WTmz|~zWT������������������j����vj����j��j����ýxxx��������WTmz|zWT�������uz|{���uz||���wzz{}WT������������{z{}���j���j��º�������x����zz|��������WT����zz}z����zz~~WT����zzz~���uz|z���wz||���uz|}���uz|���uz||����uz||����u|~�z����zzz��z�zz�z|{��zz{�WTmz}z|WT��������z|{��zzz{���uz|{�WT����zz||����z}z|�zz|{�zzzz����z}z}WTmz}z}WT����zz}zWTmz}zWT��������z}z����zz||����z�z{WTmz~zzWTmz~z{WTmz~zWT�������������j���������vj��ì����������WTmz~{WTmz~|WTmzzzWT����WT�����{z|�zz}WT����z|{{�zz{WT���uz|{{WT��������xxx�q�j������j���j��j��j���j�����x��������WTmzz{WT����������������j��j���j����vj�q�j������WT���xxxWT���j����xxx��������WTmzz|WT�����{z|�zz}����WTmzz}WT�������uz|{|���z����zzzz����zz}zWT���wzzz}��������zzz�zzz}�zzzz����z{������zzz�zzzz�zzz|WT����zz{{����z{z{�zzzz�zzzz����zz{zWT����zzz�zzz�zzz|����zz{z����zzzWT����zz{{����z{z{�zz{��zzzz����zz|����zz|}����WTmz�zzWT�������uz|{�����zzzz����zzz~����zzz|WT����z~|�zzzz�zzzz����zz{zWT����zz{z����z~{�zzzz�zzz|����zz{z����z~|�zzzz�zzz|����z~z�zz{�����zzzWT����z~{�zzz}�zzz|����zz~zWT����z~|�zzz}�zzz|����zz~zWT����z~{�zzz�zzzz����zz}�WT����z~|�zzzz�zzzz����zzzWT����z~{�zzzz�zzz|WT����z~{�zzz�zzzzWT����z~|�zzz�zzzz����zz|zWT����z~z�zz{z�zzzz����z~{����z~|����zz}zWT����z~z�zz|z�zzzz����zz�z����zz{�����zzzzWT����z|zz����������j���q�j�����������kk����zz�z��������zzzWT����z~z���wz|}���uz||����WTmz�zzWT����zz}WTmz�z{WT����zz{~WTmz�z|WT����zz�WTmz�zzWT����zz�WTmz�z{WT����zz�zWTm{|zzWT��������{|zz�zz|z�zzz|WT����{|zz�zz{�����zzz{WT����z{zz����zzz{����zz{z�{|zz�zzz�zz}~
\ No newline at end of file
diff --git a/pre-edited-cs/data/Stage/WeedB.pxe b/pre_edited_cs/data/Stage/WeedB.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/WeedB.pxe
rename to pre_edited_cs/data/Stage/WeedB.pxe
diff --git a/pre-edited-cs/data/Stage/WeedB.pxm b/pre_edited_cs/data/Stage/WeedB.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/WeedB.pxm
rename to pre_edited_cs/data/Stage/WeedB.pxm
diff --git a/pre-edited-cs/data/Stage/WeedB.tsc b/pre_edited_cs/data/Stage/WeedB.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/WeedB.tsc
rename to pre_edited_cs/data/Stage/WeedB.tsc
diff --git a/pre-edited-cs/data/Stage/WeedD.pxe b/pre_edited_cs/data/Stage/WeedD.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/WeedD.pxe
rename to pre_edited_cs/data/Stage/WeedD.pxe
diff --git a/pre-edited-cs/data/Stage/WeedD.pxm b/pre_edited_cs/data/Stage/WeedD.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/WeedD.pxm
rename to pre_edited_cs/data/Stage/WeedD.pxm
diff --git a/pre-edited-cs/data/Stage/WeedD.tsc b/pre_edited_cs/data/Stage/WeedD.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/WeedD.tsc
rename to pre_edited_cs/data/Stage/WeedD.tsc
diff --git a/pre-edited-cs/data/Stage/WeedS.pxe b/pre_edited_cs/data/Stage/WeedS.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/WeedS.pxe
rename to pre_edited_cs/data/Stage/WeedS.pxe
diff --git a/pre-edited-cs/data/Stage/WeedS.pxm b/pre_edited_cs/data/Stage/WeedS.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/WeedS.pxm
rename to pre_edited_cs/data/Stage/WeedS.pxm
diff --git a/pre-edited-cs/data/Stage/WeedS.tsc b/pre_edited_cs/data/Stage/WeedS.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/WeedS.tsc
rename to pre_edited_cs/data/Stage/WeedS.tsc
diff --git a/pre-edited-cs/data/Stage/White.pxa b/pre_edited_cs/data/Stage/White.pxa
similarity index 100%
rename from pre-edited-cs/data/Stage/White.pxa
rename to pre_edited_cs/data/Stage/White.pxa
diff --git a/pre-edited-cs/data/Stage/_version.txt b/pre_edited_cs/data/Stage/_version.txt
similarity index 100%
rename from pre-edited-cs/data/Stage/_version.txt
rename to pre_edited_cs/data/Stage/_version.txt
diff --git a/pre-edited-cs/data/Stage/e_Blcn.pxe b/pre_edited_cs/data/Stage/e_Blcn.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/e_Blcn.pxe
rename to pre_edited_cs/data/Stage/e_Blcn.pxe
diff --git a/pre-edited-cs/data/Stage/e_Blcn.pxm b/pre_edited_cs/data/Stage/e_Blcn.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/e_Blcn.pxm
rename to pre_edited_cs/data/Stage/e_Blcn.pxm
diff --git a/pre-edited-cs/data/Stage/e_Blcn.tsc b/pre_edited_cs/data/Stage/e_Blcn.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/e_Blcn.tsc
rename to pre_edited_cs/data/Stage/e_Blcn.tsc
diff --git a/pre-edited-cs/data/Stage/e_Ceme.pxe b/pre_edited_cs/data/Stage/e_Ceme.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/e_Ceme.pxe
rename to pre_edited_cs/data/Stage/e_Ceme.pxe
diff --git a/pre-edited-cs/data/Stage/e_Ceme.pxm b/pre_edited_cs/data/Stage/e_Ceme.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/e_Ceme.pxm
rename to pre_edited_cs/data/Stage/e_Ceme.pxm
diff --git a/pre-edited-cs/data/Stage/e_Ceme.tsc b/pre_edited_cs/data/Stage/e_Ceme.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/e_Ceme.tsc
rename to pre_edited_cs/data/Stage/e_Ceme.tsc
diff --git a/pre-edited-cs/data/Stage/e_Jenk.pxe b/pre_edited_cs/data/Stage/e_Jenk.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/e_Jenk.pxe
rename to pre_edited_cs/data/Stage/e_Jenk.pxe
diff --git a/pre-edited-cs/data/Stage/e_Jenk.pxm b/pre_edited_cs/data/Stage/e_Jenk.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/e_Jenk.pxm
rename to pre_edited_cs/data/Stage/e_Jenk.pxm
diff --git a/pre-edited-cs/data/Stage/e_Jenk.tsc b/pre_edited_cs/data/Stage/e_Jenk.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/e_Jenk.tsc
rename to pre_edited_cs/data/Stage/e_Jenk.tsc
diff --git a/pre-edited-cs/data/Stage/e_Labo.pxe b/pre_edited_cs/data/Stage/e_Labo.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/e_Labo.pxe
rename to pre_edited_cs/data/Stage/e_Labo.pxe
diff --git a/pre-edited-cs/data/Stage/e_Labo.pxm b/pre_edited_cs/data/Stage/e_Labo.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/e_Labo.pxm
rename to pre_edited_cs/data/Stage/e_Labo.pxm
diff --git a/pre-edited-cs/data/Stage/e_Labo.tsc b/pre_edited_cs/data/Stage/e_Labo.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/e_Labo.tsc
rename to pre_edited_cs/data/Stage/e_Labo.tsc
diff --git a/pre-edited-cs/data/Stage/e_Malc.pxe b/pre_edited_cs/data/Stage/e_Malc.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/e_Malc.pxe
rename to pre_edited_cs/data/Stage/e_Malc.pxe
diff --git a/pre-edited-cs/data/Stage/e_Malc.pxm b/pre_edited_cs/data/Stage/e_Malc.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/e_Malc.pxm
rename to pre_edited_cs/data/Stage/e_Malc.pxm
diff --git a/pre-edited-cs/data/Stage/e_Malc.tsc b/pre_edited_cs/data/Stage/e_Malc.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/e_Malc.tsc
rename to pre_edited_cs/data/Stage/e_Malc.tsc
diff --git a/pre-edited-cs/data/Stage/e_Maze.pxe b/pre_edited_cs/data/Stage/e_Maze.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/e_Maze.pxe
rename to pre_edited_cs/data/Stage/e_Maze.pxe
diff --git a/pre-edited-cs/data/Stage/e_Maze.pxm b/pre_edited_cs/data/Stage/e_Maze.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/e_Maze.pxm
rename to pre_edited_cs/data/Stage/e_Maze.pxm
diff --git a/pre-edited-cs/data/Stage/e_Maze.tsc b/pre_edited_cs/data/Stage/e_Maze.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/e_Maze.tsc
rename to pre_edited_cs/data/Stage/e_Maze.tsc
diff --git a/pre-edited-cs/data/Stage/e_Maze1.pxe b/pre_edited_cs/data/Stage/e_Maze1.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/e_Maze1.pxe
rename to pre_edited_cs/data/Stage/e_Maze1.pxe
diff --git a/pre-edited-cs/data/Stage/e_Maze1.pxm b/pre_edited_cs/data/Stage/e_Maze1.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/e_Maze1.pxm
rename to pre_edited_cs/data/Stage/e_Maze1.pxm
diff --git a/pre-edited-cs/data/Stage/e_Maze1.tsc b/pre_edited_cs/data/Stage/e_Maze1.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/e_Maze1.tsc
rename to pre_edited_cs/data/Stage/e_Maze1.tsc
diff --git a/pre-edited-cs/data/Stage/e_Sky.pxe b/pre_edited_cs/data/Stage/e_Sky.pxe
similarity index 100%
rename from pre-edited-cs/data/Stage/e_Sky.pxe
rename to pre_edited_cs/data/Stage/e_Sky.pxe
diff --git a/pre-edited-cs/data/Stage/e_Sky.pxm b/pre_edited_cs/data/Stage/e_Sky.pxm
similarity index 100%
rename from pre-edited-cs/data/Stage/e_Sky.pxm
rename to pre_edited_cs/data/Stage/e_Sky.pxm
diff --git a/pre-edited-cs/data/Stage/e_Sky.tsc b/pre_edited_cs/data/Stage/e_Sky.tsc
similarity index 100%
rename from pre-edited-cs/data/Stage/e_Sky.tsc
rename to pre_edited_cs/data/Stage/e_Sky.tsc
diff --git a/pre-edited-cs/data/StageImage.bmp b/pre_edited_cs/data/StageImage.bmp
similarity index 100%
rename from pre-edited-cs/data/StageImage.bmp
rename to pre_edited_cs/data/StageImage.bmp
diff --git a/pre-edited-cs/data/StageSelect.tsc b/pre_edited_cs/data/StageSelect.tsc
similarity index 100%
rename from pre-edited-cs/data/StageSelect.tsc
rename to pre_edited_cs/data/StageSelect.tsc
diff --git a/pre-edited-cs/data/TextBox.bmp b/pre_edited_cs/data/TextBox.bmp
similarity index 100%
rename from pre-edited-cs/data/TextBox.bmp
rename to pre_edited_cs/data/TextBox.bmp
diff --git a/pre-edited-cs/data/Title.bmp b/pre_edited_cs/data/Title.bmp
similarity index 100%
rename from pre-edited-cs/data/Title.bmp
rename to pre_edited_cs/data/Title.bmp
diff --git a/pre-edited-cs/data/bk0.bmp b/pre_edited_cs/data/bk0.bmp
similarity index 100%
rename from pre-edited-cs/data/bk0.bmp
rename to pre_edited_cs/data/bk0.bmp
diff --git a/pre-edited-cs/data/bkBlack.bmp b/pre_edited_cs/data/bkBlack.bmp
similarity index 100%
rename from pre-edited-cs/data/bkBlack.bmp
rename to pre_edited_cs/data/bkBlack.bmp
diff --git a/pre-edited-cs/data/bkBlue.bmp b/pre_edited_cs/data/bkBlue.bmp
similarity index 100%
rename from pre-edited-cs/data/bkBlue.bmp
rename to pre_edited_cs/data/bkBlue.bmp
diff --git a/pre-edited-cs/data/bkFall.bmp b/pre_edited_cs/data/bkFall.bmp
similarity index 100%
rename from pre-edited-cs/data/bkFall.bmp
rename to pre_edited_cs/data/bkFall.bmp
diff --git a/pre-edited-cs/data/bkFog.bmp b/pre_edited_cs/data/bkFog.bmp
similarity index 100%
rename from pre-edited-cs/data/bkFog.bmp
rename to pre_edited_cs/data/bkFog.bmp
diff --git a/pre-edited-cs/data/bkGard.bmp b/pre_edited_cs/data/bkGard.bmp
similarity index 100%
rename from pre-edited-cs/data/bkGard.bmp
rename to pre_edited_cs/data/bkGard.bmp
diff --git a/pre-edited-cs/data/bkGray.bmp b/pre_edited_cs/data/bkGray.bmp
similarity index 100%
rename from pre-edited-cs/data/bkGray.bmp
rename to pre_edited_cs/data/bkGray.bmp
diff --git a/pre-edited-cs/data/bkGreen.bmp b/pre_edited_cs/data/bkGreen.bmp
similarity index 100%
rename from pre-edited-cs/data/bkGreen.bmp
rename to pre_edited_cs/data/bkGreen.bmp
diff --git a/pre-edited-cs/data/bkMaze.bmp b/pre_edited_cs/data/bkMaze.bmp
similarity index 100%
rename from pre-edited-cs/data/bkMaze.bmp
rename to pre_edited_cs/data/bkMaze.bmp
diff --git a/pre-edited-cs/data/bkMoon.bmp b/pre_edited_cs/data/bkMoon.bmp
similarity index 100%
rename from pre-edited-cs/data/bkMoon.bmp
rename to pre_edited_cs/data/bkMoon.bmp
diff --git a/pre-edited-cs/data/bkRed.bmp b/pre_edited_cs/data/bkRed.bmp
similarity index 100%
rename from pre-edited-cs/data/bkRed.bmp
rename to pre_edited_cs/data/bkRed.bmp
diff --git a/pre-edited-cs/data/bkWater.bmp b/pre_edited_cs/data/bkWater.bmp
similarity index 100%
rename from pre-edited-cs/data/bkWater.bmp
rename to pre_edited_cs/data/bkWater.bmp
diff --git a/pre-edited-cs/data/casts.bmp b/pre_edited_cs/data/casts.bmp
similarity index 100%
rename from pre-edited-cs/data/casts.bmp
rename to pre_edited_cs/data/casts.bmp
diff --git a/pre-edited-cs/data/mrmap.bin b/pre_edited_cs/data/mrmap.bin
similarity index 100%
rename from pre-edited-cs/data/mrmap.bin
rename to pre_edited_cs/data/mrmap.bin
diff --git a/pre-edited-cs/data/npc.tbl b/pre_edited_cs/data/npc.tbl
similarity index 100%
rename from pre-edited-cs/data/npc.tbl
rename to pre_edited_cs/data/npc.tbl
diff --git a/pre-edited-cs/data/stageconv.exe b/pre_edited_cs/data/stageconv.exe
similarity index 100%
rename from pre-edited-cs/data/stageconv.exe
rename to pre_edited_cs/data/stageconv.exe
diff --git a/pre_edited_cs/data/tsc_def.txt b/pre_edited_cs/data/tsc_def.txt
new file mode 100644
index 0000000..e69de29
diff --git a/pyproject.toml b/pyproject.toml
new file mode 100644
index 0000000..fa7d672
--- /dev/null
+++ b/pyproject.toml
@@ -0,0 +1,7 @@
+[build-system]
+requires = ["setuptools>=44.0.0", "setuptools_scm[toml]>=3.4.3"]
+build-backend = "setuptools.build_meta"
+
+[tool.setuptools_scm]
+local_scheme = "no-local-version"
+write_to = "caver/version.py"
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000..f7c0bf9
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,41 @@
+[metadata]
+name = cave-story-randomizer
+description = An open source randomizer patcher for Cave Story.
+long_description = file: README.md
+long_description_content_type = text/markdown
+url = https://github.com/cave-story-randomizer/cave-story-randomizer/tree/patcher
+author = duncathan salt
+
+classifiers =
+    License :: OSI Approved :: zlib/libpng License
+    Development Status :: 5 - Production/Stable
+    Intended Audience :: Developers
+    Programming Language :: Python :: 3.9
+    Programming Language :: Other Scripting Engines
+
+[options]
+packages = find:
+install_requires =
+    lupa>=1.10
+
+include_package_data = True
+zip_safe = False
+python_requires = >=3.9
+
+#
+# Entry Points for PyInstaller
+# ---------------------------------
+[options.entry_points]
+pyinstaller40 =
+    # .. _hook_registration:
+    #
+    # **Hook registration**: This entry point refers to a function
+    # that will be invoked with no parameters. It must return a
+    # sequence of strings, each element of which provides an
+    # additional absolute path to search for hooks. This is equivalent
+    # to passing the ``additional-hooks-dir`` `command-line option
+    # <https://pyinstaller.readthedocs.io/en/stable/usage.html#what-to-bundle-where-to-search>`_
+    # to PyInstaller for each string in the sequence.
+    #
+    # In this project, the function is ``get_hook_dirs``.
+    hook-dirs = __pyinstaller:get_hook_dirs
\ No newline at end of file
diff --git a/setup.py b/setup.py
new file mode 100644
index 0000000..8bf1ba9
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,2 @@
+from setuptools import setup
+setup()
diff --git a/src/assets/background.png b/src/assets/background.png
deleted file mode 100644
index b763ff7..0000000
Binary files a/src/assets/background.png and /dev/null differ
diff --git a/src/assets/icon/Arthur2.png b/src/assets/icon/Arthur2.png
deleted file mode 100644
index a0dc4dc..0000000
Binary files a/src/assets/icon/Arthur2.png and /dev/null differ
diff --git a/src/assets/icon/Camp.png b/src/assets/icon/Camp.png
deleted file mode 100644
index 81d2933..0000000
Binary files a/src/assets/icon/Camp.png and /dev/null differ
diff --git a/src/assets/icon/Chaco.png b/src/assets/icon/Chaco.png
deleted file mode 100644
index c549eb5..0000000
Binary files a/src/assets/icon/Chaco.png and /dev/null differ
diff --git a/src/assets/icon/Curly.png b/src/assets/icon/Curly.png
deleted file mode 100644
index 75c73a4..0000000
Binary files a/src/assets/icon/Curly.png and /dev/null differ
diff --git a/src/assets/icon/Custom.png b/src/assets/icon/Custom.png
deleted file mode 100644
index 6a3ef48..0000000
Binary files a/src/assets/icon/Custom.png and /dev/null differ
diff --git a/src/assets/icon/Frog.png b/src/assets/icon/Frog.png
deleted file mode 100644
index ad96d32..0000000
Binary files a/src/assets/icon/Frog.png and /dev/null differ
diff --git a/src/assets/icon/Kanpachi.png b/src/assets/icon/Kanpachi.png
deleted file mode 100644
index 671371f..0000000
Binary files a/src/assets/icon/Kanpachi.png and /dev/null differ
diff --git a/src/assets/icon/King.png b/src/assets/icon/King.png
deleted file mode 100644
index 9673dbe..0000000
Binary files a/src/assets/icon/King.png and /dev/null differ
diff --git a/src/assets/icon/Misery.png b/src/assets/icon/Misery.png
deleted file mode 100644
index d4b94e5..0000000
Binary files a/src/assets/icon/Misery.png and /dev/null differ
diff --git a/src/assets/icon/Quote.png b/src/assets/icon/Quote.png
deleted file mode 100644
index 9335696..0000000
Binary files a/src/assets/icon/Quote.png and /dev/null differ
diff --git a/src/assets/icon/Random.png b/src/assets/icon/Random.png
deleted file mode 100644
index 5726c79..0000000
Binary files a/src/assets/icon/Random.png and /dev/null differ
diff --git a/src/assets/icon/StartPoint2.png b/src/assets/icon/StartPoint2.png
deleted file mode 100644
index 36f45ca..0000000
Binary files a/src/assets/icon/StartPoint2.png and /dev/null differ
diff --git a/src/assets/icon/Sue.png b/src/assets/icon/Sue.png
deleted file mode 100644
index 24c71b2..0000000
Binary files a/src/assets/icon/Sue.png and /dev/null differ
diff --git a/src/assets/icon/Toroko.png b/src/assets/icon/Toroko.png
deleted file mode 100644
index b2495b0..0000000
Binary files a/src/assets/icon/Toroko.png and /dev/null differ
diff --git a/src/assets/icon/discord.png b/src/assets/icon/discord.png
deleted file mode 100644
index 73008bc..0000000
Binary files a/src/assets/icon/discord.png and /dev/null differ
diff --git a/src/assets/icon/link.png b/src/assets/icon/link.png
deleted file mode 100644
index c8b27d3..0000000
Binary files a/src/assets/icon/link.png and /dev/null differ
diff --git a/src/assets/icon/linkgrey.png b/src/assets/icon/linkgrey.png
deleted file mode 100644
index 3727fd0..0000000
Binary files a/src/assets/icon/linkgrey.png and /dev/null differ
diff --git a/src/assets/icon/randoconfig.png b/src/assets/icon/randoconfig.png
deleted file mode 100644
index 07bc7af..0000000
Binary files a/src/assets/icon/randoconfig.png and /dev/null differ
diff --git a/src/assets/monogram_extended.ttf b/src/assets/monogram_extended.ttf
deleted file mode 100644
index 948c06a..0000000
Binary files a/src/assets/monogram_extended.ttf and /dev/null differ
diff --git a/src/assets/myChar/Chaco.bmp b/src/assets/myChar/Chaco.bmp
deleted file mode 100644
index acbc48e..0000000
Binary files a/src/assets/myChar/Chaco.bmp and /dev/null differ
diff --git a/src/assets/myChar/Curly.bmp b/src/assets/myChar/Curly.bmp
deleted file mode 100644
index ff1b77c..0000000
Binary files a/src/assets/myChar/Curly.bmp and /dev/null differ
diff --git a/src/assets/myChar/Frog.bmp b/src/assets/myChar/Frog.bmp
deleted file mode 100644
index e29f766..0000000
Binary files a/src/assets/myChar/Frog.bmp and /dev/null differ
diff --git a/src/assets/myChar/Kanpachi.bmp b/src/assets/myChar/Kanpachi.bmp
deleted file mode 100644
index 25dff80..0000000
Binary files a/src/assets/myChar/Kanpachi.bmp and /dev/null differ
diff --git a/src/assets/myChar/King.bmp b/src/assets/myChar/King.bmp
deleted file mode 100644
index 426c74b..0000000
Binary files a/src/assets/myChar/King.bmp and /dev/null differ
diff --git a/src/assets/myChar/Misery.bmp b/src/assets/myChar/Misery.bmp
deleted file mode 100644
index e3934c6..0000000
Binary files a/src/assets/myChar/Misery.bmp and /dev/null differ
diff --git a/src/assets/myChar/Quote.bmp b/src/assets/myChar/Quote.bmp
deleted file mode 100644
index b92a638..0000000
Binary files a/src/assets/myChar/Quote.bmp and /dev/null differ
diff --git a/src/assets/myChar/Sue.bmp b/src/assets/myChar/Sue.bmp
deleted file mode 100644
index fa8f5bc..0000000
Binary files a/src/assets/myChar/Sue.bmp and /dev/null differ
diff --git a/src/assets/myChar/Toroko.bmp b/src/assets/myChar/Toroko.bmp
deleted file mode 100644
index 5ff27db..0000000
Binary files a/src/assets/myChar/Toroko.bmp and /dev/null differ
diff --git a/src/conf.lua b/src/conf.lua
deleted file mode 100644
index fbdf234..0000000
--- a/src/conf.lua
+++ /dev/null
@@ -1,45 +0,0 @@
-if io then
-  io.stdout:setvbuf("no")
-end
-
-function love.conf(t)
-  t.window = {
-    title = "Cave Story Randomizer",
-    icon = 'assets/icon/randoconfig.png',
-    width = 640,
-    height = 480,
-    resizable = false,
-  }
-  t.version = '11.1'
-  t.console = false
-  t.identity = 'CaveStoryRandomizer'
-  t.accelerometerjoystick = false
-  t.gammacorrect = false
-  
-  t.modules.audio = false
-  t.modules.joystick = false
-  t.modules.physics = false
-  t.modules.sound = false
-  t.modules.thread = false
-  t.modules.touch = false
-  t.modules.video = false
-
-  t.releases = {
-    -- This is the name of the zip archive which contains your game.
-    title = 'CaveStoryRandomizer',
-    -- This is the name of your game's executable.
-    package = 'Cave Story Randomizer',
-    loveVersion = '11.2',
-    version = 'v2.0',
-    author = 'duncathan',
-    email = 'dunc@duncathan.com',
-    description = 'A randomizer for Cave Story',
-    homepage = 'https://github.com/cave-story-randomizer/cave-story-randomizer',
-    -- MacOS needs this.
-    identifier = 'CaveStoryRandomizer',
-    excludeFileList = {
-    },
-    compile = false,
-    releaseDirectory = 'releases',
-  }
-end
diff --git a/src/database/Cave.pxm b/src/database/Cave.pxm
deleted file mode 100644
index b275867..0000000
Binary files a/src/database/Cave.pxm and /dev/null differ
diff --git a/src/database/items.lua b/src/database/items.lua
deleted file mode 100644
index d26a066..0000000
--- a/src/database/items.lua
+++ /dev/null
@@ -1,550 +0,0 @@
-local function lifeCapsule3()
-  return {
-    name = "Life Capsule",
-    script = "<EVE0012",
-    attributes = {"nonProgressive", "hp3", "helpful"},
-    hints = {"a Life Capsule", "a little HP"}
-  }
-end
-local function lifeCapsule4()
-  return {
-    name = "Life Capsule",
-    script = "<EVE0013",
-    attributes = {"nonProgressive", "hp4", "helpful"},
-    hints = {"a Life Capsule", "some decent HP"}
-  }
-end
-local function lifeCapsule5()
-  return {
-    name = "Life Capsule",
-    script = "<EVE0014",
-    attributes = {"nonProgressive", "hp5", "helpful"},
-    hints = {"a Life Capsule", "a lot of HP"}
-  }
-end
-
-local function missiles()
-  return {
-    name = "Missile Expansion",
-    script = "<EVE0030",
-    attributes = {"weapon", "missileLauncher", "nonProgressive", "helpful"},
-  }
-end
-
-local function event(n)
-  return {
-    name = "Event: " .. n,
-    attributes = {"event", "abstract"},
-    placed = true
-  }
-end
-
-local function objective(n, eve)
-  return {
-    name = n,
-    attributes = {"objective", "abstract"},
-    placed = true,
-    script = eve
-  }
-end
-
-local function _itemData()
-  local data = {
-    -------------
-    -- WEAPONS --
-    -------------
-    polarStar1 = {
-      name = "Polar Star",
-      script = "<EVE0002",
-      attributes = {"weapon", "weaponBoss", "weaponSN", "polarStar", "mandatory"},
-      hints = {"the gunsmith's pride"}
-    },
-    polarStar2 = {
-      name = "Polar Star",
-      script = "<EVE0002",
-      attributes = {"weapon", "weaponBoss", "weaponSN", "polarStar", "mandatory"},
-      hints = {"the gunsmith's pride"}
-    },
-    missileLauncher = {
-      name = "Missile Launcher",
-      script = "<EVE0030",
-      attributes = {"weapon", "weaponSN", "nonProgressive", "helpful"},
-    },
-    superMissileLauncher = {
-      name = "Super Missile Launcher",
-      script = "<EVE0033",
-      attributes = {"weapon", "weaponSN", "missileLauncher", "nonProgressive", "helpful"},
-    },
-    fireball = {
-      name = "Fireball",
-      script = "<EVE0004",
-      attributes = {"weapon", "weaponBoss", "mandatory"},
-      hints = {"the Fireball"}
-    },
-    snake = {
-      name = "Snake",
-      script = "<EVE0005",
-      attributes = {"weapon", "weaponBoss", "nonProgressive", "weaponStrong", "helpful"},
-      hints = {"the Snake"}
-    },
-    bubbler = {
-      name = "Bubbler",
-      script = "<EVE0007",
-      attributes = {"weapon", "weaponBoss", "nonProgressive", "helpful"},
-      hints = {"the Bubbler"}
-    },
-    machineGun = {
-      name = "Machine Gun",
-      script = "<EVE0008",
-      attributes = {"weapon", "weaponBoss", "weaponSN", "flight", "mandatory", "weaponStrong"},
-      hints = {"the Machine Gun"}
-    },
-    blade = {
-      name = "Blade",
-      script = "<EVE0009",
-      attributes = {"weapon", "weaponBoss", "weaponSN", "mandatory", "weaponStrong"},
-      hints = {"the Blade"}
-    },
-    nemesis = {
-      name = "Nemesis",
-      script = "<EVE0010",
-      attributes = {"weapon", "weaponBoss", "weaponSN", "nonProgressive", "weaponStrong", "helpful"},
-      hints = {"the Nemesis"}
-    },
-
-    ---------------
-    -- INVENTORY --
-    ---------------
-    mapSystem = {
-      name = "Map System",
-      script = "<EVE0052",
-      attributes = {"nonProgressive", "map"},
-      hints = {"a map", "an electronic device"}
-    },
-    locket = {
-      name = "Silver Locket",
-      script = "<EVE0054",
-      attributes = {"mandatory"},
-      hints = {"some fishy jewelry", "a Mimiga's item"}
-    },
-    arthurKey = {
-      name = "Arthur's Key",
-      script = "<EVE0051",
-      attributes = {"mandatory"},
-      hints = {"Arthur's Key", "a key", "a Mimiga's item"}
-    },
-    idCard = {
-      name = "ID Card",
-      script = "<EVE0057",
-      attributes = {"mandatory"},
-      hints = {"the ID Card", "an electronic device"}
-    },
-    santaKey = {
-      name = "Santa's Key",
-      script = "<EVE0053",
-      attributes = {"mandatory"},
-      hints = {"Santa's Key", "a key", "a Mimiga's item"}
-    },
-    lipstick = {
-      name = "Chaco's Lipstick",
-      script = "<EVE0087",
-      attributes = {"nonProgressive", "useless"},
-      hints = {"some lipstick", "a Mimiga's item", "a lewd item"}
-    },
-    juice = {
-      name = "Jellyfish Juice",
-      script = "<EVE0058",
-      attributes = {"mandatory"},
-      hints = {"some juice", "a bomb ingredient"}
-    },
-    charcoal = {
-      name = "Charcoal",
-      script = "<EVE0062",
-      attributes = {"mandatory"},
-      hints = {"some charcoal", "a bomb ingredient"}
-    },
-    rustyKey = {
-      name = "Rusty Key",
-      script = "<EVE0059",
-      attributes = {"mandatory"},
-      hints = {"the Rusty Key", "a key"}
-    },
-    gumKey = {
-      name = "Gum Key",
-      script = "<EVE0060",
-      attributes = {"mandatory"},
-      hints = {"the Gum Key", "a key"}
-    },
-    gumBase = {
-      name = "Gum Base",
-      script = "<EVE0061",
-      attributes = {"mandatory"},
-      hints = {"some gum", "a bomb ingredient"}
-    },
-    bomb = {
-      name = "Bomb",
-      script = "<EVE0063",
-      attributes = {"mandatory"},
-      hints = {"a bomb"}
-    },
-    panties = {
-      name = "Curly's Panties",
-      script = "<EVE0085",
-      attributes = {"nonProgressive", "useless"},
-      hints = {"a pair of panties", "a lewd item"}
-    },
-    puppy1 = {
-      name = "Hajime",
-      script = "<EVE0064",
-      attributes = {"puppy"}
-    },
-    puppy2 = {
-      name = "Kakeru",
-      script = "<EVE0064",
-      attributes = {"puppy"}
-    },
-    puppy3 = {
-      name = "Mick",
-      script = "<EVE0064",
-      attributes = {"puppy"}
-    },
-    puppy4 = {
-      name = "Nene",
-      script = "<EVE0064",
-      attributes = {"puppy"}
-    },
-    puppy5 = {
-      name = "Shinobu",
-      script = "<EVE0064",
-      attributes = {"puppy"}
-    },
-    lifepot = {
-      name = "Life Pot",
-      script = "<EVE0065",
-      attributes = {"nonProgressive", "helpful"},
-      hints = {"a Life Pot", "some medicine"}
-    },
-    turbocharge = {
-      name = "Turbocharge",
-      script = "<EVE0070",
-      attributes = {"nonProgressive", "helpful"},
-      hints = {"the Turbocharge"}
-    },
-    clinicKey = {
-      name = "Clinic Key",
-      script = "<EVE0067",
-      attributes = {"mandatory"},
-      hints = {"the Clinic Key", "a key"}
-    },
-    armsBarrier = {
-      name = "Arms Barrier",
-      script = "<EVE0069",
-      attributes = {"nonProgressive", "helpful"},
-      hints = {"the Arms Barrier"}
-    },
-    cureAll = {
-      name = "Cure-All",
-      script = "<EVE0066",
-      attributes = {"mandatory"},
-      hints = {"the Cure-All", "some medicine"}
-    },
-    booster1 = {
-      name = "Booster",
-      script = "<EVE0068",
-      attributes = {"flight", "booster", "mandatory"},
-      hints = {"a Booster", "a rocket component"}
-    },
-    booster2 = {
-      name = "Booster",
-      script = "<EVE0068",
-      attributes = {"flight", "booster", "mandatory"},
-      hints = {"a Booster", "a rocket component"}
-    },
-    towRope = {
-      name = "Tow Rope",
-      script = "<EVE0080",
-      attributes = {"mandatory"},
-      hints = {"the Tow Rope"}
-    },
-    airTank = {
-      name = "Curly's Air Tank",
-      script = "<EVE0071",
-      attributes = {"mandatory"},
-      hints = {"an air tank"}
-    },
-    alienMedal = {
-      name = "Alien Medal",
-      script = "<EVE0086",
-      attributes = {"nonProgressive", "useless"},
-      hints = {"the Alien Medal", "a badge of victory"}
-    },
-    whimsicalStar = {
-      name = "Whimsical Star",
-      script = "<EVE0088",
-      attributes = {"nonProgressive", "helpful"},
-      hints = {"the Whimsical Star"}
-    },
-    nikumaru = {
-      name = "Nikumaru Counter",
-      script = "<EVE0072",
-      attributes = {"nonProgressive"},
-      hints = {"the Nikumaru Counter"}
-    },
-    teleportKey = {
-      name = "Teleporter Room Key",
-      script = "<EVE0075",
-      attributes = {"mandatory"},
-      hints = {"the Teleporter Room Key", "a key"}
-    },
-    letter = {
-      name = "Sue's Letter",
-      script = "<EVE0076",
-      attributes = {"mandatory"},
-      hints = {"Sue's Letter", "a Mimiga's item"}
-    },
-    mask = {
-      name = "Mimiga Mask",
-      script = "<EVE0074",
-      attributes = {"mandatory"},
-      hints = {"the Mimiga Mask"}
-    },
-    brokenSprinkler = {
-      name = "Broken Sprinkler",
-      script = "<EVE0078",
-      attributes = {"mandatory"},
-      hints = {"the Broken Sprinkler", "a sprinkler"}
-    },
-    newSprinkler = {
-      name = "Sprinkler",
-      script = "<EVE0079",
-      attributes = {"mandatory"},
-      hints = {"the Sprinkler", "a sprinkler", "a rocket component"}
-    },
-    controller = {
-      name = "Controller",
-      script = "<EVE0077",
-      attributes = {"mandatory"},
-      hints = {"the Controller", "a rocket component", "an electronic device"}
-    },
-    mushroomBadge = {
-      name = "Mushroom Badge",
-      script = "<EVE0083",
-      attributes = {"mandatory"},
-      hints = {"the Mushroom Badge", "a badge of victory"}
-    },
-    maPignon = {
-      name = "Ma Pignon",
-      script = "<EVE0084",
-      attributes = {"mandatory"},
-      hints = {"Ma Pignon", "a living being"}
-    },
-    mrLittle = {
-      name = "Little Man",
-      script = "<EVE0082",
-      attributes = {"mandatory"},
-      hints = {"Mr Little", "a living being"}
-      --placed = true
-    },
-    ironBond = {
-      name = "Iron Bond",
-      script = "<EVE0089",
-      attributes = {"mandatory"},
-      hints = {"the Iron Bond"}
-    },
-    clayMedal = {
-      name = "Clay Figure Medal",
-      script = "<EVE0081",
-      attributes = {"nonProgressive", "useless"},
-      hints = {"the Clay Figure Medal", "a badge of victory"}
-    },
-
-    -------------------
-    -- LIFE CAPSULES --
-    -------------------
-    capsule3A = lifeCapsule3(), -- First Cave
-    capsule3B = lifeCapsule3(), -- Yamashita Farm
-    capsule3C = lifeCapsule3(), -- Egg Corridor (Basil)
-    capsule4A = lifeCapsule4(), -- Egg Corridor (Cthulhu)
-    capsule5A = lifeCapsule5(), -- Grasstown
-    capsule5B = lifeCapsule5(), -- Execution Chamber
-    capsule5C = lifeCapsule5(), -- Sand Zone (Upper)
-    capsule5D = lifeCapsule5(), -- Sand Zone (Lower)
-    capsule5E = lifeCapsule5(), -- Labyrinth
-    capsule5F = lifeCapsule5(), -- Plantation (West)
-    capsule4B = lifeCapsule4(), -- Plantation (Puppy)
-    capsule5G = lifeCapsule5(), -- Sacred Grounds
-
-    --------------
-    -- MISSILES --
-    --------------
-    missileA = missiles(), -- Grasstown
-    missileB = missiles(), -- Grasstown Hut
-    missileC = missiles(), -- Egg Corridor?
-    missileD = {           -- Egg Observation Room? (arbitrarily making this a backup Super Missile chest)
-      name = "Missile Expansion (Super Missile alt)",
-      script = "<EVE0038",
-      attributes = {"weapon", "missileLauncher", "nonProgressive", "helpful"}
-    }, 
-    missileHell = {
-      name = "Missile Expansion",
-      script = "<EVE0035",
-      attributes = {"weapon", "missileLauncher", "nonProgressive", "helpful"}
-    },
-
-    ------------
-    -- EVENTS --
-    ------------
-    eventSue = event("Saved Sue"),
-    eventFans = event("Activated Fans"),
-    eventKazuma = event("Saved Kazuma"),
-    eventOmega = event("Defeated Omega"),
-    eventToroko = event("Defeated Toroko+"),
-    eventCore = event("Defeated the Core"),
-    eventCurly = event("Saved Curly"),
-    eventRocket = event("Built Rocket"),
-
-    ----------------
-    -- GAME MODES --
-    ----------------
-    objBadEnd = objective("Bad Ending", "<FL+6003"),
-    objNormalEnd = objective("Normal Ending", "<FL+6000"),
-    objBestEnd = objective("Best Ending", "<FL+6001"),
-    objAllBosses = objective("All Bosses", "<FL+6002<IT+0005"),
-    obj100Percent = objective("100%", "<FL+6004<IT+0005")
-  }
-
-  local function initializeHints(item)
-    local hintArray = {
-      --mandatory = {"a required item"},
-      puppy = {"a puppy", "a living being"},
-      --helpful = {"a helpful item"},
-      --useless = {"a useless item"},
-      weapon = {"a weapon"},
-      --weaponSN = {"a weapon that breaks blocks"},
-      --weaponStrong = {"a strong weapon"},
-      flight = {"a method of flight", "flight"},
-      missileLauncher = {"a Missile upgrade"}
-    }
-  
-    item.hints = item.hints or {} -- initialize item's hints array if not already
-  
-    -- loop through item's attributes and add any matching hints from the hintArray table
-    for k,v in ipairs(item.attributes) do
-      for k2,v2 in ipairs(hintArray[v] or {}) do
-        table.insert(item.hints, v2)
-      end
-    end
-  end
-
-  local array = {}
-  for k, t in pairs(data) do
-    t.key = k
-    t.placed = t.placed or false
-    t.attributes = t.attributes or {}
-    table.insert(t.attributes, k)
-    table.insert(array, t)
-
-    initializeHints(t)
-  end
-
-  return array
-end
-
-local C = Class:extend()
-
-function C:new()
-  self.itemData = _itemData()
-end
-
-function C:getByKey(key)
-  return _.filter(self.itemData, function(k,v) return v.key == key end)[1]
-end
-
-function C:_getItems(filterFn)
-  return _.filter(self.itemData, filterFn)
-end
-
-function C:getItems()
-  return self:_getItems(function(k,v) return true end)
-end
-
-function C:getItemsByAttribute(attribute, onlyUnplaced)
-  onlyUnplaced = onlyUnplaced or false
-  return self:_getItems(function(k,v) return _.contains(v.attributes, attribute) and not (onlyUnplaced and v.placed) end)
-end
-
-function C:getEvents()
-  return self:getItemsByAttribute("event")
-end
-
-function C:getOptionalItems(onlyUnplaced)
-  return self:getItemsByAttribute("nonProgressive", onlyUnplaced)
-end
-
-function C:getMandatoryItems(onlyUnplaced)
-  return self:getItemsByAttribute("mandatory", onlyUnplaced)
-end
-
-function C:getMandatory()
-  return self:_getItems(function(k,v) return not _.contains(v.attributes, "nonProgressive") end)
-end
-
-function C:getUnplacedItems()
-  return self:_getItems(function(k,v) return not v.placed end)
-end
-
-function C:unplacedString()
-  local s = "\r\nUnplaced items:"
-  for k,v in pairs(self:getUnplacedItems()) do s = s .. "\r\n" .. v.name end
-  return s
-end
-
-local function _hint(message, l, ending)
-  ending = ending or "<END"
-  local MSGBOXLIMIT = 35
-  local PATTERN = " [^ ]*$"
-  local line1, line2, line3 = "", "", ""
-
-  local split = 1
-  line1 = message:sub(split, split+MSGBOXLIMIT)
-
-  if line1:find(PATTERN) and #message > MSGBOXLIMIT then
-    line1 = line1:sub(1, line1:find(PATTERN))
-    split = line1:find(PATTERN)+split
-    if split ~= MSGBOXLIMIT then line2 = "\r\n" end
-    line2 = line2 .. message:sub(split, split+MSGBOXLIMIT)
-
-    if line2:find(PATTERN) and #message > MSGBOXLIMIT*2 then
-      line2 = line2:sub(1, line2:find(PATTERN))
-      split = line2:find(PATTERN)+split-2
-      if split ~= MSGBOXLIMIT then line3 = "\r\n" end
-      line3 = line3 .. message:sub(split, split+MSGBOXLIMIT)
-    end
-  end
-
-  local s = "<PRI<MSG<TUR" .. line1 .. line2 .. line3 .. "<NOD" .. ending
-
-  return {
-    name = ("%q [%s] [%s]"):format(message, l.item.name, l.name),
-    atrributes = {"hint", "abstract"},
-    placed = true,
-    script = s
-  }
-end
-
-function C:createHint(l, ending)
-  local function pick(t) return t[love.math.random(#t)] end
-
-  local location, item = l:getHint()
-  local starts = {"I hear that ", "Rumour has it, ", "They say "}
-  local mids = {" can be found ", " is ", " is hidden "}
-  local message = (pick(starts) or "") .. (pick(item) or "") .. (pick(mids) or "") .. (pick(location) or "") .. "."
-
-  return _hint(message, l, ending)
-end
-
-function C:prebuiltHint(l, ending)
-  return _hint(l:getPrebuiltHint(), l, ending)
-end
-  
-return C
diff --git a/src/database/location.lua b/src/database/location.lua
deleted file mode 100644
index 6fb6a71..0000000
--- a/src/database/location.lua
+++ /dev/null
@@ -1,53 +0,0 @@
-local C = Class:extend()
-
-function C:new(name, map, event, region, hints)
-  self.name = name
-  self.map = map
-  self.event = event
-  self.region = region
-  self.hintList = hints or {}
-end
-
-function C:fill(item, items)
-  local old = self.item
-  self:setItem(item)
-  if self:canAccess(items) then return true end
-  self:setItem(old)
-  return false
-end
-
-function C:canAccess(items)
-  if not self.region:canAccess(items) then return false end
-  if self.requirements == nil then return true end
-  return self.requirements(self, items)
-end
-
-function C:hasItem()
-  return self.item ~= nil
-end
-
-function C:setItem(item)
-  item.placed = true
-  item.location_name = self.name
-  self.item = item
-end
-
-function C:writeItem(tscFiles, item)
-  item = item or self.item
-  if item == nil then
-    logError("No item at " .. self.name)
-    return
-  end
-  if self.map == nil or self.event == nil or item.script == nil then return end
-  tscFiles[self.map]:placeItemAtLocation(item, self)
-end
-
-function C:getHint()
-  return _.append(self.region.hintList, self.hintList), self.item.hints
-end
-
-function C:getPrebuiltHint()
-  return nil
-end
-
-return C
\ No newline at end of file
diff --git a/src/database/music.lua b/src/database/music.lua
deleted file mode 100644
index d819743..0000000
--- a/src/database/music.lua
+++ /dev/null
@@ -1,280 +0,0 @@
-local song = Class:extend()
-function song:new(name, id, jingle, game)
-  self.name = name
-  self.id = id
-  self.jingle = jingle or false
-  self.game = game or "vanilla"
-end
-
-local songs = {
-  xxxx = song("XXXX", "0000", true),
-  mischievousRobot = song("Mischievous Robot", "0001"),
-  safety = song("Safety", "0002"),
-  gameOver = song("Game Over", "0003", true),
-  gravity = song("Gravity", "0004"),
-  onToGrasstown = song("On to Grasstown", "0005"),
-  meltdown = song("Meltdown 2", "0006"),
-  eyesOfFlame = song("Eyes of Flame", "0007"),
-  gestation = song("Gestation", "0008"),
-  mimigaTown = song("Mimiga Town", "0009"),
-  getItem = song("Get Item!", "0010", true),
-  balrogsTheme = song("Balrog's Theme", "0011"),
-  cemetary = song("Cemetary", "0012"),
-  plant = song("Plant", "0013"),
-  pulse = song("Pulse", "0014"),
-  victory = song("Victory!", "0015", true),
-  getLifeCapsule = song("Get Life Capsule!", "0016", true),
-  tyrant = song("Tyrant", "0017"),
-  run = song("Run!", "0018"),
-  jenka1 = song("Jenka 1", "0019"),
-  labyrinthFight = song("Labyrinth Fight", "0020"),
-  access = song("Access", "0021"),
-  oppression = song("Oppression", "0022"),
-  geothermal = song("Geothermal", "0023"),
-  caveStory = song("Cave Story", "0024"),
-  moonsong = song("Moonsong", "0025"),
-  herosEnd = song("Hero's End", "0026"),
-  scorchingBack = song("Scorching Back", "0027"),
-  quiet = song("Quiet", "0028"),
-  finalCave = song("Final Cave", "0029"),
-  balcony = song("Balcony", "0030"),
-  charge = song("Charge", "0031"),
-  lastBattle = song("Last Battle", "0032"),
-  theWayBackHome = song("The Way Back Home", "0033"),
-  zombie = song("Zombie", "0034"),
-  breakDown = song("Break Down", "0035"),
-  runningHell = song("Running Hell", "0036"),
-  jenka2 = song("Jenka 2", "0037"),
-  livingWaterway = song("Living Waterway", "0038"),
-  sealChamber = song("Seal Chamber", "0039"),
-  torokosTheme = song("Toroko's Theme", "0040"),
-  white = song('"White"', "0041"),
-  windFortress = song("Wind Fortress", "0042", false, "beta"),
-  halloween2 = song("Halloween 2", "0043", false, true),
-  peopleOfTheRoot = song("People of the Root", "0044", false, "beta"),
-  pierWalk = song("Pier Walk", "0045", false, "beta"),
-  snoopyCake = song("Snoopy Cake", "0046", false, "beta"),
-  dataSlots = song("Data Slots", "0047", false, "kero"),
-  catAndFrog = song("Cat & Frog Corp.", "0048", false, "kero"),
-  --itsMyBlaster = song("It's My Blaster!", "0049", false, "kero"),
-  shoppingCart = song("Shopping Cart", "0050", false, "kero"),
-  prothallium = song("Prothallium", "0051", false, "kero"),
-  hardCording = song("Hard Cording", "0052", false, "kero"),
-  newItem = song("New Item!", "0053", false, "kero"), --kind of jingle, kind of not?
-  checkinOut = song("Check'IN Out", "0054", false, "kero"),
-  sukima = song("SUKIMA", "0055", false, "kero"),
-  relaxation = song("Relaxation", "0056", false, "kero"),
-  chemistry = song("Chemistry", "0057", false, "kero"),
-  --arrival = song("Arrival", "0058", false, "kero"),
-  freezeDraft = song("Freeze Draft", "0059", false, "kero"),
-  magicNumber = song("Magic Number", "0060", false, "kero"),
-  --timeTable = song("Time Table", "0061", false, "kero"),
-  --number1119 = song("Number 1119", "0061", false, "kero"),
-  trainStation = song("Train Station", "0062", false, "kero"),
-  --totoStation = song("ToTo Station", "0063", false, "kero"),
-  kaishaMan = song("Kaisha Man", "0064", false, "kero"),
-  zombeat = song("Zombeat", "0065", false, "kero"),
-  --oyasumiSong = song("Oyasumi Song", "0066", false, "kero"),
-  --changeSpec = song("Change Spec", "0067", false, "kero"),
-  --curtainRise = song("Curtain Rise", "0068", false, "kero"),
-  --creditsOfKero = song("Credits of Kero", "0069", false, "kero"),
-  --myPreciousDays = song("My Precious Days", "0070", false, "kero"),
-  --excuseMe = song("Excuse Me...", "0071", false, "kero"),
-}
-
-local cue = Class:extend()
-function cue:new(map, events, default)
-  self.map = map
-  self.events = events
-  self.songid = default
-  self.default = default
-end
-
-local cues = {
-  cue("0", {"0100"}, "0033"),
-  cue("0", {"0200"}, "0001"),
-  cue("Pens1", {"0090", "0091", "0092", "0093", "0094", "0099"}, "0002"),
-  cue("Pens1", {"0095", "0098"}, "0014"),
-  cue("Eggs", {"0090", "0091", "0092", "0093", "0094", "0095", "0099", "0503"}, "0001"),
-  cue("Eggs", {"0600"}, "0004"),
-  cue("EggX", {"0095"}, "0014"),
-  cue("EggR", {"0090", "0091", "0092", "0093", "0094"}, "0008"),
-  cue("Weed", {"0090", "0091", "0092", "0093", "0094", "0098", "0099", "0600"}, "0005"),
-  cue("Santa", {"0090", "0091", "0092", "0093", "0094"}, "0002"),
-  cue("Santa", {"0099"}, "0028"),
-  cue("Chako", {"0090", "0091", "0092", "0093", "0094"}, "0002"),
-  cue("Chako", {"0099"}, "0028"),
-  cue("MazeI", {"0090", "0091", "0092", "0093", "0094", "0400", "0601"}, "0019"),
-  cue("Sand", {"0090", "0091", "0092", "0093", "0094", "0099", "0210", "0601"}, "0006"),
-  cue("Sand", {"0202"}, "0007"),
-  cue("Mimi", {"0090", "0091", "0092", "0093", "0094", "0302"}, "0009"),
-  cue("Mimi", {"0095", "0096", "0097", "0098", "0099"}, "0028"),
-  cue("Cave", {"0090", "0091", "0092", "0093", "0094"}, "0008"),
-  cue("Start", {"0090", "0091", "0092", "0093", "0094"}, "0008"),
-  cue("Barr", {"0090", "0091", "0092", "0093", "0094", "0402", "1001"}, "0008"),
-  cue("Barr", {"1000"}, "0011"),
-  cue("Barr", {"1000"}, "0004"),
-  cue("Pool", {"0090", "0091", "0092", "0093", "0094"}, "0009"),
-  cue("Pool", {"0095", "0096", "0097", "0098", "0099", "0410"}, "0028"),
-  cue("Cemet", {"0090", "0091", "0092", "0093", "0094"}, "0012"),
-  cue("Plant", {"0090", "0091", "0092", "0093", "0094"}, "0013"),
-  cue("Plant", {"0095", "0096", "0097", "0098", "0099"}, "0028"),
-  cue("Shelt", {"0090", "0091", "0092", "0093", "0094", "0099"}, "0008"),
-  cue("Comu", {"0090", "0091", "0092", "0093", "0094"}, "0009"),
-  cue("Comu", {"0095", "0096", "0097", "0098", "0099"}, "0028"),
-  cue("Cthu", {"0090", "0091", "0092", "0093", "0094"}, "0008"),
-  cue("Malco", {"0090", "0091", "0092", "0093", "0094", "0203"}, "0008"),
-  cue("Malco", {"0200", "0204"}, "0004"),
-  cue("Malco", {"0200"}, "0011"),
-  cue("Frog", {"0090", "0091", "0092", "0093", "0094", "1000"}, "0008"),
-  cue("Frog", {"0202"}, "0011"),
-  cue("Frog", {"0202"}, "0007"),
-  cue("Curly", {"0090", "0091", "0092", "0093", "0094"}, "0002"),
-  cue("Curly", {"0300"}, "0004"),
-  cue("WeedB", {"0302"}, "0004"),
-  cue("Stream", {"0090", "0091", "0092", "0093", "0094"}, "0018"),
-  cue("Jenka1", {"0090", "0091", "0092", "0093", "0094"}, "0019"),
-  cue("Gard", {"0502"}, "0017"),
-  cue("Gard", {"0502"}, "0018"),
-  cue("Gard", {"0502"}, "0004"),
-  cue("Jenka2", {"0090", "0091", "0092", "0093", "0095", "0200"}, "0019"),
-  cue("Jenka2", {"0094"}, "0011"),
-  cue("SandE", {"0090", "0091", "0092", "0093", "0094", "0600"}, "0006"),
-  cue("SandE", {"0600"}, "0011"),
-  cue("MazeH", {"0090", "0091", "0092", "0093", "0094"}, "0019"),
-  cue("MazeW", {"0090", "0091", "0092", "0093", "0094", "1000"}, "0037"),
-  cue("MazeW", {"0302"}, "0007"),
-  cue("MazeO", {"0090", "0091", "0092", "0093", "0094"}, "0002"),
-  cue("MazeD", {"0400"}, "0004"),
-  cue("MazeA", {"0090", "0091", "0092", "0093", "0094", "0301"}, "0008"),
-  cue("MazeB", {"0090", "0091", "0092", "0093", "0094", "0099"}, "0008"),
-  cue("MazeS", {"0090", "0091", "0092", "0093", "0094", "0310", "0600"}, "0008"),
-  cue("MazeS", {"0321"}, "0011"),
-  cue("MazeS", {"0321"}, "0004"),
-  cue("MazeM", {"0090", "0091", "0092", "0093", "0094", "0301"}, "0020"),
-  cue("Drain", {"0090", "0091", "0092", "0093", "0094", "0150"}, "0008"),
-  cue("Drain", {"0095", "0096", "0097"}, "0023"),
-  cue("Almond", {"0090", "0091", "0092", "0093", "0094", "0361"}, "0023"),
-  cue("Almond", {"0452", "0500"}, "0022"),
-  cue("River", {"0090", "0091", "0092", "0093", "0094", "0095"}, "0038"),
-  cue("Eggs2", {"0090", "0091", "0092", "0093", "0094", "0099"}, "0027"),
-  cue("Cthu2", {"0090", "0091", "0092", "0093", "0094"}, "0008"),
-  cue("EggR2", {"0090", "0091", "0092", "0093", "0094", "1000"}, "0008"),
-  cue("EggR2", {"0304"}, "0004"),
-  cue("EggX2", {"0090", "0091", "0092", "0093", "0095"}, "0014"),
-  cue("Oside", {"0090", "0091", "0092", "0093", "0094"}, "0025"),
-  cue("Oside", {"0402"}, "0026"),
-  cue("Itoh", {"0090", "0091", "0092", "0093", "0094", "0095"}, "0008"),
-  cue("Cent", {"0090", "0091", "0092", "0093", "0094"}, "0024"),
-  cue("Jail1", {"0090", "0091", "0092", "0093", "0094", "0220"}, "0008"),
-  cue("Momo", {"0090", "0091", "0092", "0093", "0094", "0280", "0281"}, "0002"),
-  cue("Lounge", {"0090", "0091", "0092", "0093", "0094"}, "0002"),
-  cue("Jail2", {"0090", "0091", "0092", "0093", "0094", "0099"}, "0008"),
-  cue("Blcny1", {"0090", "0091", "0092", "0093", "0094"}, "0030"),
-  cue("Priso1", {"0090", "0091", "0092", "0093", "0094"}, "0029"),
-  cue("Ring1", {"0090", "0091", "0092", "0093", "0094", "0097", "0098", "0402"}, "0030"),
-  cue("Ring1", {"0502", "0503"}, "0007"),
-  cue("Ring1", {"0099"}, "0018"),
-  cue("Ring2", {"0090", "0091", "0092", "0093", "0094", "0098", "0420"}, "0030"),
-  cue("Ring2", {"0502"}, "0007"),
-  cue("Ring2", {"0410"}, "0031"),
-  cue("Ring2", {"0099"}, "0018"),
-  cue("Prefa1", {"0090", "0091", "0092", "0093", "0094"}, "0030"),
-  cue("Priso2", {"0090", "0091", "0092", "0093", "0094", "0250"}, "0029"),
-  cue("Priso2", {"0241"}, "0004"),
-  cue("Ring3", {"0502"}, "0034"),
-  cue("Ring3", {"0502"}, "0032"),
-  cue("Ring3", {"0600"}, "0018"),
-  cue("Little", {"0090", "0091", "0092", "0093", "0094"}, "0002"),
-  cue("Blcny2", {"0090", "0091", "0092", "0093", "0094", "0310"}, "0018"),
-  cue("Blcny2", {"0400"}, "0035"),
-  cue("Pixel", {"0090", "0091", "0092", "0093", "0094", "0253"}, "0014"),
-  cue("Hell1", {"0090", "0091", "0092", "0094", "0096"}, "0036"),
-  cue("Hell2", {"0090", "0091", "0092", "0093", "0094"}, "0036"),
-  cue("Hell3", {"0090", "0091", "0092", "0093", "0094"}, "0036"),
-  cue("Hell3", {"0300"}, "0007"),
-  cue("Mapi", {"0420"}, "0004"),
-  cue("Statue", {"0100"}, "0024"),
-  cue("Ballo1", {"0095"}, "0039"),
-  cue("Ballo1", {"0500"}, "0004"),
-  cue("Ballo1", {"0900"}, "0007"),
-  cue("Ballo1", {"1000"}, "0032"),
-  cue("Pole", {"0090", "0091", "0092", "0093", "0094", "0095"}, "0008"),
-  cue("Ballo2", {"0500"}, "0034")
-}
-
-local music = Class:extend()
-function music:new()
-  self.vanillaEnabled = true
-  self.betaEnabled = false
-  self.keroEnabled = false
-  self.songs = songs
-  self.cues = cues
-  self.flavor = "Shuffle"
-end
-
-local _isValid =  function(key, song, self, canRemap)
-  if song.jingle then return false end
-  if song.game == "vanilla" and (canRemap or self.vanillaEnabled) then return true end
-  if song.game == "beta" and self.betaEnabled then return true end
-  if song.game == "kero" and self.keroEnabled then return true end
-  return false
-end
-
-function music:getShuffledSongs()
-  return _.shuffle(_.filter(self.songs, _isValid, self))
-end
-
-function music:getCues()
-  return self.cues
-end
-
-function music:shuffleMusic(tscFiles)
-  if self.flavor == "Shuffle" then self:_shuffle(tscFiles) end
-  if self.flavor == "Random" then self:_random(tscFiles) end
-  if self.flavor == "Chaos" then self:_chaos(tscFiles) end
-end
-
--- SHUFFLE songs: every cue with a given song becomes the same, new song
-function music:_shuffle(tscFiles)
-  local shuffled = self:getShuffledSongs()
-
-  local idmap = _.map(self.songs, function (k,v)
-    -- don't remap any invalid songs
-    if not _isValid(k,v,self,true) then return v.id, v.id end
-    if #shuffled == 0 then shuffled = self:getShuffledSongs() end
-    return v.id, _.pop(shuffled).id
-  end)
-
-  for k,cue in pairs(self.cues) do
-    cue.songid = idmap[cue.songid]
-  end
-  self:writeCues(tscFiles)
-end
-
--- RANDOMIZE songs: any cue can play any song
-function music:_random(tscFiles)
-  for k,cue in pairs(self.cues) do
-    cue.songid = self:getShuffledSongs()[1].id
-  end
-  self:writeCues(tscFiles)
-end
-
--- CHAOTICALLY RANDOMIZE songs: nearly any <CMU can play any song
-function music:_chaos(tscFiles)
-  for k,cue in pairs(self.cues) do
-    for k,event in ipairs(cue.events) do
-      tscFiles[cue.map]:placeSongAtCue(self:getShuffledSongs()[1].id, event, cue.map, cue.default)
-    end
-  end
-end
-
-function music:writeCues(tscFiles)
-  for k,cue in pairs(self.cues) do
-    for k,event in ipairs(cue.events) do
-      tscFiles[cue.map]:placeSongAtCue(cue.songid, event, cue.map, cue.default)
-    end
-  end
-end
-
-return music
diff --git a/src/database/region.lua b/src/database/region.lua
deleted file mode 100644
index 0ebc8f4..0000000
--- a/src/database/region.lua
+++ /dev/null
@@ -1,38 +0,0 @@
-local C = Class:extend()
-
-function C:new(worldGraph, name, hints)
-  self.locations = {}
-  self.world = worldGraph
-  self.name = name
-  self.order = worldGraph.order
-  worldGraph.order = worldGraph.order + 1
-  self.hintList = hints or {}
-end
-
-function C:canAccess(items)
-  if self.requirements == nil then return true end
-  return self.requirements(self, items)
-end
-
-function C:getLocation(key)
-  return self.locations[key]
-end
-
-function C:getLocations(filterFn)
-  filterFn = filterFn or function(k,v) return true end
-  return _.filter(self.locations, filterFn)
-end
-
-function C:getEmptyLocations()
-  return self:getLocations(function(k,v) return not v:hasItem() end)
-end
-
-function C:getFilledLocations()
-  return self:getLocations(function(k,v) return v:hasItem() end)
-end
-
-function C:writeItems(tscFiles)
-  for key, location in pairs(self.locations) do location:writeItem(tscFiles) end
-end
-
-return C
\ No newline at end of file
diff --git a/src/database/world_graph.lua b/src/database/world_graph.lua
deleted file mode 100644
index 768696f..0000000
--- a/src/database/world_graph.lua
+++ /dev/null
@@ -1,772 +0,0 @@
-local Region = require 'database.region'
-local Location = require 'database.location'
-
-function _has(items, attribute)
-  return _count(items, attribute, 1)
-end
-
-function _num(items, attribute)
-  return #_.filter(items, function(k,v) return _.contains(v.attributes or {}, attribute) end)
-end
-
-function _count(items, attribute, num)
-  return _num(items, attribute) >= num
-end
-
-function _hp(items, hp)
-  return 3 + (_num(items, "hp3") * 3) + (_num(items, "hp4") * 4) + (_num(items, "hp5") * 5)
-end
-
-local firstCave = Region:extend()
-function firstCave:new(worldGraph)
-  firstCave.super.new(self, worldGraph, "First Cave", {"in First Cave"})
-  self.locations = {
-    firstCapsule = Location("First Cave Life Capsule", "Cave", "0401", self),
-    gunsmithChest = Location("Hermit Gunsmith Chest", "Pole", "0202", self, {"at someone's house", "with Tetsuzou"}),
-    gunsmith = Location("Tetsuzou", "Pole", "0303", self, {"at someone's house", "with Tetsuzou"}),
-    objective = Location("Game Settings", "Start", "0201", self)
-  }
-
-  self.requirements = function(self, items)
-    return _has(items, "flight") and _has(items, "weaponSN") and self.world.regions.mimigaVillage:canAccess(items)
-  end
-
-  self.locations.gunsmith.requirements = function(self, items)
-    return _has(items, "polarStar") and _has(items, "eventCore")
-  end
-
-  -- individual location access requirement overrides
-  self.locations.firstCapsule.canAccess = function(self, items)
-    if self.region.world:StartPoint() then return true end -- TODO remember to add a check for Entrance Rando here
-    return Location.canAccess(self, items)
-  end
-
-  self.locations.gunsmithChest.canAccess = function(self, items)
-    if self.region.world:StartPoint() then return true end -- TODO remember to add a check for Entrance Rando here
-    return Location.canAccess(self, items)
-  end
-end
-
-local mimigaVillage = Region:extend()
-function mimigaVillage:new(worldGraph)
-  mimigaVillage.super.new(self, worldGraph, "Mimiga Village", {"in Mimiga Village"})
-  self.locations = {
-    yamashita = Location("Yamashita Farm", "Plant", "0401", self, {"underwater", "in a garden"}),
-    reservoir = Location("Reservoir", "Pool", "0301", self, {"underwater"}),
-    mapChest = Location("Mimiga Village Chest", "Mimi", "0202", self),
-    assembly = Location("Assembly Hall Fireplace", "Comu", "0303", self, {"in a fireplace"}),
-    mrLittle = Location("Mr. Little (Graveyard)", "Cemet", "0202", self, {"in the Graveyard", "with a very little man, hiding in the grass"}),
-    grave = Location("Arthur's Grave", "Cemet", "0301", self, {"with a fallen hero..", "in the Graveyard"}),
-    mushroomChest = Location("Storage? Chest", "Mapi", "0202", self, {"in the Graveyard"}),
-    maPignon = Location("Ma Pignon Boss", "Mapi", "0501", self, {"behind a boss", "behind Ma Pignon", "in the Graveyard"})
-  }
-
-  self.requirements = function(self, items)
-    if self.world:StartPoint() then
-      return _has(items, "weaponSN")
-    elseif self.world:Camp() or self.world:Arthur() then
-      return _has(items, "arthurKey") and self.world.regions.arthur:canAccess(items) or self.world.regions.waterway:canAccess(items)
-    end
-  end
-
-  self.locations.assembly.requirements = function(self, items) return _has(items, "juice") end
-  self.locations.mrLittle.requirements = function(self, items) return _has(items, "locket") end
-  self.locations.grave.requirements = function(self, items) return _has(items, "locket") end
-  self.locations.mushroomChest.requirements = function(self, items)
-    return _has(items, "flight") and _has(items, "locket") and _has(items, "eventCurly")
-  end
-  self.locations.maPignon.requirements = function(self, items)
-    -- stupid mushroom is invincible to the blade and machinegun for some reason
-    if _has(items, "flight") and _has(items, "locket") and _has(items, "mushroomBadge") then
-      if _has(items, "polarStar") or _has(items, "fireball") or _has(items, "bubbler")
-      or _has(items, "machineGun") or _has(items, "snake") or _has(items, "nemesis") then
-        return true
-      end
-    end
-    return false
-  end
-
-  --self.locations.mrLittle:setItem(self.world.items:getByKey("mrLittle"))
-end
-
-local arthur = Region:extend()
-function arthur:new(worldGraph)
-  arthur.super.new(self, worldGraph, "Arthur's House", {"in Mimiga Village", "at Arthur's House", "at someone's house"})
-  self.locations = {
-    risenBooster = Location("Professor Booster", "Pens1", "0652", self)
-  }
-
-  self.requirements = function(self, items)
-    if self.world:StartPoint() then
-      return _has(items, "arthurKey") and _has(items, "weaponSN") and self.world.regions.mimigaVillage:canAccess(items)
-    elseif self.world:Camp() then
-      return self.world.regions.labyrinthB:canAccess(items)
-    elseif self.world:Arthur() then
-      return true
-    end
-  end
-
-  self.locations.risenBooster.requirements = function(self, items) return _has(items, "eventCore") end
-end
-
-local eggCorridor1 = Region:extend()
-function eggCorridor1:new(worldGraph)
-  eggCorridor1.super.new(self, worldGraph, "Egg Corridor", {"in the Egg Corridor", "in the normal Egg Corridor"})
-  self.locations = {
-    basil = Location("Basil Spot", "Eggs", "0403", self),
-    cthulhu = Location("Cthulhu's Abode", "Eggs", "0404", self),
-    eggItem = Location("Egg Chest", "Egg6", "0201", self, {"in an egg"}),
-    observationChest = Location("Egg Observation Room Chest", "EggR", "0301", self, {"in the Egg Observation Room"}),
-    eventSue = Location("Saved Sue", nil, nil, self)
-  }
-
-  self.requirements = function(self, items) return self.world.regions.arthur:canAccess(items) end
-
-  self.locations.cthulhu.requirements = function(self, items) return _has(items, "weaponSN") or _has(items, "flight") or self.region.world:_dboost(items, 'cthulhu') end
-  self.locations.eventSue.requirements = function(self, items) return _has(items, "idCard") and _has(items, "weaponBoss") end
-  self.locations.eventSue:setItem(self.world.items:getByKey("eventSue"))
-end
-
-local grasstownWest = Region:extend()
-function grasstownWest:new(worldGraph)
-  grasstownWest.super.new(self, worldGraph, "Grasstown (West)", {"in Grasstown", "in West Grasstown"})
-  self.locations = {
-    keySpot = Location("West Grasstown Floor", "Weed", "0700", self),
-    jellyCapsule = Location("West Grasstown Ceiling", "Weed", "0701", self),
-    santa = Location("Santa", "Santa", "0501", self, {"at Santa's House", "at someone's house"}),
-    charcoal = Location("Santa's Fireplace", "Santa", "0302", self, {"at Santa's House", "at someone's house", "in a fireplace"}),
-    chaco = Location("Chaco's Bed, where you two Had A Nap", "Chako", "0211", self, {"at Chaco's House", "in Chaco's bed", "at someone's house"}),
-    kulala = Location("Kulala Chest", "Weed", "0702", self, {"in a sticky situation"})
-  }
-
-  self.requirements = function(self, items)
-    return self.world.regions.arthur:canAccess(items)
-  end
-
-  self.locations.santa.requirements = function(self, items) return _has(items, "santaKey") end
-  self.locations.charcoal.requirements = function(self, items) return _has(items, "santaKey") and _has(items, "juice") end
-  self.locations.chaco.requirements = function(self, items) return _has(items, "santaKey") end
-  self.locations.kulala.requirements = function(self, items) return _has(items, "santaKey") and _has(items, "weapon") end
-end
-
-local grasstownEast = Region:extend()
-function grasstownEast:new(worldGraph)
-  grasstownEast.super.new(self, worldGraph, "Grasstown (East)", {"in Grasstown", "in East Grasstown"})
-  self.locations = {
-    kazuma1 = Location("Kazuma Crack", "Weed", "0800", self, {"with Kazuma", "at the Shelter"}),
-    kazuma2 = Location("Kazuma Chest", "Weed", "0801", self, {"at the Shelter"}),
-    execution = Location("Execution Chamber", "WeedD", "0305", self),
-    outsideHut = Location("Grasstown East Chest", "Weed", "0303", self, {"at Grasstown Hut"}),
-    hutChest = Location("Grasstown Hut", "WeedB", "0301", self, {"at Grasstown Hut"}),
-    gumChest = Location("Gum Chest", "Frog", "0300", self, {"behind a boss", "behind Balfrog"}),
-    malco = Location("MALCO", "Malco", "0350", self, {"with MALCO", "behind a boss", "behind Balrog 2"}),
-    eventFans = Location("Activated Grasstown Fans", nil, nil, self),
-    eventKazuma = Location("Saved Kazuma", nil, nil, self)
-  }
-
-  self.requirements = function(self, items)
-    if not self.world.regions.arthur:canAccess(items) then return false end
-    if _has(items, "flight") or _has(items, "juice") or (self.world:_dboost(items, 'chaco') and _has(items, "weapon")) or self.world:_dboost(items, 'paxChaco') then
-      if self.world.regions.grasstownWest:canAccess(items) then return true end
-    end
-    if _has(items, "eventKazuma") and _has(items, "weaponSN") and self.world.regions.plantation:canAccess(items) then return true end
-    return false
-  end
-
-  self.locations.kazuma2.requirements = function(self, items) return _has(items, "rustyKey") end
-  self.locations.execution.requirements = function(self, items) return _has(items, "weaponSN") end
-  self.locations.hutChest.requirements = function(self, items) return _has(items, "eventFans") or _has(items, "flight") or self.region.world:_dboost(items, 'flightlessHut') end
-  self.locations.gumChest.requirements = function(self, items)
-    if _has(items, "gumKey") and _has(items, "weaponBoss") then
-      if _has(items, "eventFans") or _has(items, "flight") then return true end
-    end
-    return false
-  end
-  self.locations.malco.requirements = function(self, items) return _has(items, "eventFans") and _has(items, "juice") and _has(items, "charcoal") and _has(items, "gumBase") end
-  self.locations.malco.getPrebuiltHint = function(self) return ("BUT ALL I KNOW HOW TO DO IS MAKE %s..."):format(self.item.hints[love.math.random(#self.item.hints)]:upper()) end
-
-  self.locations.eventFans.requirements = function(self, items) return _has(items, "rustyKey") and _has(items, "weaponBoss") end
-  self.locations.eventFans:setItem(self.world.items:getByKey("eventFans"))
-
-  self.locations.eventKazuma.requirements = function(self, items) return _has(items, "bomb") end
-  self.locations.eventKazuma:setItem(self.world.items:getByKey("eventKazuma"))
-end
-
-local upperSandZone = Region:extend()
-function upperSandZone:new(worldGraph)
-  upperSandZone.super.new(self, worldGraph, "Sand Zone (Upper)", {"in the Sand Zone", "in Upper Sand Zone"})
-  self.locations = {
-    curly = Location("Curly Boss", "Curly", "0518", self, {"in the Sand Zone Residence", "with Curly", "at someone's house"}),
-    panties = Location("Curly's Closet", "CurlyS", "0421", self, {"in the Sand Zone Residence", "at someone's house"}),
-    curlyPup = Location("Puppy (Curly)", "CurlyS", "0401", self, {"in the Sand Zone Residence", "at someone's house", "where a puppy once was"}),
-    sandCapsule = Location("Polish Spot", "Sand", "0502", self),
-    eventOmega = Location("Defeated Omega", nil, nil, self)
-  }
-
-  self.requirements = function(self, items)
-    return self.world.regions.arthur:canAccess(items) and _has(items, "weaponSN")
-  end
-
-  self.locations.curly.requirements = function(self, items) return _has(items, "polarStar") end
-  
-  self.locations.panties.requirements = function(self, items) return _has(items, "weaponBoss") end
-  self.locations.curlyPup.requirements = function(self, items) return _has(items, "weaponBoss") end
-  
-  self.locations.eventOmega.requirements = function(self, items) return _has(items, "weaponBoss") end
-  self.locations.eventOmega:setItem(self.world.items:getByKey("eventOmega"))
-end
-
-local lowerSandZone = Region:extend()
-function lowerSandZone:new(worldGraph)
-  lowerSandZone.super.new(self, worldGraph, "Sand Zone (Lower)", {"in the Sand Zone", "in Lower Sand Zone"})
-  self.locations = {
-    chestPup = Location("Puppy (Chest)", "Sand", "0423", self, {"where a puppy once was"}),
-    darkPup = Location("Puppy (Dark)", "Dark", "0401", self, {"where a puppy once was"}),
-    runPup = Location("Puppy (Run)", "Sand", "0422", self, {"where a puppy once was", "with a puppy"}),
-    sleepyPup = Location("Puppy (Sleep)", "Sand", "0421", self, {"where a puppy once was", "at the far end of Sand Zone"}),
-    pawCapsule = Location("Pawprint Spot", "Sand", "0503", self),
-    jenka = Location("Jenka", "Jenka2", "0221", self, {"with Jenka", "at someone's house", "where a puppy once was"}),
-    king = Location("King", "Gard", "0602", self, {"with a fallen hero..", "in a garden", "behind a boss", "behind Toroko+"}),
-    eventToroko = Location("Defeated Toroko+", nil, nil, self)
-  }
-
-  self.requirements = function(self, items)
-    if self.world:StartPoint() or self.world:Arthur() then
-      return _has(items, "eventOmega") and self.world.regions.upperSandZone:canAccess(items)
-    elseif self.world:Camp() then
-      return self.world.regions.labyrinthW:canAccess(items)
-    end
-  end
-
-  self.locations.jenka.requirements = function(self, items) return _count(items, "puppy", 5) end
-  self.locations.king.requirements = function(self, items) return _has(items, "eventToroko") end
-
-  self.locations.eventToroko.requirements = function(self, items)
-    return _count(items, "puppy", 5) and _has(items, "weaponBoss")
-  end
-  self.locations.eventToroko:setItem(self.world.items:getByKey("eventToroko"))
-
-  self.locations.jenka.getPrebuiltHint = function(self) return ("perhaps I'll give you %s in return..."):format(self.item.hints[love.math.random(#self.item.hints)]) end
-end
-
-local labyrinthW = Region:extend()
-function labyrinthW:new(worldGraph)
-  labyrinthW.super.new(self, worldGraph, "Labyrinth (West)", {"in the Labyrinth", "in West Labyrinth"})
-  self.locations = {
-    mazeCapsule = Location("Labyrinth Life Capsule", "MazeI", "0301", self),
-    turboChaba = Location("Chaba Chest (Machine Gun)", "MazeA", "0502", self, {"with Chaba", "in Chaba's Machine Gun chest"}),
-    snakeChaba = Location("Chaba Chest (Fireball)", "MazeA", "0512", self, {"with Chaba", "in Chaba's Fireball chest"}),
-    whimChaba = Location("Chaba Chest (Spur)", "MazeA", "0522", self, {"with Chaba", "in Chaba's Spur chest"}),
-    campChest = Location("Camp Chest", "MazeO", "0401", self, {"in the Camp"}),
-    physician = Location("Dr. Gero", "MazeO", "0305", self, {"in the Camp"}),
-    puuBlack = Location("Puu Black Boss", "MazeD", "0201", self)
-  }
-
-  self.requirements = function(self, items)
-    if self.world:StartPoint() or self.world:Arthur() then
-      if not self.world.regions.arthur:canAccess(items) then return false end
-      if _has(items, "eventToroko") and self.world.regions.lowerSandZone:canAccess(items) then return true end
-      if _has(items, "flight") and _has(items, "weaponBoss") and self.world.regions.labyrinthB:canAccess(items) then return true end
-      return false
-    elseif self.world:Camp() then
-      return true
-    end
-  end
-
-  self.locations.mazeCapsule.requirements = function(self, items) return _has(items, "weapon") end
-  self.locations.turboChaba.requirements = function(self, items) return _has(items, "machineGun") end
-  self.locations.snakeChaba.requirements = function(self, items) return _has(items, "fireball") end
-  self.locations.whimChaba.requirements = function(self, items) return _count(items, "polarStar", 2) end
-  self.locations.campChest.requirements = function(self, items) return _has(items, "flight") or self.region.world:Camp() or self.region.world:_dboost(items, 'camp') end
-  self.locations.puuBlack.requirements = function(self, items) return _has(items, "clinicKey") and _has(items, "weaponBoss") end
-
-end
-
-local labyrinthB = Region:extend()
-function labyrinthB:new(worldGraph)
-  labyrinthB.super.new(self, worldGraph, "Labyrinth B", {"in the Labyrinth"})
-  self.locations = {
-    fallenBooster = Location("Booster Chest", "MazeB", "0502", self)
-  }
-
-  self.requirements = function(self, items)
-    if self.world:StartPoint() or self.world:Arthur() then
-      return self.world.regions.arthur:canAccess(items)
-    elseif self.world:Camp() then
-      return self.world.regions.labyrinthW:canAccess(items) and _has(items, "weaponBoss")
-    end
-  end
-end
-
-local boulder = Region:extend()
-function boulder:new(worldGraph)
-  boulder.super.new(self, worldGraph, "Labyrinth (East)", {"in the Labyrinth", "in East Labyrinth", "behind a boss"})
-  self.locations = { --include core locations since core access reqs are identical to boulder chamber
-    boulderChest = Location("Boulder Chest", "MazeS", "0202", self, {"behind Balrog 3"}),
-    coreSpot = Location("Robot's Arm", "Almond", "0243", self, {"underwater", "behind the Core"}),
-    curlyCorpse = Location("Drowned Curly", "Almond", "1111", self, {"with Curly", "underwater", "behind the Core"}),
-    eventCore = Location("Defeated Core", nil, nil, self)
-  }
-
-  self.requirements = function(self, items)
-    if not self.world.regions.arthur:canAccess(items) then return false end
-    if _has(items, "cureAll") and _has(items, "weaponBoss") then
-      if self.world.regions.labyrinthW:canAccess(items) then return true end
-    end
-    return false
-  end
-
-  self.locations.eventCore:setItem(self.world.items:getByKey("eventCore"))
-end
-
-local labyrinthM = Region:extend()
-function labyrinthM:new(worldGraph)
-  labyrinthM.super.new(self, worldGraph, "labyrinthM")
-  
-  self.requirements = function(self, items)
-    if not self.world.regions.arthur:canAccess(items) then return false end
-    if self.world.regions.boulder:canAccess(items) then return true end
-    if _has(items, "flight") and self.world.regions.labyrinthW:canAccess(items) then return true end
-    return false
-  end
-end
-
-local waterway = Region:extend()
-function waterway:new(worldGraph)
-  waterway.super.new(self, worldGraph, "Waterway", {"in the Waterway", "underwater", "behind a boss", "behind Ironhead"})
-
-  self.locations = {
-    ironhead = Location("Ironhead Boss", "Pool", "0412", self),
-    eventCurly = Location("Saved Curly", nil, nil, self)
-  }
-
-  self.requirements = function(self, items)
-    if _has(items, "airTank") and _has(items, "weaponBoss") and self.world.regions.labyrinthM:canAccess(items) then return true end
-    return false
-  end
-
-  self.locations.eventCurly.requirements = function(self, items) return _has(items, "eventCore") and _has(items, "towRope") end
-  self.locations.eventCurly:setItem(self.world.items:getByKey("eventCurly"))
-end
-
-local eggCorridor2 = Region:extend()
-function eggCorridor2:new(worldGraph)
-  eggCorridor2.super.new(self, worldGraph, "Egg Corridor?", {"in the Egg Corridor", "in ruined Egg Corridor"})
-
-  self.locations = {
-    dragonChest = Location("Dragon Chest", "Eggs2", "0321", self),
-    sisters = Location("Sisters Boss", "EggR2", "0303", self, {"behind a boss", "in the Egg Observation Room", "behind the Sisters"})
-  }
-
-  self.requirements = function(self, items)
-    if not self.world.regions.arthur:canAccess(items) then return false end
-    if _has(items, "eventCore") then return true end
-    if _has(items, "eventKazuma") and self.world.regions.outerWall:canAccess(items) then return true end
-    return false
-  end
-
-  self.locations.dragonChest.requirements = function(self, items) return _has(items, "weaponSN") or _has(items, "eventCore") end
-  self.locations.sisters.requirements = function(self, items) return _has(items, "weaponBoss") or (self.region.world:_dboost(items, 'sisters') and _has(items, "flight")) end
-end
-
-local outerWall = Region:extend()
-function outerWall:new(worldGraph)
-  outerWall.super.new(self, worldGraph, "Outer Wall", {"outside", "along the Outer Wall"})
-
-  self.locations = {
-    clock = Location("Clock Room", "Clock", "0300", self),
-    littleHouse = Location("Little House", "Little", "0204", self, {"with Mr. Little", "at someone's house"})
-  }
-
-  self.requirements = function(self, items)
-    if not self.world.regions.arthur:canAccess(items) and (_has(items, "weapon") or _hp(items) >= 9 or _has(items, "flight")) then return false end
-    if _has(items, "eventKazuma") and _has(items, "flight") and _has(items, "eventCore") then return true end
-    if _has(items, "teleportKey") and self.world.regions.plantation:canAccess(items) then return true end
-    return false
-  end
-
-  self.locations.littleHouse.requirements = function(self, items) return _has(items, "flight") and _has(items, "blade") and _has(items, "mrLittle") end
-  self.locations.littleHouse.getPrebuiltHint = function(self) return ("He was exploring the island with %s..."):format(self.item.hints[love.math.random(#self.item.hints)]) end
-end
-
-local plantation = Region:extend()
-function plantation:new(worldGraph)
-  plantation.super.new(self, worldGraph, "Plantation", {"in the Plantation", "in a garden"})
-
-  self.locations = {
-    kanpachi = Location("Kanpachi's Bucket", "Cent", "0268", self, {"with Kanpachi", "underwater"}),
-    jail1 = Location("Jail no. 1", "Jail1", "0301", self, {"with Mahin"}),
-    momorin = Location("Chivalry Sakamoto's Wife", "Momo", "0201", self, {"with Momorin", "at someone's house"}),
-    sprinkler = Location("Broken Sprinkler", "Cent", "0417", self, {"for Mimiga only"}),
-    megane = Location("Megane", "Lounge", "0204", self, {"for Mimiga only"}),
-    itoh = Location("Itoh", "Itoh", "0405", self, {"with Itoh"}),
-    plantCeiling = Location("Plantation Platforming Spot", "Cent", "0501", self),
-    plantPup = Location("Plantation Puppy", "Cent", "0452", self, {"with a puppy"}),
-    curlyShroom = Location("Jammed it into Curly's Mouth", "Cent", "0324", self, {"with Curly"}),
-    eventRocket = Location("Built Rocket", nil, nil, self)
-  }
-
-  self.requirements = function(self, items)
-    if not self.world.regions.arthur:canAccess(items) then return false end
-    if _has(items, "teleportKey") then return true end
-    if self.world.regions.outerWall:canAccess(items) then return true end
-    if _has(items, "eventKazuma") and _has(items, "weaponSN") then return true end
-    return false
-  end
-
-  self.locations.jail1.requirements = function(self, items) return _has(items, "teleportKey") end
-  self.locations.momorin.requirements = function(self, items) return _has(items, "letter") and _has(items, "booster") end
-  self.locations.sprinkler.requirements = function(self, items) return _has(items, "mask") end
-  self.locations.megane.requirements = function(self, items) return _has(items, "brokenSprinkler") and _has(items, "mask") end
-  self.locations.itoh.requirements = function(self, items) return _has(items, "letter") end
-  self.locations.plantCeiling.requirements = function(self, items) return _has(items, "flight") or self.region.world:_dboost(items, 'plantation') end
-  self.locations.plantPup.requirements = function(self, items) return _has(items, "eventRocket") end
-  self.locations.curlyShroom.requirements = function(self, items) return _has(items, "eventCurly") and _has(items, "maPignon") end
-
-  self.locations.eventRocket.requirements = function(self, items)
-    return _has(items, "letter") and _has(items, "booster") and _has(items, "controller") and _has(items, "newSprinkler")
-  end
-  self.locations.eventRocket:setItem(self.world.items:getByKey("eventRocket"))
-end
-
-local lastCave = Region:extend()
-function lastCave:new(worldGraph)
-  lastCave.super.new(self, worldGraph, "Last Cave", {"behind a boss", "in Last Cave", "behind the Red Demon"})
-
-  self.locations = {
-    redDemon = Location("Red Demon Boss", "Priso2", "0300", self)
-  }
-
-  self.requirements = function(self, items) return _has(items, "weaponBoss") and _count(items, "booster", 2) and (_has(items, "eventRocket") or (self.world:_dboost(items, 'rocket') and _has(items, "machineGun") and self.world.regions.plantation:canAccess(items))) end
-end
-
-local endgame = Region:extend()
-function endgame:new(worldGraph)
-  endgame.super.new(self, worldGraph, "Sacred Grounds", {"in Hell"})
-
-  self.locations = {
-    hellB1 = Location("Hell B1 Spot", "Hell1", "0401", self),
-    hellB3 = Location("Hell B3 Chest", "Hell3", "0400", self)
-  }
-
-  local function prebuilt(self)
-    local s = self.item.hints[love.math.random(#self.item.hints)]
-    return ("%s."):format(s:sub(1,1):upper() .. s:sub(2)) -- make first character uppercase
-  end
-  self.locations.hellB1.getPrebuiltHint = prebuilt
-  self.locations.hellB3.getPrebuiltHint = prebuilt
-
-  self.requirements = function(self, items) return false end -- just pretend you never get here
-end
-
-local hintRegion = Region:extend()
-function hintRegion:new(worldGraph)
-  hintRegion.super.new(self, worldGraph, "Hints")
-
-  self.locations = {
-    cthulhuEgg = Location("Cthulhu (his Abode)", "Cthu", "0200", self),
-    cthulhuWeed1 = Location("Cthulhu (West Grasstown)", "Weed", "0201", self),
-    cthulhuWeed2 = Location("Cthulhu (East Grasstown)", "Weed", "0205", self),
-    cthulhuPlant = Location("Cthulhu (Plantation)", "Cent", "0310", self),
-    bluebotEgg = Location("Blue Robot (Egg Corridor)", "Eggs", "0200", self),
-    bluebotEgg2 = Location("Blue Robot (Egg Corridor?)", "Eggs2", "0210", self),
-    bluebotMaze = Location("Blue Robot (Labyrinth I #1)", "MazeI", "0500", self),
-    bluebotMaze2 = Location("Blue Robot (Labyrinth I #2)", "MazeI", "0502", self),
-    mrsLittle = Location("Mrs. Little", "Little", "0212", self),
-    malco = Location("MALCO", "Malco", "0306", self),
-    jenka = Location("Jenka", "Jenka1", "0201", self),
-    numahachi1 = Location("Numahachi 1", "Statue", "0301", self),
-    numahachi2 = Location("Numahachi 2", "Statue", "0302", self)
-  }
-
-  -- they'll appear as filled so they get left out of the regular hints
-  self.locations.mrsLittle.item = {}
-  self.locations.malco.item = {}
-  self.locations.jenka.item = {}
-  self.locations.numahachi1.item = {}
-  self.locations.numahachi2.item = {}
-end
-
-local worldGraph = Class:extend()
-
-function worldGraph:new(items)
-  self.items = items
-  self.order = 0
-  self.spawn = ""
-
-  self.seqbreak = false
-  self.dboosts = {
-    cthulhu = {hp = 3, enabled = true},
-    chaco = {hp = 5, enabled = true},
-    paxChaco = {hp = 10, enabled = true},
-    flightlessHut = {hp = 3, enabled = true},
-    -- revChaco = {hp = 3, enabled = true},
-    -- paxRevChaco = {hp = 8, enabled = true},
-    camp = {hp = 9, enabled = true},
-    sisters = {hp = 0, enabled = true},
-    plantation = {hp = 15, enabled = true},
-    rocket = {hp = 3, enabled = true},
-  }
-
-  self.regions = {
-    firstCave = firstCave(self),
-    mimigaVillage = mimigaVillage(self),
-    arthur = arthur(self),
-    eggCorridor1 = eggCorridor1(self),
-    grasstownWest = grasstownWest(self),
-    grasstownEast = grasstownEast(self),
-    upperSandZone = upperSandZone(self),
-    lowerSandZone = lowerSandZone(self),
-    labyrinthW = labyrinthW(self),
-    labyrinthB = labyrinthB(self),
-    boulder = boulder(self),
-    labyrinthM = labyrinthM(self),
-    waterway = waterway(self),
-    eggCorridor2 = eggCorridor2(self),
-    outerWall = outerWall(self),
-    plantation = plantation(self),
-    lastCave = lastCave(self),
-    endgame = endgame(self)
-  }
-
-  self.hintregion = hintRegion(self)
-
-  self.noFallingBlocks = false
-end
-
-function worldGraph:_dboost(items, key)
-  return self.seqbreak and self.dboosts[key].enabled and _hp(items) > self.dboosts[key].hp
-end
-
-function worldGraph:StartPoint() return self.spawn == "Start Point" end
-function worldGraph:Arthur() return self.spawn == "Arthur's House" end
-function worldGraph:Camp() return self.spawn == "Camp" end
-
-function worldGraph:getSpawnScript()
-  local initialHPCounter = "<FL+4011<FL+4012" -- initializes the HP counter to 3 HP
-  local mapFlagsCMP = "<MP+0040<MP+0043" -- Camp and Labyrinth B
-  local mapFlagsSoftlock = "<MP+0032<MP+0033<MP+0036" -- Small Room (Curly), Jenka's House (both)
-
-  local baseStartScript = initialHPCounter .. mapFlagsCMP .. mapFlagsSoftlock -- TODO: remove mapFlagsSoftlock when playing ER
-
-  if self:StartPoint() then return baseStartScript .. "<FL+6200<EVE0091" end
-
-  local earlyGameFlags = "<FL+0301<FL+0302<FL+1641<FL+1642<FL+0320<FL+0321" -- flags set during first cave in normal gameplay
-  baseStartScript = baseStartScript .. earlyGameFlags
-
-  if self:Arthur() then return baseStartScript .. "<FL+6201<TRA0001:0094:0008:0004" end
-  if self:Camp() then return baseStartScript .. "<FL+6202<TRA0040:0094:0014:0009" end
-end
-
-function worldGraph:canBeatGame(items, obj)
-  if obj == "objBadEnd" then
-
-  end
-  local function normalReqs(self, items) return _has(items, "eventRocket") and _has(items, "eventSue") and self.regions.plantation:canAccess(items) end
-  if obj == "objNormalEnd" then return normalReqs(self, items) end
-
-  local function bestReqs(self, items) return normalReqs(self, items) and _has(items, "ironBond") and _count(items, "booster", 2) end
-  if obj == "objBestEnd" then return bestReqs(self, items) end
-
-  local function bossReqs(self, items)
-    if not (bestReqs(self, items) and _has(items, "weaponBoss")) then return false end
-    -- Igor, Balrog 1, Balrog 3, Core, Sisters
-    if not (_has(items, "eventSue") and _has(items, "eventToroko") and _has(items, "eventCore")) then return false end
-    -- Balrog 2, Balfrog
-    if not (_has(items, "rustyKey") and _has(items, "gumKey") and self.regions.grasstownEast:canAccess(items)) then return false end
-    -- Curly, Omega
-    if not (self.regions.upperSandZone:canAccess(items)) then return false end
-    -- Toroko+
-    if not self.regions.lowerSandZone.locations.king:canAccess(items) then return false end
-    -- Puu Black, Monster X
-    if not (self.regions.labyrinthW:canAccess(items) and _has(items, "clinicKey")) then return false end
-    -- Ironhead
-    if not self.regions.waterway:canAccess(items) then return false end
-    -- Ma Pignon
-    if not self.regions.mimigaVillage.locations.maPignon:canAccess(items) then return false end
-    -- Remaining bosses are all covered by the normal requirements
-    return true
-  end
-  if obj == "objAllBosses" then return bossReqs(self, items) end
-  return false -- I don't actually think the check below works as intended, false is sufficient for now since 100% and completable logic should be mutually exclusive anyway
-  --return #items > #self:getLocations() - #self:getHintLocations() - 2 -- removing ANY items (besides in hell) from 100% makes a seed uncompletable
-end
-
-function worldGraph:getLocations()
-  local locations = {}
-  for key, region in pairs(self.regions) do
-    for k, location in pairs(region:getLocations()) do
-      table.insert(locations, location)
-    end
-  end
-  return locations
-end
-
-function worldGraph:getObjectiveSpot()
-  return {self.regions.firstCave.locations.objective}
-end
-
-function worldGraph:getMALCO()
-  return {self.regions.grasstownEast.locations.malco}
-end
-
-function worldGraph:getCamp()
-  return {self.regions.labyrinthW.locations.physician, self.regions.labyrinthW.locations.campChest}
-end
-
-function worldGraph:getPuppySpots()
-  return {
-    self.regions.upperSandZone.locations.curly,
-    self.regions.upperSandZone.locations.curlyPup,
-    self.regions.upperSandZone.locations.panties,
-    self.regions.upperSandZone.locations.sandCapsule,
-    self.regions.lowerSandZone.locations.chestPup,
-    self.regions.lowerSandZone.locations.darkPup,
-    self.regions.lowerSandZone.locations.runPup,
-    self.regions.lowerSandZone.locations.sleepyPup,
-    self.regions.lowerSandZone.locations.pawCapsule
-  }
-end
-
-function worldGraph:getFirstCaveSpots()
-  return {
-    self.regions.firstCave.locations.firstCapsule,
-    self.regions.firstCave.locations.gunsmithChest
-  }
-end
-
-function worldGraph:getHellSpots()
-  return self.locationsArray(self.regions.endgame:getLocations())
-end
-
-function worldGraph:getEmptyLocations()
-  local locations = {}
-  for key, region in pairs(self.regions) do
-    for k, location in pairs(region:getEmptyLocations()) do
-      table.insert(locations, location)
-    end
-  end
-  return locations
-end
-
-function worldGraph:emptyString()
-  local s = "\r\nEmpty locations:"
-  for key, region in pairs(self.regions) do
-    for k, l in pairs(region:getEmptyLocations()) do
-      s = s .. "\r\n" .. l.name
-    end
-  end
-  return s
-end
-
-function worldGraph:getFilledLocations(realOnly)
-  local locations = {}
-  for key, region in pairs(self.regions) do
-    for k, location in pairs(region:getFilledLocations()) do
-      if not realOnly or not _.find(location.item.attributes,"abstract") then table.insert(locations, location) end
-    end
-  end
-  return locations
-end
-
-function worldGraph:getHintLocations()
-  return self.hintregion:getEmptyLocations()
-end
-
-function worldGraph:getHintableLocations(obj)
-  local locations = {}
-  for k, location in pairs(_.shuffle(self:getFilledLocations(true))) do
-    if location:getPrebuiltHint() ~= nil then
-      -- do nothing
-    elseif (obj == "objBadEnd" and location.item.name == "Rusty Key") or (obj ~= "objBadEnd" and location.item.name == "ID Card") then 
-      table.insert(locations, 1, location) -- put that item on the top to guarantee a hint for it
-    elseif (self:Camp() or self:Arthur()) and location.item.name == "Arthur's Key" then
-      table.insert(locations, 1, location)
-    else
-      table.insert(locations, location)
-    end
-  end
-  return _.slice(locations, 1, #self:getHintLocations())
-end
-
-function worldGraph:writeItems(tscFiles)
-  for key, region in pairs(self.regions) do region:writeItems(tscFiles) end
-  self.hintregion:writeItems(tscFiles)
-end
-
-function worldGraph:collect(preCollectedItems, locations, singleSphere)
-  local collected = _.clone(preCollectedItems, singleSphere) or {}
-  local availableLocations = locations or self:getFilledLocations()
-
-  local inventory = (singleSphere and preCollectedItems) or collected
-
-  local foundItems = 0
-  repeat
-    foundItems = 0
-    -- Collect accessible items and remove those locations from the table
-    -- (to prevent double-collecting, which is bad for Polar Star/Booster)
-    local j, n = 1, #availableLocations
-    for i = 1, n do
-      local location = availableLocations[i]
-      if location:canAccess(inventory) then
-        table.insert(collected, location.item)
-        foundItems = foundItems + 1
-        availableLocations[i] = nil
-      else
-        if j ~= i then
-          availableLocations[j] = availableLocations[i]
-          availableLocations[i] = nil
-        end
-        j = j + 1
-      end
-    end
-  until foundItems == 0
-
-  --[[local s = "Collected items: "
-  for k,v in ipairs(collected) do s = s .. v.name .. ", " end
-  logDebug(s)]]
-  return collected, availableLocations
-end
-
-function worldGraph.locationsArray(locations)
-  local array = {}
-  for k, v in pairs(locations) do
-    table.insert(array, v)
-  end
-  return array
-end
-
-function worldGraph:serialize()
-  local array = {}
-  for k,v in pairs(self.regions) do
-    table.insert(array, v)
-  end
-  table.insert(array, self.hintregion)
-  local function sort(a,b)
-    return a.order < b.order
-  end
-
-  local lines = {}
-
-  for k,r in ipairs(_.sort(array,sort)) do
-    if next(r.locations) then
-      table.insert(lines, "")
-      table.insert(lines, "Region: " .. r.name)
-      for k2,l in pairs(r.locations) do
-        if l.item ~= nil and not _has({l.item}, "event") then
-          table.insert(lines, "\t " .. l.name .. ": " .. l.item.name)
-        end
-      end
-    end
-  end
-
-  return lines
-end
-
-function worldGraph:logLocations()
-  for k,v in ipairs(self:serialize()) do
-    logSpoiler(v)
-  end
-end
-
-return worldGraph
\ No newline at end of file
diff --git a/src/item_deck.lua b/src/item_deck.lua
deleted file mode 100644
index 895168b..0000000
--- a/src/item_deck.lua
+++ /dev/null
@@ -1,69 +0,0 @@
-local C = Class:extend()
-
-local ITEM_DATA = require 'database.items'
-
-function C:new()
-  self._left = {}
-  for k, v in pairs(ITEM_DATA) do
-    local item = _.clone(v)
-    table.insert(self._left, item)
-  end
-  self._placed = {}
-end
-
-local function _filterAny(item) return true end
-
-function C:getAny()
-  return self:_getItem(_filterAny)
-end
-
-function C:getAnyByAttribute(attribute)
-  function _filterAnyByAttribute(item, attribute)
-    for k, v in pairs(item.attributes) do
-      if v == attribute then return true
-    end
-    return false
-  end
-  return self:_getItem(_filterAnyByAttribute)
-end
-
-function C:placeAny()
-  return self:place(self:getAny())
-end
-
-function C:placeAnyByAttribute(attributes)
-  return self:place(self:getAnyByAttribute(attributes))
-end
-
-function C:_getItem(filterFn)
-  -- Filter down to only applicable items.
-  local applicable = {}
-  local indexMap = {}
-  for index, item in ipairs(self._left) do
-    if filterFn(item) then
-      table.insert(applicable, item)
-      indexMap[item] = index
-    end
-  end
-  assert(#applicable >= 1, 'No applicable items!')
-
-  -- Select an item.
-  local selected = _.sample(applicable)
-  local index = indexMap[selected]
-
-  return selected, index
-end
-
-function C:place(item, index)
-  table.remove(self._left, index)
-  table.insert(self._placed, item)
-  return item
-end
-
-function C:getPlacedItems(item)
-  local placed = {table.unpack(self._placed)} -- clone the table
-  if(item) then table.insert(placed, item) end
-  return placed
-end
-
-return C
diff --git a/src/lib/bit.lua b/src/lib/bit.lua
deleted file mode 100644
index dac093f..0000000
--- a/src/lib/bit.lua
+++ /dev/null
@@ -1,260 +0,0 @@
---[[---------------
-LuaBit v0.4
--------------------
-a bitwise operation lib for lua.
-
-http://luaforge.net/projects/bit/
-
-How to use:
--------------------
- bit.bnot(n) -- bitwise not (~n)
- bit.band(m, n) -- bitwise and (m & n)
- bit.bor(m, n) -- bitwise or (m | n)
- bit.bxor(m, n) -- bitwise xor (m ^ n)
- bit.brshift(n, bits) -- right shift (n >> bits)
- bit.blshift(n, bits) -- left shift (n << bits)
- bit.blogic_rshift(n, bits) -- logic right shift(zero fill >>>)
- 
-Please note that bit.brshift and bit.blshift only support number within
-32 bits.
-
-2 utility functions are provided too:
- bit.tobits(n) -- convert n into a bit table(which is a 1/0 sequence)
-               -- high bits first
- bit.tonumb(bit_tbl) -- convert a bit table into a number 
--------------------
-
-Under the MIT license.
-
-copyright(c) 2006~2007 hanzhao (abrash_han@hotmail.com)
---]]---------------
-
-do
-
-------------------------
--- bit lib implementions
-
-local function check_int(n)
- -- checking not float
- if(n - math.floor(n) > 0) then
-  error("trying to use bitwise operation on non-integer!")
- end
-end
-
-local function to_bits(n)
- check_int(n)
- if(n < 0) then
-  -- negative
-  return to_bits(bit.bnot(math.abs(n)) + 1)
- end
- -- to bits table
- local tbl = {}
- local cnt = 1
- while (n > 0) do
-  local last = math.fmod(n,2)
-  if(last == 1) then
-   tbl[cnt] = 1
-  else
-   tbl[cnt] = 0
-  end
-  n = (n-last)/2
-  cnt = cnt + 1
- end
-
- return tbl
-end
-
-local function tbl_to_number(tbl)
- local n = table.getn(tbl)
-
- local rslt = 0
- local power = 1
- for i = 1, n do
-  rslt = rslt + tbl[i]*power
-  power = power*2
- end
- 
- return rslt
-end
-
-local function expand(tbl_m, tbl_n)
- local big = {}
- local small = {}
- if(table.getn(tbl_m) > table.getn(tbl_n)) then
-  big = tbl_m
-  small = tbl_n
- else
-  big = tbl_n
-  small = tbl_m
- end
- -- expand small
- for i = table.getn(small) + 1, table.getn(big) do
-  small[i] = 0
- end
-
-end
-
-local function bit_or(m, n)
- local tbl_m = to_bits(m)
- local tbl_n = to_bits(n)
- expand(tbl_m, tbl_n)
-
- local tbl = {}
- local rslt = math.max(table.getn(tbl_m), table.getn(tbl_n))
- for i = 1, rslt do
-  if(tbl_m[i]== 0 and tbl_n[i] == 0) then
-   tbl[i] = 0
-  else
-   tbl[i] = 1
-  end
- end
- 
- return tbl_to_number(tbl)
-end
-
-local function bit_and(m, n)
- local tbl_m = to_bits(m)
- local tbl_n = to_bits(n)
- expand(tbl_m, tbl_n) 
-
- local tbl = {}
- local rslt = math.max(table.getn(tbl_m), table.getn(tbl_n))
- for i = 1, rslt do
-  if(tbl_m[i]== 0 or tbl_n[i] == 0) then
-   tbl[i] = 0
-  else
-   tbl[i] = 1
-  end
- end
-
- return tbl_to_number(tbl)
-end
-
-local function bit_not(n)
- 
- local tbl = to_bits(n)
- local size = math.max(table.getn(tbl), 32)
- for i = 1, size do
-  if(tbl[i] == 1) then 
-   tbl[i] = 0
-  else
-   tbl[i] = 1
-  end
- end
- return tbl_to_number(tbl)
-end
-
-local function bit_xor(m, n)
- local tbl_m = to_bits(m)
- local tbl_n = to_bits(n)
- expand(tbl_m, tbl_n) 
-
- local tbl = {}
- local rslt = math.max(table.getn(tbl_m), table.getn(tbl_n))
- for i = 1, rslt do
-  if(tbl_m[i] ~= tbl_n[i]) then
-   tbl[i] = 1
-  else
-   tbl[i] = 0
-  end
- end
- 
- --table.foreach(tbl, print)
-
- return tbl_to_number(tbl)
-end
-
-local function bit_rshift(n, bits)
- check_int(n)
- 
- local high_bit = 0
- if(n < 0) then
-  -- negative
-  n = bit_not(math.abs(n)) + 1
-  high_bit = 2147483648 -- 0x80000000
- end
-
- for i=1, bits do
-  n = n/2
-  n = bit_or(math.floor(n), high_bit)
- end
- return math.floor(n)
-end
-
--- logic rightshift assures zero filling shift
-local function bit_logic_rshift(n, bits)
- check_int(n)
- if(n < 0) then
-  -- negative
-  n = bit_not(math.abs(n)) + 1
- end
- for i=1, bits do
-  n = n/2
- end
- return math.floor(n)
-end
-
-local function bit_lshift(n, bits)
- check_int(n)
- 
- if(n < 0) then
-  -- negative
-  n = bit_not(math.abs(n)) + 1
- end
-
- for i=1, bits do
-  n = n*2
- end
- return bit_and(n, 4294967295) -- 0xFFFFFFFF
-end
-
-local function bit_xor2(m, n)
- local rhs = bit_or(bit_not(m), bit_not(n))
- local lhs = bit_or(m, n)
- local rslt = bit_and(lhs, rhs)
- return rslt
-end
-
---------------------
--- bit lib interface
-
-bit = {
- -- bit operations
- bnot = bit_not,
- band = bit_and,
- bor  = bit_or,
- bxor = bit_xor,
- brshift = bit_rshift,
- blshift = bit_lshift,
- bxor2 = bit_xor2,
- blogic_rshift = bit_logic_rshift,
-
- -- utility func
- tobits = to_bits,
- tonumb = tbl_to_number,
-}
-
-end
-
---[[
-for i = 1, 100 do
- for j = 1, 100 do
-  if(bit.bxor(i, j) ~= bit.bxor2(i, j)) then
-   error("bit.xor failed.")
-  end
- end
-end
---]]
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/lib/classic.lua b/src/lib/classic.lua
deleted file mode 100644
index 2d6e0cc..0000000
--- a/src/lib/classic.lua
+++ /dev/null
@@ -1,71 +0,0 @@
--- Copyright (c) 2014, rxi
---
--- Permission is hereby granted, free of charge, to any person obtaining a copy of
--- this software and associated documentation files (the "Software"), to deal in
--- the Software without restriction, including without limitation the rights to
--- use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
--- of the Software, and to permit persons to whom the Software is furnished to do
--- so, subject to the following conditions:
---
--- The above copyright notice and this permission notice shall be included in all
--- copies or substantial portions of the Software.
---
--- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
--- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
--- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
--- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
--- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
--- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
--- SOFTWARE.
-
-local Object = {}
-Object.__index = Object
-
-function Object:new()
-end
-
-function Object:extend()
-  local cls = {}
-  for k, v in pairs(self) do
-    if k:find("__") == 1 then
-      cls[k] = v
-    end
-  end
-  cls.__index = cls
-  cls.super = self
-  setmetatable(cls, self)
-  return cls
-end
-
-function Object:implement(...)
-  for _, cls in pairs({...}) do
-    for k, v in pairs(cls) do
-      if self[k] == nil and type(v) == "function" then
-        self[k] = v
-      end
-    end
-  end
-end
-
-function Object:is(T)
-  local mt = getmetatable(self)
-  while mt do
-    if mt == T then
-      return true
-    end
-    mt = getmetatable(mt)
-  end
-  return false
-end
-
-function Object:__tostring()
-  return "Object"
-end
-
-function Object:__call(...)
-  local obj = setmetatable({}, self)
-  obj:new(...)
-  return obj
-end
-
-return Object
diff --git a/src/lib/luigi/attribute.lua b/src/lib/luigi/attribute.lua
deleted file mode 100644
index 915a9f9..0000000
--- a/src/lib/luigi/attribute.lua
+++ /dev/null
@@ -1,602 +0,0 @@
---[[--
-Widget attributes.
-
-This module defines "attributes" (special fields) that are
-recognized by all widgets. Their interpretation may vary
-depending on the `type` of widget. Some widget types may also
-recognize additional attributes.
-
-Setting attributes can have side effects. For example, setting
-`height` or `width` causes the parent widget and its descendants
-to recalculate their size and position.
---]]--
-
-local ROOT = (...):gsub('[^.]*$', '')
-
-local Shortcut = require(ROOT .. 'shortcut')
-
-local Attribute = {}
-
-local function cascade (widget, attribute)
-    local value = rawget(widget, 'attributes')[attribute]
-    if value ~= nil then return value end
-    local parent = rawget(widget, 'parent')
-    return parent and parent[attribute]
-end
-
---[[--
-Type of widget.
-
-Should contain a string identifying the widget's type.
-After the layout is built, may be replaced by an array
-of strings identifying multiple types. This is used
-internally by some widgets to provide information about
-the widget's state to the theme (themes describe the
-appearance of widgets according to their type).
-
-If a type is registered with the widget's layout, the registered
-type initializer function will run once when the widget is constructed.
-
-@see Widget.register
-
-@attrib type
---]]--
-Attribute.type = {}
-
-function Attribute.type.set (widget, value)
-    local oldType = widget.attributes.type
-
-    widget.attributes.type = value
-
-    if value and not widget.hasType then
-        widget.hasType = true
-        local Widget = require(ROOT .. 'widget')
-        local decorate = Widget.typeDecorators[value]
-
-        if decorate then
-            decorate(widget)
-        end
-    end
-end
-
---[[--
-Widget identifier.
-
-Should contain a unique string identifying the widget, if present.
-
-A reference to the widget will be stored in the associated layout
-in a property having the same name as the widget's id.
-
-Setting this attribute re-registers the widget with its layout.
-
-@attrib id
---]]--
-Attribute.id = {}
-
-function Attribute.id.set (widget, value)
-    local layout = widget.layout.master or widget.layout
-    local oldValue = widget.attributes.id
-
-    if oldValue then
-        layout[oldValue] = nil
-    end
-
-    if value then
-        layout[value] = widget
-    end
-
-    widget.attributes.id = value
-end
-
---[[--
-Widget value.
-
-Some widget types expect the value to be of a specific type and
-within a specific range. For example, `slider` and `progress`
-widgets expect a normalized number, `text` widgets expect
-a string, and `check` and `radio` widgets expect a boolean.
-
-Setting this attribute bubbles the `Change` event.
-
-@attrib value
---]]--
-Attribute.value = {}
-
-function Attribute.value.set (widget, value)
-    local oldValue = widget.value
-    widget.attributes.value = value
-    widget:bubbleEvent('Change', { value = value, oldValue = oldValue })
-end
-
---[[--
-Solidity.
-
-Should true or false.
-
-@attrib icon
---]]--
-Attribute.solid = {}
-
-function Attribute.solid.set (widget, value)
-    widget.attributes.solid = value
-end
-
-Attribute.solid.get = cascade
-
---[[--
-Context menu.
-
-- This attribute cascades.
-
-@attrib context
---]]--
-Attribute.context = {}
-
-function Attribute.context.set (widget, value)
-    widget.attributes.context = value
-    if not value then return end
-    value.isContextMenu = true
-    widget.layout:createWidget { type = 'menu', value }
-end
-
-Attribute.context.get = cascade
-
---[[--
-Widget style.
-
-Should contain a string or array of strings identifying
-style rules to be applied to the widget. When resolving
-any attribute with a `nil` value, these style rules are
-searched for a corresponding attribute.
-
-Setting this attribute resets the `Font` and `Text` object
-associated with this widget.
-
-Setting this attribute recalculates the size and position
-of the parent widget and its descendants.
-
-@attrib style
---]]--
-Attribute.style = {}
-
-function Attribute.style.set (widget, value)
-    widget.attributes.style = value
-    widget.fontData = nil
-    widget.textData = nil
-    widget.reshape(widget.parent or widget)
-end
-
---[[--
-Status message.
-
-Should contain a string with a short message describing the
-purpose or state of the widget.
-
-This message will appear in the last created `status` widget
-in the same layout, or in the master layout if one exists.
-
-- This attribute cascades.
-
-@attrib status
---]]--
-Attribute.status = {}
-
-Attribute.status.get = cascade
-
---[[--
-Scroll ability.
-
-Should contain `true` or `false` (or `nil`).
-
-If set to `true`, moving the scroll wheel over the widget will adjust
-its scroll position when the widget's contents overflow its boundary.
-
-@attrib scroll
---]]--
-Attribute.scroll = {}
-
---[[--
-Keyboard Attributes.
-
-@section keyboard
---]]--
-
---[[--
-Focusable.
-
-Should contain `true` if the widget can be focused by pressing the tab key.
-
-@attrib focusable
---]]--
-Attribute.focusable = {}
-
---[[--
-Keyboard shortcut.
-
-Should contain a string representing a key and optional modifiers,
-separated by dashes; for example `'ctrl-c'` or `'alt-shift-escape'`.
-
-Pressing this key combination bubbles a `Press` event on the widget,
-as if it had been pressed with a mouse or touch interface.
-
-Setting this attribute re-registers the widget with its layout.
-
-@attrib shortcut
---]]--
-Attribute.shortcut = {}
-
-local function setShortcut (layout, shortcut, value)
-    local mainKey, modifierFlags = Shortcut.parseKeyCombo(shortcut)
-    if mainKey then
-        layout.shortcuts[modifierFlags][mainKey] = value
-    end
-end
-
-function Attribute.shortcut.set (widget, value)
-    local layout = widget.layout.master or widget.layout
-    local oldValue = widget.attributes.shortcut
-
-    if oldValue then
-        if type(oldValue) == 'table' then
-            for _, v in ipairs(oldValue) do
-                setShortcut(layout, v, nil)
-            end
-        else
-            setShortcut(layout, oldValue, nil)
-        end
-    end
-
-    if value then
-        if type(value) == 'table' then
-            for _, v in ipairs(value) do
-                setShortcut(layout, v, widget)
-            end
-        else
-            setShortcut(layout, value, widget)
-        end
-    end
-
-    widget.attributes.shortcut = value
-end
-
---[[--
-Size Attributes.
-
-Setting these attributes recalculates the size and position
-of the parent widget and its descendants.
-
-@section size
---]]--
-
---[[--
-Flow axis.
-
-Should equal either `'x'` or `'y'`. Defaults to `'y'`.
-
-This attribute determines the placement and default dimensions
-of any child widgets.
-
-When flow is `'x'`, the `height` of child widgets defaults
-to this widget's height, and each child is placed to the
-right of the previous child. When flow is `'y'`, the `width`
-of child widgets defaults to this widget's width, and each
-child is placed below the previous child.
-
-Setting this attribute resets the `Text` object associated
-with this widget.
-
-@attrib flow
---]]--
-Attribute.flow = {}
-
-function Attribute.flow.set (widget, value)
-    widget.attributes.flow = value
-    widget.textData = nil
-    widget.reshape(widget.parent or widget)
-end
-
---[[--
-Width.
-
-This attribute may not always hold a numeric value.
-To get the calculated width, use `Widget:getWidth`.
-
-Setting this attribute when the `wrap` attribute is
-also present resets the `Text` object associated
-with this widget.
-
-@attrib width
---]]--
-Attribute.width = {}
-
-function Attribute.width.set (widget, value)
-    if value ~= 'auto' then
-        value = value and math.max(value, widget.minwidth or 0)
-    end
-    widget.attributes.width = value
-    if widget.wrap then
-        widget.textData = nil
-    end
-    widget.reshape(widget.parent or widget)
-end
-
---[[--
-Height.
-
-This attribute may not always hold a numeric value.
-To get the calculated height, use `Widget:getHeight`.
-
-@attrib height
---]]--
-Attribute.height = {}
-
-function Attribute.height.set (widget, value)
-    if value ~= 'auto' then
-        value = value and math.max(value, widget.minheight or 0)
-    end
-    widget.attributes.height = value
-    widget.reshape(widget.parent or widget)
-end
-
---[[--
-Minimum width.
-
-@attrib minwidth
---]]--
-Attribute.minwidth = {}
-
-function Attribute.minwidth.set (widget, value)
-    local attributes = widget.attributes
-    attributes.minwidth = value
-    if type(value) == 'number' then
-        local current = attributes.width
-        if type(current) == 'number' then
-            attributes.width = math.max(current, value)
-        end
-    end
-    widget.reshape(widget.parent or widget)
-end
-
---[[--
-Minimum height.
-
-@attrib minheight
---]]--
-Attribute.minheight = {}
-
-function Attribute.minheight.set (widget, value)
-    local attributes = widget.attributes
-    attributes.minheight = value
-    if type(value) == 'number' then
-        local current = attributes.height
-        if type(current) == 'number' then
-            attributes.height = math.max(current, value)
-        end
-    end
-    widget.reshape(widget.parent or widget)
-end
-
---[[--
-Font Attributes.
-
-Setting these attributes resets the Font and Text
-objects associated with the widget.
-
-@section font
---]]--
-
---[[--
-Font path.
-
-Should contain a path to a TrueType font to use for displaying
-this widget's `text`.
-
-- This attribute cascades.
-
-@attrib font
---]]--
-Attribute.font = {}
-
-local function resetFont (widget)
-    rawset(widget, 'fontData', nil)
-    rawset(widget, 'textData', nil)
-    for _, child in ipairs(widget) do
-        resetFont(child)
-    end
-    local items = widget.items
-    if items then
-        for _, child in ipairs(items) do
-            resetFont(child)
-        end
-    end
-end
-
-function Attribute.font.set (widget, value)
-    widget.attributes.font = value
-    resetFont(widget)
-end
-
-Attribute.font.get = cascade
-
---[[--
-Font size.
-
-Should contain a number representing the size of the font, in points.
-Defaults to 12.
-
-- This attribute cascades.
-
-@attrib size
---]]--
-Attribute.size = {}
-
-function Attribute.size.set (widget, value)
-    widget.attributes.size = value
-    widget.fontData = nil
-    widget.textData = nil
-end
-
-Attribute.size.get = cascade
-
---[[--
-Text Attributes.
-
-Setting these attributes resets the Text object
-associated with the widget.
-
-@section text
---]]--
-
---[[--
-Text to display.
-
-@attrib text
---]]--
-Attribute.text = {}
-
-function Attribute.text.set (widget, value)
-    widget.attributes.text = value
-    widget.textData = nil
-end
-
---[[--
-Text color.
-
-Should contain an array with 3 or 4 values (RGB or RGBA) from 0 to 255.
-
-- This attribute cascades.
-
-@attrib color
---]]--
-Attribute.color = {}
-
-function Attribute.color.set (widget, value)
-    widget.attributes.color = value
-    widget.textData = nil
-end
-
-Attribute.color.get = cascade
-
---[[--
-Text and icon alignment.
-
-Should contain a string defining vertical and horizontal alignment.
-Vertical alignment is defined by either 'top', 'middle', or 'bottom',
-and horizontal alignment is defined by either 'left', 'center', or 'right'.
-
-For example, `align = 'top left'`
-
-- This attribute cascades.
-
-@attrib align
---]]--
-Attribute.align = {}
-
-function Attribute.align.set (widget, value)
-    widget.attributes.align = value
-    widget.textData = nil
-end
-
-Attribute.align.get = cascade
-
---[[--
-Wrap text onto multiple lines.
-
-Should contain `true` for multiline text, or `false` or `nil`
-for a single line. Even text containing line breaks will display
-as a single line when this attribute is not set to `true`.
-
-- This attribute cascades.
-
-@attrib wrap
---]]--
-Attribute.wrap = {}
-
-function Attribute.wrap.set (widget, value)
-    widget.attributes.wrap = value
-    widget.textData = nil
-end
-
-Attribute.wrap.get = cascade
-
---[[--
-Visual Attributes.
-
-@section visual
---]]--
-
---[[--
-Background color.
-
-Should contain an array with 3 or 4 values (RGB or RGBA) from 0 to 255.
-
-@attrib background
---]]--
-Attribute.background = {}
-
---[[--
-Outline color.
-
-Should contain an array with 3 or 4 values (RGB or RGBA) from 0 to 255.
-
-@attrib outline
---]]--
-Attribute.outline = {}
-
---[[--
-Slice image.
-
-Should contain a path to an image with "slices" to display for this widget.
-
-@attrib slices
---]]--
-Attribute.slices = {}
-
---[[--
-Margin size.
-
-The margin area occupies space outside of the `outline` and `slices`.
-
-@attrib margin
---]]--
-Attribute.margin = {}
-
-function Attribute.margin.set (widget, value)
-    widget.attributes.margin = value
-    widget.textData = nil
-    widget:reshape()
-end
-
---[[--
-Padding size.
-
-The padding area occupies space inside the `outline` and `slices`,
-and outside the space where the `icon` and `text` and any
-child widgets appear.
-
-@attrib padding
---]]--
-Attribute.padding = {}
-
-function Attribute.padding.set (widget, value)
-    widget.attributes.padding = value
-    widget.textData = nil
-    widget:reshape()
-end
-
---[[--
-Icon path.
-
-Should contain a path to an image file.
-
-@attrib icon
---]]--
-Attribute.icon = {}
-
-function Attribute.icon.set (widget, value)
-    widget.attributes.icon = value
-    widget.textData = nil
-end
-
-
-return Attribute
diff --git a/src/lib/luigi/backend.lua b/src/lib/luigi/backend.lua
deleted file mode 100644
index 4c4552a..0000000
--- a/src/lib/luigi/backend.lua
+++ /dev/null
@@ -1,27 +0,0 @@
-local ROOT = (...):gsub('[^.]*$', '')
-local Backend
-
-if _G.love and (_G.love._version_major or _G.love._version_minor) then
-    Backend = require(ROOT .. 'backend.love')
-else
-    Backend = require(ROOT .. 'backend.ffisdl')
-end
-
-Backend.intersectScissor = Backend.intersectScissor or function (x, y, w, h)
-    local sx, sy, sw, sh = Backend.getScissor()
-    if not sx then
-        return Backend.setScissor(x, y, w, h)
-    end
-    local x1 = math.max(sx, x)
-    local y1 = math.max(sy, y)
-    local x2 = math.min(sx + sw, x + w)
-    local y2 = math.min(sy + sh, y + h)
-    if x2 > x1 and y2 > y1 then
-        Backend.setScissor(x1, y1, x2 - x1, y2 - y1)
-    else
-        -- HACK
-        Backend.setScissor(-100, -100, 1, 1)
-    end
-end
-
-return Backend
diff --git a/src/lib/luigi/backend/ffisdl.lua b/src/lib/luigi/backend/ffisdl.lua
deleted file mode 100644
index d031a77..0000000
--- a/src/lib/luigi/backend/ffisdl.lua
+++ /dev/null
@@ -1,540 +0,0 @@
-local ROOT = (...):gsub('[^.]*.[^.]*$', '')
-
-local Hooker = require(ROOT .. 'hooker')
-
-local ffi = require 'ffi'
-local sdl = require((...) .. '.sdl')
-
-local Image = require((...) .. '.image')
-local Font = require((...) .. '.font')
-local Keyboard = require((...) .. '.keyboard')
-local Text = require((...) .. '.text')
-
-local IntOut = ffi.typeof 'int[1]'
-
-local stack = {}
-
--- create window and renderer
-sdl.enableScreenSaver()
-
-local window = sdl.createWindow('',
-    sdl.WINDOWPOS_CENTERED, sdl.WINDOWPOS_CENTERED, 800, 600,
-    sdl.WINDOW_SHOWN + sdl.WINDOW_RESIZABLE)
-
-if window == nil then
-    error(ffi.string(sdl.getError()))
-end
-
-ffi.gc(window, sdl.destroyWindow)
-
-local renderer = sdl.createRenderer(window, -1,
-    sdl.RENDERER_ACCELERATED + sdl.RENDERER_PRESENTVSYNC)
-
-if renderer == nil then
-    error(ffi.string(sdl.getError()))
-end
-
-ffi.gc(renderer, sdl.destroyRenderer)
-
-sdl.setRenderDrawBlendMode(renderer, sdl.BLENDMODE_BLEND)
-
-local Backend = {}
-
-Backend.sdl = sdl
-
-Backend.isMac = function ()
-    return sdl.getPlatform() == 'Mac OS X'
-end
-
-local callback = {
-    draw = function () end,
-    resize = function () end,
-    mousepressed = function () end,
-    mousereleased = function () end,
-    mousemoved = function () end,
-    keypressed = function () end,
-    keyreleased = function () end,
-    textinput = function () end,
-    wheelmoved = function () end,
-}
-
-Backend.run = function ()
-    local event = sdl.Event()
-    local tickInterval = 16 -- ~60 fps (with room)
-    local nextTick = 0
-    local sdl = sdl
-
-    while true do
-
-        sdl.pumpEvents()
-
-        while sdl.pollEvent(event) ~= 0 do
-            if event.type == sdl.QUIT then
-                return
-            elseif event.type == sdl.WINDOWEVENT
-            and event.window.event == sdl.WINDOWEVENT_RESIZED then
-                local window = event.window
-                callback.resize(window.data1, window.data2)
-            elseif event.type == sdl.MOUSEBUTTONDOWN then
-                local button = event.button
-                callback.mousepressed(button.x, button.y, button.button)
-            elseif event.type == sdl.MOUSEBUTTONUP then
-                local button = event.button
-                callback.mousereleased(button.x, button.y, button.button)
-            elseif event.type == sdl.MOUSEMOTION then
-                local motion = event.motion
-                callback.mousemoved(motion.x, motion.y)
-            elseif event.type == sdl.KEYDOWN then
-                local key = Keyboard.stringByKeycode[event.key.keysym.sym] or 'unknown'
-                local scanCode = Keyboard.stringByScancode[event.key.keysym.scancode] or 'unknown'
-                callback.keypressed(key, scanCode, event.key['repeat'])
-            elseif event.type == sdl.KEYUP then
-                local key = Keyboard.stringByKeycode[event.key.keysym.sym] or 'unknown'
-                local scanCode = Keyboard.stringByScancode[event.key.keysym.scancode] or 'unknown'
-                callback.keyreleased(key, scanCode, event.key['repeat'])
-            elseif event.type == sdl.TEXTINPUT then
-                callback.textinput(ffi.string(event.text.text))
-            elseif event.type == sdl.MOUSEWHEEL then
-                local wheel = event.wheel
-                callback.wheelmoved(wheel.x, wheel.y)
-            end
-        end
-
-        sdl.renderSetClipRect(renderer, nil)
-        sdl.setRenderDrawColor(renderer, 0, 0, 0, 255)
-        sdl.renderClear(renderer)
-        callback.draw()
-
-        local now = sdl.getTicks()
-        if nextTick > now then
-            sdl.delay(nextTick - now)
-        end
-        nextTick = now + tickInterval
-
-        sdl.renderPresent(renderer)
-    end
-end
-
-Backend.Cursor = function (image, x, y)
-    return sdl.createColorCursor(image.sdlSurface, x, y)
-end
-
-Backend.Font = Font
-
-Backend.Image = function (path)
-    return Image(renderer, path)
-end
-
-Backend.Text = function (...)
-    return Text(renderer, ...)
-end
-
-Backend.Quad = function (x, y, w, h)
-    return { x, y, w, h }
-end
-
-Backend.SpriteBatch = require((...) .. '.spritebatch')
-
-Backend.draw = function (drawable, x, y, sx, sy)
-    if drawable.draw then
-        return drawable:draw(x, y, sx, sy)
-    end
-
-    if drawable.sdlTexture == nil
-    or drawable.sdlRenderer == nil
-    or drawable.getWidth == nil
-    or drawable.getHeight == nil
-        then return
-    end
-
-    local w = drawable:getWidth() * (sx or 1)
-    local h = drawable:getHeight() * (sy or 1)
-
-    -- HACK. Somehow drawing something first prevents renderCopy from
-    -- incorrectly scaling up in some cases (after rendering slices).
-    -- For example http://stackoverflow.com/questions/28218906
-    sdl.renderDrawPoint(drawable.sdlRenderer, -1, -1)
-
-    -- Draw the image.
-    sdl.renderCopy(drawable.sdlRenderer, drawable.sdlTexture,
-        nil, sdl.Rect(x, y, w, h))
-end
-
-Backend.drawRectangle = function (mode, x, y, w, h)
-    if mode == 'fill' then
-        sdl.renderFillRect(renderer, sdl.Rect(x, y, w, h))
-    else
-        sdl.renderDrawRect(renderer, sdl.Rect(x, y, w, h))
-    end
-end
-
-local currentFont = Font()
-
-local lastColor
-
--- print( text, x, y, r, sx, sy, ox, oy, kx, ky )
-Backend.print = function (text, x, y)
-    if not text or text == '' then return end
-    local font = currentFont.sdlFont
-    local color = sdl.Color(lastColor or { 0, 0, 0, 255 })
-    local write = Font.SDL2_ttf.TTF_RenderUTF8_Blended
-
-    local surface = write(font, text, color)
-    ffi.gc(surface, sdl.freeSurface)
-    local texture = sdl.createTextureFromSurface(renderer, surface)
-    ffi.gc(texture, sdl.destroyTexture)
-    sdl.renderCopy(renderer, texture, nil, sdl.Rect(x, y, surface.w, surface.h))
-end
-
-Backend.getClipboardText = function ()
-    return ffi.string(sdl.getClipboardText())
-end
-
-Backend.setClipboardText = sdl.setClipboardText
-
-Backend.getMousePosition = function ()
-    local x, y = IntOut(), IntOut()
-    sdl.getMouseState(x, y)
-    return x[0], y[0]
-end
-
-local function SystemCursor (id)
-    return ffi.gc(sdl.createSystemCursor(id), sdl.freeCursor)
-end
-
-local systemCursors = {
-    arrow = SystemCursor(sdl.SYSTEM_CURSOR_ARROW),
-    ibeam = SystemCursor(sdl.SYSTEM_CURSOR_IBEAM),
-    wait = SystemCursor(sdl.SYSTEM_CURSOR_WAIT),
-    crosshair = SystemCursor(sdl.SYSTEM_CURSOR_CROSSHAIR),
-    waitarrow = SystemCursor(sdl.SYSTEM_CURSOR_WAITARROW),
-    sizenwse = SystemCursor(sdl.SYSTEM_CURSOR_SIZENWSE),
-    sizenesw = SystemCursor(sdl.SYSTEM_CURSOR_SIZENESW),
-    sizewe = SystemCursor(sdl.SYSTEM_CURSOR_SIZEWE),
-    sizens = SystemCursor(sdl.SYSTEM_CURSOR_SIZENS),
-    sizeall = SystemCursor(sdl.SYSTEM_CURSOR_SIZEALL),
-    no = SystemCursor(sdl.SYSTEM_CURSOR_NO),
-    hand = SystemCursor(sdl.SYSTEM_CURSOR_HAND),
-}
-
-Backend.getSystemCursor = function (name)
-    return systemCursors[name] or systemCursors.arrow
-end
-
-Backend.getWindowSize = function ()
-    local x, y = IntOut(), IntOut()
-    sdl.getWindowSize(window, x, y)
-    return x[0], y[0]
-end
-
-Backend.getTime = function ()
-    return sdl.getTicks() * 0.001
-end
-
-Backend.isKeyDown = function (...)
-    local state = sdl.getKeyboardState(nil)
-
-    for i = 1, select('#', ...) do
-        local name = select(i, ...)
-        local scan = Keyboard.scancodeByString[name]
-        if scan and state[scan] ~= 0 then
-            return true
-        end
-    end
-
-    return false
-end
-
-Backend.isMouseDown = function ()
-end
-
-Backend.quit = function ()
-    sdl.quit()
-    os.exit()
-end
-
-Backend.setColor = function (color)
-    lastColor = color
-    sdl.setRenderDrawColor(renderer,
-        color[1], color[2], color[3], color[4] or 255)
-end
-
-Backend.setCursor = function (cursor)
-    sdl.setCursor(cursor or Backend.getSystemCursor('arrow'))
-end
-
-Backend.setFont = function (font)
-    currentFont = font
-end
-
-local lastScissor
-
-Backend.setScissor = function (x, y, w, h)
-    -- y = y and Backend.getWindowHeight() - (y + h)
-    lastScissor = x and sdl.Rect(x, y, w, h)
-    sdl.renderSetClipRect(renderer, lastScissor)
-end
-
-Backend.getScissor = function ()
-    if lastScissor ~= nil then
-        local x, y = lastScissor.x, lastScissor.y
-        local w, h = lastScissor.w, lastScissor.h
-        -- y = y and Backend.getWindowHeight() - (y + h)
-        return x, y, w, h
-    end
-end
-
-function Backend.hide (layout)
-    for _, item in ipairs(layout.hooks) do
-        Hooker.unhook(item)
-    end
-    layout.hooks = {}
-end
-
-local function hook (layout, key, method, hookLast)
-    layout.hooks[#layout.hooks + 1] = Hooker.hook(
-        callback, key, method, hookLast)
-end
-
-Backend.pop = function ()
-    local history = stack[#stack]
-    lastColor = history.color or { 0, 0, 0, 255 }
-    lastScissor = history.scissor
-
-    sdl.setRenderDrawColor(renderer,
-        lastColor[1], lastColor[2], lastColor[3], lastColor[4] or 255)
-    sdl.renderSetClipRect(renderer, lastScissor) -- Backend.setScissor(history.scissor)
-    stack[#stack] = nil
-end
-
-Backend.push = function ()
-    stack[#stack + 1] = {
-        color = lastColor,
-        scissor = lastScissor,
-    }
-end
-
-local isMouseDown = function ()
-    return sdl.getMouseState(nil, nil) > 0
-end
-
-local buttonIds = {
-    [sdl.BUTTON_LEFT] = 'left',
-    [sdl.BUTTON_MIDDLE] = 'middle',
-    [sdl.BUTTON_RIGHT] = 'right',
-    -- [sdl.BUTTON_X1] = 'x1',
-    -- [sdl.BUTTON_X2] = 'x2',
-}
-
-local function getMouseButtonId (value)
-    return value and buttonIds[value] or value
-end
-
-function Backend.show (layout)
-    local input = layout.input
-
-    hook(layout, 'draw', function ()
-        input:handleDisplay(layout)
-    end, true)
-    hook(layout, 'resize', function (width, height)
-        return input:handleReshape(layout, width, height)
-    end)
-    hook(layout, 'mousepressed', function (x, y, button)
-        return input:handlePressStart(layout, getMouseButtonId(button), x, y)
-    end)
-    hook(layout, 'mousereleased', function (x, y, button)
-        return input:handlePressEnd(layout, getMouseButtonId(button), x, y)
-    end)
-    hook(layout, 'mousemoved', function (x, y, dx, dy)
-        if isMouseDown() then
-            return input:handlePressedMove(layout, x, y)
-        else
-            return input:handleMove(layout, x, y)
-        end
-    end)
-    hook(layout, 'keypressed', function (key, scanCode, isRepeat)
-        return input:handleKeyPress(layout, key, scanCode, Backend.getMousePosition())
-    end)
-    hook(layout, 'keyreleased', function (key, scanCode)
-        return input:handleKeyRelease(layout, key, scanCode, Backend.getMousePosition())
-    end)
-    hook(layout, 'textinput', function (text)
-        return input:handleTextInput(layout, text, Backend.getMousePosition())
-    end)
-    hook(layout, 'wheelmoved', function (x, y)
-        return input:handleWheelMove(layout, x, y)
-    end)
-end
-
-function Backend.getWindowMaximized ()
-    local flags = sdl.getWindowFlags(window)
-    return bit.band(flags, sdl.WINDOW_MAXIMIZED) ~= 0
-end
-
-function Backend.setWindowMaximized (maximized)
-    if maximized then
-        sdl.maximizeWindow(window)
-    else
-        sdl.restoreWindow(window)
-    end
-end
-
-function Backend.getWindowMinimized ()
-    local flags = sdl.getWindowFlags(window)
-    return bit.band(flags, sdl.WINDOW_MINIMIZED) ~= 0
-end
-
-function Backend.setWindowMinimized (minimized)
-    if minimized then
-        sdl.minimizeWindow(window)
-    else
-        sdl.restoreWindow(window)
-    end
-end
-
-function Backend.getWindowBorderless ()
-    local flags = sdl.getWindowFlags(window)
-    return bit.band(flags, sdl.WINDOW_BORDERLESS) ~= 0
-end
-
-function Backend.setWindowBorderless (borderless)
-    return sdl.setWindowBordered(window, not borderless)
-end
-
-function Backend.getWindowFullscreen ()
-    local flags = sdl.getWindowFlags(window)
-    return bit.band(flags, sdl.WINDOW_FULLSCREEN) ~= 0
-end
-
-function Backend.setWindowFullscreen (fullscreen)
-    return sdl.setWindowFullscreen(window, not not fullscreen)
-end
-
-function Backend.getWindowGrab ()
-    return sdl.getWindowGrab(window)
-end
-
-function Backend.setWindowGrab (grab)
-    return sdl.setWindowGrab(window, not not grab)
-end
-
-local SDL2_image = ffi.load 'SDL2_image'
-
-function Backend.setWindowIcon (icon)
-    -- XXX: is it safe to free this?
-    local surface = ffi.gc(SDL2_image.IMG_Load(icon), sdl.freeSurface)
-
-    if surface == nil then
-        error(ffi.string(sdl.getError()))
-    end
-
-    sdl.setWindowIcon(window, surface)
-end
-
-function Backend.getWindowMaxwidth ()
-    local w, h = IntOut(), IntOut()
-    sdl.getWindowMaximumSize(window, w, h)
-    return w[0]
-end
-
-function Backend.setWindowMaxwidth (maxwidth)
-    local w, h = IntOut(), IntOut()
-    sdl.getWindowMaximumSize(window, w, h)
-    sdl.setWindowMaximumSize(window, maxwidth, h[0] or 16384)
-end
-
-function Backend.getWindowMaxheight ()
-    local w, h = IntOut(), IntOut()
-    sdl.getWindowMaximumSize(window, w, h)
-    return h[0]
-end
-
-function Backend.setWindowMaxheight (maxheight)
-    local w, h = IntOut(), IntOut()
-    sdl.getWindowMaximumSize(window, w, h)
-    sdl.setWindowMaximumSize(window, w[0] or 16384, maxheight)
-end
-
-function Backend.getWindowMinwidth ()
-    local w, h = IntOut(), IntOut()
-    sdl.getWindowMinimumSize(window, w, h)
-    return w[0]
-end
-
-function Backend.setWindowMinwidth (minwidth)
-    local w, h = IntOut(), IntOut()
-    sdl.getWindowMinimumSize(window, w, h)
-    sdl.setWindowMinimumSize(window, minwidth,  h[0] or 0)
-end
-
-function Backend.getWindowMinheight ()
-    local w, h = IntOut(), IntOut()
-    sdl.getWindowMinimumSize(window, w, h)
-    return h[0]
-end
-
-function Backend.setWindowMinheight (minheight)
-    local w, h = IntOut(), IntOut()
-    sdl.getWindowMinimumSize(window, w, h)
-    sdl.setWindowMinimumSize(window, w[0] or 0, minheight)
-end
-
-function Backend.getWindowTop ()
-    local x, y = IntOut(), IntOut()
-    sdl.getWindowPosition(window, x, y)
-    return y[0]
-end
-
-function Backend.setWindowTop (top)
-    local x, y = IntOut(), IntOut()
-    sdl.getWindowPosition(window, x, y)
-    sdl.setWindowPosition(window, x[0] or 0, top)
-end
-
-function Backend.getWindowLeft ()
-    local x, y = IntOut(), IntOut()
-    sdl.getWindowPosition(window, x, y)
-    return x[0]
-end
-
-function Backend.setWindowLeft (left)
-    local x, y = IntOut(), IntOut()
-    sdl.getWindowPosition(window, x, y)
-    sdl.setWindowPosition(window, left, y[0] or 0)
-end
-
-function Backend.getWindowWidth ()
-    local w, h = IntOut(), IntOut()
-    sdl.getWindowSize(window, w, h)
-    return w[0]
-end
-
-function Backend.setWindowWidth (width)
-    local w, h = IntOut(), IntOut()
-    sdl.getWindowSize(window, w, h)
-    sdl.setWindowSize(window, width, h[0] or 600)
-end
-
-function Backend.getWindowHeight ()
-    local w, h = IntOut(), IntOut()
-    sdl.getWindowSize(window, w, h)
-    return h[0]
-end
-
-function Backend.setWindowHeight (height)
-    local w, h = IntOut(), IntOut()
-    sdl.getWindowSize(window, w, h)
-    sdl.setWindowSize(window, w[0] or 800, height)
-end
-
-function Backend.getWindowTitle (title)
-    return sdl.getWindowTitle(window)
-end
-
-function Backend.setWindowTitle (title)
-    sdl.setWindowTitle(window, title)
-end
-
-
-
-return Backend
diff --git a/src/lib/luigi/backend/ffisdl/font.lua b/src/lib/luigi/backend/ffisdl/font.lua
deleted file mode 100644
index aabd869..0000000
--- a/src/lib/luigi/backend/ffisdl/font.lua
+++ /dev/null
@@ -1,249 +0,0 @@
-local REL = (...):gsub('[^.]*$', '')
-local APP_ROOT = rawget(_G, 'LUIGI_APP_ROOT') or ''
-
-local ffi = require 'ffi'
-local sdl = require(REL .. 'sdl')
-
-local SDL2_ttf = ffi.load 'SDL2_ttf'
-
-local IntOut = ffi.typeof 'int[1]'
-
-ffi.cdef [[
-
-/* The internal structure containing font information */
-typedef struct _TTF_Font TTF_Font;
-
-/* Initialize the TTF engine - returns 0 if successful, -1 on error */
-int TTF_Init(void);
-
-/* Open a font file and create a font of the specified point size.
- * Some .fon fonts will have several sizes embedded in the file, so the
- * point size becomes the index of choosing which size.  If the value
- * is too high, the last indexed size will be the default. */
-TTF_Font *TTF_OpenFont(const char *file, int ptsize);
-TTF_Font *TTF_OpenFontIndex(const char *file, int ptsize, long index);
-TTF_Font *TTF_OpenFontRW(SDL_RWops *src, int freesrc, int ptsize);
-TTF_Font *TTF_OpenFontIndexRW(SDL_RWops *src, int freesrc, int ptsize, long index);
-
-/* Set and retrieve the font style
-#define TTF_STYLE_NORMAL        0x00
-#define TTF_STYLE_BOLD          0x01
-#define TTF_STYLE_ITALIC        0x02
-#define TTF_STYLE_UNDERLINE     0x04
-#define TTF_STYLE_STRIKETHROUGH 0x08
- */
-
-int TTF_GetFontStyle(const TTF_Font *font);
-void TTF_SetFontStyle(TTF_Font *font, int style);
-int TTF_GetFontOutline(const TTF_Font *font);
-void TTF_SetFontOutline(TTF_Font *font, int outline);
-
-/* Set and retrieve FreeType hinter settings
-#define TTF_HINTING_NORMAL    0
-#define TTF_HINTING_LIGHT     1
-#define TTF_HINTING_MONO      2
-#define TTF_HINTING_NONE      3
- */
-
-int TTF_GetFontHinting(const TTF_Font *font);
-void TTF_SetFontHinting(TTF_Font *font, int hinting);
-
-/* Get the total height of the font - usually equal to point size */
-int TTF_FontHeight(const TTF_Font *font);
-
-/* Get the offset from the baseline to the top of the font
-   This is a positive value, relative to the baseline.
- */
-int TTF_FontAscent(const TTF_Font *font);
-
-/* Get the offset from the baseline to the bottom of the font
-   This is a negative value, relative to the baseline.
- */
-int TTF_FontDescent(const TTF_Font *font);
-
-/* Get the recommended spacing between lines of text for this font */
-int TTF_FontLineSkip(const TTF_Font *font);
-
-/* Get/Set whether or not kerning is allowed for this font */
-int TTF_GetFontKerning(const TTF_Font *font);
-void TTF_SetFontKerning(TTF_Font *font, int allowed);
-
-/* Get the number of faces of the font */
-long TTF_FontFaces(const TTF_Font *font);
-
-/* Get the font face attributes, if any */
-int TTF_FontFaceIsFixedWidth(const TTF_Font *font);
-char *TTF_FontFaceFamilyName(const TTF_Font *font);
-char *TTF_FontFaceStyleName(const TTF_Font *font);
-
-/* Check wether a glyph is provided by the font or not */
-int TTF_GlyphIsProvided(const TTF_Font *font, Uint16 ch);
-
-/* Get the metrics (dimensions) of a glyph
-   To understand what these metrics mean, here is a useful link:
-    http://freetype.sourceforge.net/freetype2/docs/tutorial/step2.html
- */
-int TTF_GlyphMetrics(TTF_Font *font, Uint16 ch,
-                     int *minx, int *maxx,
-                                     int *miny, int *maxy, int *advance);
-
-/* Get the dimensions of a rendered string of text */
-int TTF_SizeText(TTF_Font *font, const char *text, int *w, int *h);
-int TTF_SizeUTF8(TTF_Font *font, const char *text, int *w, int *h);
-int TTF_SizeUTF8_Wrapped(TTF_Font *font, const char *text, int wrapLength, int *w, int *h, int *lineCount);
-int TTF_SizeUNICODE(TTF_Font *font, const Uint16 *text, int *w, int *h);
-
-/* Create an 8-bit palettized surface and render the given text at
-   fast quality with the given font and color.  The 0 pixel is the
-   colorkey, giving a transparent background, and the 1 pixel is set
-   to the text color.
-   This function returns the new surface, or NULL if there was an error.
-*/
-SDL_Surface *TTF_RenderText_Solid(TTF_Font *font,
-                const char *text, SDL_Color fg);
-SDL_Surface *TTF_RenderUTF8_Solid(TTF_Font *font,
-                const char *text, SDL_Color fg);
-SDL_Surface *TTF_RenderUNICODE_Solid(TTF_Font *font,
-                const Uint16 *text, SDL_Color fg);
-
-/* Create an 8-bit palettized surface and render the given glyph at
-   fast quality with the given font and color.  The 0 pixel is the
-   colorkey, giving a transparent background, and the 1 pixel is set
-   to the text color.  The glyph is rendered without any padding or
-   centering in the X direction, and aligned normally in the Y direction.
-   This function returns the new surface, or NULL if there was an error.
-*/
-SDL_Surface *TTF_RenderGlyph_Solid(TTF_Font *font,
-                    Uint16 ch, SDL_Color fg);
-
-/* Create an 8-bit palettized surface and render the given text at
-   high quality with the given font and colors.  The 0 pixel is background,
-   while other pixels have varying degrees of the foreground color.
-   This function returns the new surface, or NULL if there was an error.
-*/
-SDL_Surface *TTF_RenderText_Shaded(TTF_Font *font,
-                const char *text, SDL_Color fg, SDL_Color bg);
-SDL_Surface *TTF_RenderUTF8_Shaded(TTF_Font *font,
-                const char *text, SDL_Color fg, SDL_Color bg);
-SDL_Surface *TTF_RenderUNICODE_Shaded(TTF_Font *font,
-                const Uint16 *text, SDL_Color fg, SDL_Color bg);
-
-/* Create an 8-bit palettized surface and render the given glyph at
-   high quality with the given font and colors.  The 0 pixel is background,
-   while other pixels have varying degrees of the foreground color.
-   The glyph is rendered without any padding or centering in the X
-   direction, and aligned normally in the Y direction.
-   This function returns the new surface, or NULL if there was an error.
-*/
-SDL_Surface *TTF_RenderGlyph_Shaded(TTF_Font *font,
-                Uint16 ch, SDL_Color fg, SDL_Color bg);
-
-/* Create a 32-bit ARGB surface and render the given text at high quality,
-   using alpha blending to dither the font with the given color.
-   This function returns the new surface, or NULL if there was an error.
-*/
-SDL_Surface *TTF_RenderText_Blended(TTF_Font *font,
-                const char *text, SDL_Color fg);
-SDL_Surface *TTF_RenderUTF8_Blended(TTF_Font *font,
-                const char *text, SDL_Color fg);
-SDL_Surface *TTF_RenderUNICODE_Blended(TTF_Font *font,
-                const Uint16 *text, SDL_Color fg);
-
-
-/* Create a 32-bit ARGB surface and render the given text at high quality,
-   using alpha blending to dither the font with the given color.
-   Text is wrapped to multiple lines on line endings and on word boundaries
-   if it extends beyond wrapLength in pixels.
-   This function returns the new surface, or NULL if there was an error.
-*/
-SDL_Surface *TTF_RenderText_Blended_Wrapped(TTF_Font *font,
-                const char *text, SDL_Color fg, Uint32 wrapLength);
-SDL_Surface *TTF_RenderUTF8_Blended_Wrapped(TTF_Font *font,
-                const char *text, SDL_Color fg, Uint32 wrapLength);
-SDL_Surface *TTF_RenderUNICODE_Blended_Wrapped(TTF_Font *font,
-                const Uint16 *text, SDL_Color fg, Uint32 wrapLength);
-
-/* Create a 32-bit ARGB surface and render the given glyph at high quality,
-   using alpha blending to dither the font with the given color.
-   The glyph is rendered without any padding or centering in the X
-   direction, and aligned normally in the Y direction.
-   This function returns the new surface, or NULL if there was an error.
-*/
-SDL_Surface *TTF_RenderGlyph_Blended(TTF_Font *font,
-                        Uint16 ch, SDL_Color fg);
-
-/* Close an opened font file */
-void TTF_CloseFont(TTF_Font *font);
-
-/* De-initialize the TTF engine */
-void TTF_Quit(void);
-
-/* Check if the TTF engine is initialized */
-int TTF_WasInit(void);
-
-/* Get the kerning size of two glyphs */
-int TTF_GetFontKerningSize(TTF_Font *font, int prev_index, int index);
-]]
-
-if SDL2_ttf.TTF_Init() ~= 0 then
-    error(ffi.string(sdl.getError()))
-end
-
-local Font = setmetatable({}, { __call = function (self, ...)
-    local object = setmetatable({}, { __index = self })
-    return object, self.constructor(object, ...)
-end })
-
-Font.SDL2_ttf = SDL2_ttf
-
-local fontCache = {}
-
-function Font:constructor (path, size)
-    if not size then
-        size = 12
-    end
-    if not path then
-        path = REL:gsub('%.', '/') .. 'resource/DejaVuSans.ttf'
-    end
-    local key = path .. '_' .. size
-
-    if not fontCache[key] then
-        local font = SDL2_ttf.TTF_OpenFont(APP_ROOT .. path, size)
-
-        if font == nil then
-            error(ffi.string(sdl.getError()))
-        end
-
-        fontCache[key] = font
-    end
-
-    self.sdlFont = fontCache[key]
-end
-
-function Font:setAlignment (align)
-    self.align = align
-end
-
-function Font:setWidth (width)
-    self.width = width
-end
-
-function Font:getLineHeight ()
-    return SDL2_ttf.TTF_FontHeight(self.sdlFont)
-end
-
-function Font:getAscender ()
-    return SDL2_ttf.TTF_FontAscent(self.sdlFont)
-end
-
-function Font:getDescender ()
-    return SDL2_ttf.TTF_FontDescent(self.sdlFont)
-end
-
-function Font:getAdvance (text)
-    local w, h = IntOut(), IntOut()
-    SDL2_ttf.TTF_SizeUTF8(self.sdlFont, text, w, h)
-    return w[0]
-end
-
-return Font
diff --git a/src/lib/luigi/backend/ffisdl/image.lua b/src/lib/luigi/backend/ffisdl/image.lua
deleted file mode 100644
index 805da32..0000000
--- a/src/lib/luigi/backend/ffisdl/image.lua
+++ /dev/null
@@ -1,46 +0,0 @@
-local REL = (...):gsub('[^.]*$', '')
-local APP_ROOT = rawget(_G, 'LUIGI_APP_ROOT') or ''
-
-local ffi = require 'ffi'
-local sdl = require(REL .. 'sdl')
-
-local SDL2_image = ffi.load 'SDL2_image'
-
-ffi.cdef [[ SDL_Surface *IMG_Load(const char *file); ]]
-
-local Image = setmetatable({}, { __call = function (self, ...)
-    local object = setmetatable({}, { __index = self })
-    return object, self.constructor(object, ...)
-end })
-
-function Image:constructor (renderer, path)
-    self.sdlRenderer = renderer
-    self.sdlSurface = ffi.gc(
-        SDL2_image.IMG_Load(APP_ROOT .. path),
-        sdl.freeSurface)
-
-    if self.sdlSurface == nil then
-        error(ffi.string(sdl.getError()))
-    end
-
-    self.sdlTexture = ffi.gc(
-        sdl.createTextureFromSurface(renderer, self.sdlSurface),
-        sdl.destroyTexture)
-
-    if self.sdlTexture == nil then
-        error(ffi.string(sdl.getError()))
-    end
-
-    self.width = self.sdlSurface.w
-    self.height = self.sdlSurface.h
-end
-
-function Image:getWidth ()
-    return self.width
-end
-
-function Image:getHeight ()
-    return self.height
-end
-
-return Image
diff --git a/src/lib/luigi/backend/ffisdl/keyboard.lua b/src/lib/luigi/backend/ffisdl/keyboard.lua
deleted file mode 100644
index b9b9cbd..0000000
--- a/src/lib/luigi/backend/ffisdl/keyboard.lua
+++ /dev/null
@@ -1,494 +0,0 @@
-local REL = (...):gsub('[^.]*$', '')
-
-local sdl = require(REL .. 'sdl')
-
-local Keyboard = {
-    scancodeByString = {},
-    stringByScancode = {},
-    keycodeByString = {},
-    stringByKeycode = {},
-}
-
-local function registerScancodes (registry)
-    for _, entry in ipairs(registry) do
-        Keyboard.scancodeByString[entry[1]] = entry[2]
-        Keyboard.stringByScancode[entry[2]] = entry[1]
-    end
-end
-
-local function registerKeycodes (registry)
-    for _, entry in ipairs(registry) do
-        Keyboard.keycodeByString[entry[1]] = entry[2]
-        Keyboard.stringByKeycode[entry[2]] = entry[1]
-    end
-end
-
-registerScancodes {
-    { "unknown", sdl.SCANCODE_UNKNOWN },
-    { "a", sdl.SCANCODE_A },
-    { "b", sdl.SCANCODE_B },
-    { "c", sdl.SCANCODE_C },
-    { "d", sdl.SCANCODE_D },
-    { "e", sdl.SCANCODE_E },
-    { "f", sdl.SCANCODE_F },
-    { "g", sdl.SCANCODE_G },
-    { "h", sdl.SCANCODE_H },
-    { "i", sdl.SCANCODE_I },
-    { "j", sdl.SCANCODE_J },
-    { "k", sdl.SCANCODE_K },
-    { "l", sdl.SCANCODE_L },
-    { "m", sdl.SCANCODE_M },
-    { "n", sdl.SCANCODE_N },
-    { "o", sdl.SCANCODE_O },
-    { "p", sdl.SCANCODE_P },
-    { "q", sdl.SCANCODE_Q },
-    { "r", sdl.SCANCODE_R },
-    { "s", sdl.SCANCODE_S },
-    { "t", sdl.SCANCODE_T },
-    { "u", sdl.SCANCODE_U },
-    { "v", sdl.SCANCODE_V },
-    { "w", sdl.SCANCODE_W },
-    { "x", sdl.SCANCODE_X },
-    { "y", sdl.SCANCODE_Y },
-    { "z", sdl.SCANCODE_Z },
-
-    { "1", sdl.SCANCODE_1 },
-    { "2", sdl.SCANCODE_2 },
-    { "3", sdl.SCANCODE_3 },
-    { "4", sdl.SCANCODE_4 },
-    { "5", sdl.SCANCODE_5 },
-    { "6", sdl.SCANCODE_6 },
-    { "7", sdl.SCANCODE_7 },
-    { "8", sdl.SCANCODE_8 },
-    { "9", sdl.SCANCODE_9 },
-    { "0", sdl.SCANCODE_0 },
-
-    { "return", sdl.SCANCODE_RETURN },
-    { "escape", sdl.SCANCODE_ESCAPE },
-    { "backspace", sdl.SCANCODE_BACKSPACE },
-    { "tab", sdl.SCANCODE_TAB },
-    { "space", sdl.SCANCODE_SPACE },
-
-    { "-", sdl.SCANCODE_MINUS },
-    { "=", sdl.SCANCODE_EQUALS },
-    { "[", sdl.SCANCODE_LEFTBRACKET },
-    { "]", sdl.SCANCODE_RIGHTBRACKET },
-    { "\\", sdl.SCANCODE_BACKSLASH },
-    { "nonus#", sdl.SCANCODE_NONUSHASH },
-    { ";", sdl.SCANCODE_SEMICOLON },
-    { "'", sdl.SCANCODE_APOSTROPHE },
-    { "`", sdl.SCANCODE_GRAVE },
-    { ",", sdl.SCANCODE_COMMA },
-    { ".", sdl.SCANCODE_PERIOD },
-    { "/", sdl.SCANCODE_SLASH },
-
-    { "capslock", sdl.SCANCODE_CAPSLOCK },
-
-    { "f1", sdl.SCANCODE_F1 },
-    { "f2", sdl.SCANCODE_F2 },
-    { "f3", sdl.SCANCODE_F3 },
-    { "f4", sdl.SCANCODE_F4 },
-    { "f5", sdl.SCANCODE_F5 },
-    { "f6", sdl.SCANCODE_F6 },
-    { "f7", sdl.SCANCODE_F7 },
-    { "f8", sdl.SCANCODE_F8 },
-    { "f9", sdl.SCANCODE_F9 },
-    { "f10", sdl.SCANCODE_F10 },
-    { "f11", sdl.SCANCODE_F11 },
-    { "f12", sdl.SCANCODE_F12 },
-
-    { "printscreen", sdl.SCANCODE_PRINTSCREEN },
-    { "scrolllock", sdl.SCANCODE_SCROLLLOCK },
-    { "pause", sdl.SCANCODE_PAUSE },
-    { "insert", sdl.SCANCODE_INSERT },
-    { "home", sdl.SCANCODE_HOME },
-    { "pageup", sdl.SCANCODE_PAGEUP },
-    { "delete", sdl.SCANCODE_DELETE },
-    { "end", sdl.SCANCODE_END },
-    { "pagedown", sdl.SCANCODE_PAGEDOWN },
-    { "right", sdl.SCANCODE_RIGHT },
-    { "left", sdl.SCANCODE_LEFT },
-    { "down", sdl.SCANCODE_DOWN },
-    { "up", sdl.SCANCODE_UP },
-
-    { "numlock", sdl.SCANCODE_NUMLOCKCLEAR },
-    { "kp/", sdl.SCANCODE_KP_DIVIDE },
-    { "kp*", sdl.SCANCODE_KP_MULTIPLY },
-    { "kp-", sdl.SCANCODE_KP_MINUS },
-    { "kp+", sdl.SCANCODE_KP_PLUS },
-    { "kpenter", sdl.SCANCODE_KP_ENTER },
-    { "kp1", sdl.SCANCODE_KP_1 },
-    { "kp2", sdl.SCANCODE_KP_2 },
-    { "kp3", sdl.SCANCODE_KP_3 },
-    { "kp4", sdl.SCANCODE_KP_4 },
-    { "kp5", sdl.SCANCODE_KP_5 },
-    { "kp6", sdl.SCANCODE_KP_6 },
-    { "kp7", sdl.SCANCODE_KP_7 },
-    { "kp8", sdl.SCANCODE_KP_8 },
-    { "kp9", sdl.SCANCODE_KP_9 },
-    { "kp0", sdl.SCANCODE_KP_0 },
-    { "kp.", sdl.SCANCODE_KP_PERIOD },
-
-    { "nonusbackslash", sdl.SCANCODE_NONUSBACKSLASH },
-    { "application", sdl.SCANCODE_APPLICATION },
-    { "power", sdl.SCANCODE_POWER },
-    { "=", sdl.SCANCODE_KP_EQUALS },
-    { "f13", sdl.SCANCODE_F13 },
-    { "f14", sdl.SCANCODE_F14 },
-    { "f15", sdl.SCANCODE_F15 },
-    { "f16", sdl.SCANCODE_F16 },
-    { "f17", sdl.SCANCODE_F17 },
-    { "f18", sdl.SCANCODE_F18 },
-    { "f19", sdl.SCANCODE_F19 },
-    { "f20", sdl.SCANCODE_F20 },
-    { "f21", sdl.SCANCODE_F21 },
-    { "f22", sdl.SCANCODE_F22 },
-    { "f23", sdl.SCANCODE_F23 },
-    { "f24", sdl.SCANCODE_F24 },
-    { "execute", sdl.SCANCODE_EXECUTE },
-    { "help", sdl.SCANCODE_HELP },
-    { "menu", sdl.SCANCODE_MENU },
-    { "select", sdl.SCANCODE_SELECT },
-    { "stop", sdl.SCANCODE_STOP },
-    { "again", sdl.SCANCODE_AGAIN },
-    { "undo", sdl.SCANCODE_UNDO },
-    { "cut", sdl.SCANCODE_CUT },
-    { "copy", sdl.SCANCODE_COPY },
-    { "paste", sdl.SCANCODE_PASTE },
-    { "find", sdl.SCANCODE_FIND },
-    { "mute", sdl.SCANCODE_MUTE },
-    { "volumeup", sdl.SCANCODE_VOLUMEUP },
-    { "volumedown", sdl.SCANCODE_VOLUMEDOWN },
-    { "kp,", sdl.SCANCODE_KP_COMMA },
-    { "kp=400", sdl.SCANCODE_KP_EQUALSAS400 },
-
-    { "international1", sdl.SCANCODE_INTERNATIONAL1 },
-    { "international2", sdl.SCANCODE_INTERNATIONAL2 },
-    { "international3", sdl.SCANCODE_INTERNATIONAL3 },
-    { "international4", sdl.SCANCODE_INTERNATIONAL4 },
-    { "international5", sdl.SCANCODE_INTERNATIONAL5 },
-    { "international6", sdl.SCANCODE_INTERNATIONAL6 },
-    { "international7", sdl.SCANCODE_INTERNATIONAL7 },
-    { "international8", sdl.SCANCODE_INTERNATIONAL8 },
-    { "international9", sdl.SCANCODE_INTERNATIONAL9 },
-    { "lang1", sdl.SCANCODE_LANG1 },
-    { "lang2", sdl.SCANCODE_LANG2 },
-    { "lang3", sdl.SCANCODE_LANG3 },
-    { "lang4", sdl.SCANCODE_LANG4 },
-    { "lang5", sdl.SCANCODE_LANG5 },
-    { "lang6", sdl.SCANCODE_LANG6 },
-    { "lang7", sdl.SCANCODE_LANG7 },
-    { "lang8", sdl.SCANCODE_LANG8 },
-    { "lang9", sdl.SCANCODE_LANG9 },
-
-    { "alterase", sdl.SCANCODE_ALTERASE },
-    { "sysreq", sdl.SCANCODE_SYSREQ },
-    { "cancel", sdl.SCANCODE_CANCEL },
-    { "clear", sdl.SCANCODE_CLEAR },
-    { "prior", sdl.SCANCODE_PRIOR },
-    { "return2", sdl.SCANCODE_RETURN2 },
-    { "separator", sdl.SCANCODE_SEPARATOR },
-    { "out", sdl.SCANCODE_OUT },
-    { "oper", sdl.SCANCODE_OPER },
-    { "clearagain", sdl.SCANCODE_CLEARAGAIN },
-    { "crsel", sdl.SCANCODE_CRSEL },
-    { "exsel", sdl.SCANCODE_EXSEL },
-
-    { "kp00", sdl.SCANCODE_KP_00 },
-    { "kp000", sdl.SCANCODE_KP_000 },
-    { "thsousandsseparator", sdl.SCANCODE_THOUSANDSSEPARATOR },
-    { "decimalseparator", sdl.SCANCODE_DECIMALSEPARATOR },
-    { "currencyunit", sdl.SCANCODE_CURRENCYUNIT },
-    { "currencysubunit", sdl.SCANCODE_CURRENCYSUBUNIT },
-    { "kp(", sdl.SCANCODE_KP_LEFTPAREN },
-    { "kp)", sdl.SCANCODE_KP_RIGHTPAREN },
-    { "kp{", sdl.SCANCODE_KP_LEFTBRACE },
-    { "kp}", sdl.SCANCODE_KP_RIGHTBRACE },
-    { "kptab", sdl.SCANCODE_KP_TAB },
-    { "kpbackspace", sdl.SCANCODE_KP_BACKSPACE },
-    { "kpa", sdl.SCANCODE_KP_A },
-    { "kpb", sdl.SCANCODE_KP_B },
-    { "kpc", sdl.SCANCODE_KP_C },
-    { "kpd", sdl.SCANCODE_KP_D },
-    { "kpe", sdl.SCANCODE_KP_E },
-    { "kpf", sdl.SCANCODE_KP_F },
-    { "kpxor", sdl.SCANCODE_KP_XOR },
-    { "kpower", sdl.SCANCODE_KP_POWER },
-    { "kp%", sdl.SCANCODE_KP_PERCENT },
-    { "kp<", sdl.SCANCODE_KP_LESS },
-    { "kp>", sdl.SCANCODE_KP_GREATER },
-    { "kp&", sdl.SCANCODE_KP_AMPERSAND },
-    { "kp&&", sdl.SCANCODE_KP_DBLAMPERSAND },
-    { "kp|", sdl.SCANCODE_KP_VERTICALBAR },
-    { "kp||", sdl.SCANCODE_KP_DBLVERTICALBAR },
-    { "kp:", sdl.SCANCODE_KP_COLON },
-    { "kp#", sdl.SCANCODE_KP_HASH },
-    { "kp ", sdl.SCANCODE_KP_SPACE },
-    { "kp@", sdl.SCANCODE_KP_AT },
-    { "kp!", sdl.SCANCODE_KP_EXCLAM },
-    { "kpmemstore", sdl.SCANCODE_KP_MEMSTORE },
-    { "kpmemrecall", sdl.SCANCODE_KP_MEMRECALL },
-    { "kpmemclear", sdl.SCANCODE_KP_MEMCLEAR },
-    { "kpmem+", sdl.SCANCODE_KP_MEMADD },
-    { "kpmem-", sdl.SCANCODE_KP_MEMSUBTRACT },
-    { "kpmem*", sdl.SCANCODE_KP_MEMMULTIPLY },
-    { "kpmem/", sdl.SCANCODE_KP_MEMDIVIDE },
-    { "kp+-", sdl.SCANCODE_KP_PLUSMINUS },
-    { "kpclear", sdl.SCANCODE_KP_CLEAR },
-    { "kpclearentry", sdl.SCANCODE_KP_CLEARENTRY },
-    { "kpbinary", sdl.SCANCODE_KP_BINARY },
-    { "kpoctal", sdl.SCANCODE_KP_OCTAL },
-    { "kpdecimal", sdl.SCANCODE_KP_DECIMAL },
-    { "kphex", sdl.SCANCODE_KP_HEXADECIMAL },
-
-    { "lctrl", sdl.SCANCODE_LCTRL },
-    { "lshift", sdl.SCANCODE_LSHIFT },
-    { "lalt", sdl.SCANCODE_LALT },
-    { "lgui", sdl.SCANCODE_LGUI },
-    { "rctrl", sdl.SCANCODE_RCTRL },
-    { "rshift", sdl.SCANCODE_RSHIFT },
-    { "ralt", sdl.SCANCODE_RALT },
-    { "rgui", sdl.SCANCODE_RGUI },
-
-    { "mode", sdl.SCANCODE_MODE },
-
-    { "audionext", sdl.SCANCODE_AUDIONEXT },
-    { "audioprev", sdl.SCANCODE_AUDIOPREV },
-    { "audiostop", sdl.SCANCODE_AUDIOSTOP },
-    { "audioplay", sdl.SCANCODE_AUDIOPLAY },
-    { "audiomute", sdl.SCANCODE_AUDIOMUTE },
-    { "mediaselect", sdl.SCANCODE_MEDIASELECT },
-    { "www", sdl.SCANCODE_WWW },
-    { "mail", sdl.SCANCODE_MAIL },
-    { "calculator", sdl.SCANCODE_CALCULATOR },
-    { "computer", sdl.SCANCODE_COMPUTER },
-    { "acsearch", sdl.SCANCODE_AC_SEARCH },
-    { "achome", sdl.SCANCODE_AC_HOME },
-    { "acback", sdl.SCANCODE_AC_BACK },
-    { "acforward", sdl.SCANCODE_AC_FORWARD },
-    { "acstop", sdl.SCANCODE_AC_STOP },
-    { "acrefresh", sdl.SCANCODE_AC_REFRESH },
-    { "acbookmarks", sdl.SCANCODE_AC_BOOKMARKS },
-
-    { "brightnessdown", sdl.SCANCODE_BRIGHTNESSDOWN },
-    { "brightnessup", sdl.SCANCODE_BRIGHTNESSUP },
-    { "displayswitch", sdl.SCANCODE_DISPLAYSWITCH },
-    { "kbdillumtoggle", sdl.SCANCODE_KBDILLUMTOGGLE },
-    { "kbdillumdown", sdl.SCANCODE_KBDILLUMDOWN },
-    { "kbdillumup", sdl.SCANCODE_KBDILLUMUP },
-    { "eject", sdl.SCANCODE_EJECT },
-    { "sleep", sdl.SCANCODE_SLEEP },
-
-    { "app1", sdl.SCANCODE_APP1 },
-    { "app2", sdl.SCANCODE_APP2 },
-}
-
-registerKeycodes {
-    { "unknown", sdl.C.SDLK_UNKNOWN },
-
-    { "return", sdl.C.SDLK_RETURN },
-    { "escape", sdl.C.SDLK_ESCAPE },
-    { "backspace", sdl.C.SDLK_BACKSPACE },
-    { "tab", sdl.C.SDLK_TAB },
-    { "space", sdl.C.SDLK_SPACE },
-    { "!", sdl.C.SDLK_EXCLAIM },
-    { "\"", sdl.C.SDLK_QUOTEDBL },
-    { "#", sdl.C.SDLK_HASH },
-    { "%", sdl.C.SDLK_PERCENT },
-    { "$", sdl.C.SDLK_DOLLAR },
-    { "&", sdl.C.SDLK_AMPERSAND },
-    { "'", sdl.C.SDLK_QUOTE },
-    { "(", sdl.C.SDLK_LEFTPAREN },
-    { ")", sdl.C.SDLK_RIGHTPAREN },
-    { "*", sdl.C.SDLK_ASTERISK },
-    { "+", sdl.C.SDLK_PLUS },
-    { ",", sdl.C.SDLK_COMMA },
-    { "-", sdl.C.SDLK_MINUS },
-    { ".", sdl.C.SDLK_PERIOD },
-    { "/", sdl.C.SDLK_SLASH },
-    { "0", sdl.C.SDLK_0 },
-    { "1", sdl.C.SDLK_1 },
-    { "2", sdl.C.SDLK_2 },
-    { "3", sdl.C.SDLK_3 },
-    { "4", sdl.C.SDLK_4 },
-    { "5", sdl.C.SDLK_5 },
-    { "6", sdl.C.SDLK_6 },
-    { "7", sdl.C.SDLK_7 },
-    { "8", sdl.C.SDLK_8 },
-    { "9", sdl.C.SDLK_9 },
-    { ":", sdl.C.SDLK_COLON },
-    { ";", sdl.C.SDLK_SEMICOLON },
-    { "<", sdl.C.SDLK_LESS },
-    { "=", sdl.C.SDLK_EQUALS },
-    { ">", sdl.C.SDLK_GREATER },
-    { "?", sdl.C.SDLK_QUESTION },
-    { "@", sdl.C.SDLK_AT },
-
-    { "[", sdl.C.SDLK_LEFTBRACKET },
-    { "\\", sdl.C.SDLK_BACKSLASH },
-    { "]", sdl.C.SDLK_RIGHTBRACKET },
-    { "^", sdl.C.SDLK_CARET },
-    { "_", sdl.C.SDLK_UNDERSCORE },
-    { "`", sdl.C.SDLK_BACKQUOTE },
-    { "a", sdl.C.SDLK_a },
-    { "b", sdl.C.SDLK_b },
-    { "c", sdl.C.SDLK_c },
-    { "d", sdl.C.SDLK_d },
-    { "e", sdl.C.SDLK_e },
-    { "f", sdl.C.SDLK_f },
-    { "g", sdl.C.SDLK_g },
-    { "h", sdl.C.SDLK_h },
-    { "i", sdl.C.SDLK_i },
-    { "j", sdl.C.SDLK_j },
-    { "k", sdl.C.SDLK_k },
-    { "l", sdl.C.SDLK_l },
-    { "m", sdl.C.SDLK_m },
-    { "n", sdl.C.SDLK_n },
-    { "o", sdl.C.SDLK_o },
-    { "p", sdl.C.SDLK_p },
-    { "q", sdl.C.SDLK_q },
-    { "r", sdl.C.SDLK_r },
-    { "s", sdl.C.SDLK_s },
-    { "t", sdl.C.SDLK_t },
-    { "u", sdl.C.SDLK_u },
-    { "v", sdl.C.SDLK_v },
-    { "w", sdl.C.SDLK_w },
-    { "x", sdl.C.SDLK_x },
-    { "y", sdl.C.SDLK_y },
-    { "z", sdl.C.SDLK_z },
-
-    { "capslock", sdl.C.SDLK_CAPSLOCK },
-
-    { "f1", sdl.C.SDLK_F1 },
-    { "f2", sdl.C.SDLK_F2 },
-    { "f3", sdl.C.SDLK_F3 },
-    { "f4", sdl.C.SDLK_F4 },
-    { "f5", sdl.C.SDLK_F5 },
-    { "f6", sdl.C.SDLK_F6 },
-    { "f7", sdl.C.SDLK_F7 },
-    { "f8", sdl.C.SDLK_F8 },
-    { "f9", sdl.C.SDLK_F9 },
-    { "f10", sdl.C.SDLK_F10 },
-    { "f11", sdl.C.SDLK_F11 },
-    { "f12", sdl.C.SDLK_F12 },
-
-    { "printscreen", sdl.C.SDLK_PRINTSCREEN },
-    { "scrolllock", sdl.C.SDLK_SCROLLLOCK },
-    { "pause", sdl.C.SDLK_PAUSE },
-    { "insert", sdl.C.SDLK_INSERT },
-    { "home", sdl.C.SDLK_HOME },
-    { "pageup", sdl.C.SDLK_PAGEUP },
-    { "delete", sdl.C.SDLK_DELETE },
-    { "end", sdl.C.SDLK_END },
-    { "pagedown", sdl.C.SDLK_PAGEDOWN },
-    { "right", sdl.C.SDLK_RIGHT },
-    { "left", sdl.C.SDLK_LEFT },
-    { "down", sdl.C.SDLK_DOWN },
-    { "up", sdl.C.SDLK_UP },
-
-    { "numlock", sdl.C.SDLK_NUMLOCKCLEAR },
-    { "kp/", sdl.C.SDLK_KP_DIVIDE },
-    { "kp*", sdl.C.SDLK_KP_MULTIPLY },
-    { "kp-", sdl.C.SDLK_KP_MINUS },
-    { "kp+", sdl.C.SDLK_KP_PLUS },
-    { "kpenter", sdl.C.SDLK_KP_ENTER },
-    { "kp0", sdl.C.SDLK_KP_0 },
-    { "kp1", sdl.C.SDLK_KP_1 },
-    { "kp2", sdl.C.SDLK_KP_2 },
-    { "kp3", sdl.C.SDLK_KP_3 },
-    { "kp4", sdl.C.SDLK_KP_4 },
-    { "kp5", sdl.C.SDLK_KP_5 },
-    { "kp6", sdl.C.SDLK_KP_6 },
-    { "kp7", sdl.C.SDLK_KP_7 },
-    { "kp8", sdl.C.SDLK_KP_8 },
-    { "kp9", sdl.C.SDLK_KP_9 },
-    { "kp.", sdl.C.SDLK_KP_PERIOD },
-    { "kp,", sdl.C.SDLK_KP_COMMA },
-    { "kp=", sdl.C.SDLK_KP_EQUALS },
-
-    { "application", sdl.C.SDLK_APPLICATION },
-    { "power", sdl.C.SDLK_POWER },
-    { "f13", sdl.C.SDLK_F13 },
-    { "f14", sdl.C.SDLK_F14 },
-    { "f15", sdl.C.SDLK_F15 },
-    { "f16", sdl.C.SDLK_F16 },
-    { "f17", sdl.C.SDLK_F17 },
-    { "f18", sdl.C.SDLK_F18 },
-    { "f19", sdl.C.SDLK_F19 },
-    { "f20", sdl.C.SDLK_F20 },
-    { "f21", sdl.C.SDLK_F21 },
-    { "f22", sdl.C.SDLK_F22 },
-    { "f23", sdl.C.SDLK_F23 },
-    { "f24", sdl.C.SDLK_F24 },
-    { "execute", sdl.C.SDLK_EXECUTE },
-    { "help", sdl.C.SDLK_HELP },
-    { "menu", sdl.C.SDLK_MENU },
-    { "select", sdl.C.SDLK_SELECT },
-    { "stop", sdl.C.SDLK_STOP },
-    { "again", sdl.C.SDLK_AGAIN },
-    { "undo", sdl.C.SDLK_UNDO },
-    { "cut", sdl.C.SDLK_CUT },
-    { "copy", sdl.C.SDLK_COPY },
-    { "paste", sdl.C.SDLK_PASTE },
-    { "find", sdl.C.SDLK_FIND },
-    { "mute", sdl.C.SDLK_MUTE },
-    { "volumeup", sdl.C.SDLK_VOLUMEUP },
-    { "volumedown", sdl.C.SDLK_VOLUMEDOWN },
-
-    { "alterase", sdl.C.SDLK_ALTERASE },
-    { "sysreq", sdl.C.SDLK_SYSREQ },
-    { "cancel", sdl.C.SDLK_CANCEL },
-    { "clear", sdl.C.SDLK_CLEAR },
-    { "prior", sdl.C.SDLK_PRIOR },
-    { "return2", sdl.C.SDLK_RETURN2 },
-    { "separator", sdl.C.SDLK_SEPARATOR },
-    { "out", sdl.C.SDLK_OUT },
-    { "oper", sdl.C.SDLK_OPER },
-    { "clearagain", sdl.C.SDLK_CLEARAGAIN },
-
-    { "thsousandsseparator", sdl.C.SDLK_THOUSANDSSEPARATOR },
-    { "decimalseparator", sdl.C.SDLK_DECIMALSEPARATOR },
-    { "currencyunit", sdl.C.SDLK_CURRENCYUNIT },
-    { "currencysubunit", sdl.C.SDLK_CURRENCYSUBUNIT },
-
-    { "lctrl", sdl.C.SDLK_LCTRL },
-    { "lshift", sdl.C.SDLK_LSHIFT },
-    { "lalt", sdl.C.SDLK_LALT },
-    { "lgui", sdl.C.SDLK_LGUI },
-    { "rctrl", sdl.C.SDLK_RCTRL },
-    { "rshift", sdl.C.SDLK_RSHIFT },
-    { "ralt", sdl.C.SDLK_RALT },
-    { "rgui", sdl.C.SDLK_RGUI },
-
-    { "mode", sdl.C.SDLK_MODE },
-
-    { "audionext", sdl.C.SDLK_AUDIONEXT },
-    { "audioprev", sdl.C.SDLK_AUDIOPREV },
-    { "audiostop", sdl.C.SDLK_AUDIOSTOP },
-    { "audioplay", sdl.C.SDLK_AUDIOPLAY },
-    { "audiomute", sdl.C.SDLK_AUDIOMUTE },
-    { "mediaselect", sdl.C.SDLK_MEDIASELECT },
-    { "www", sdl.C.SDLK_WWW },
-    { "mail", sdl.C.SDLK_MAIL },
-    { "calculator", sdl.C.SDLK_CALCULATOR },
-    { "computer", sdl.C.SDLK_COMPUTER },
-
-    { "appsearch", sdl.C.SDLK_AC_SEARCH },
-    { "apphome", sdl.C.SDLK_AC_HOME },
-    { "appback", sdl.C.SDLK_AC_BACK },
-    { "appforward", sdl.C.SDLK_AC_FORWARD },
-    { "appstop", sdl.C.SDLK_AC_STOP },
-    { "apprefresh", sdl.C.SDLK_AC_REFRESH },
-    { "appbookmarks", sdl.C.SDLK_AC_BOOKMARKS },
-
-    { "brightnessdown", sdl.C.SDLK_BRIGHTNESSDOWN },
-    { "brightnessup", sdl.C.SDLK_BRIGHTNESSUP },
-    { "displayswitch", sdl.C.SDLK_DISPLAYSWITCH },
-    { "kbdillumtoggle", sdl.C.SDLK_KBDILLUMTOGGLE },
-    { "kbdillumdown", sdl.C.SDLK_KBDILLUMDOWN },
-    { "kbdillumup", sdl.C.SDLK_KBDILLUMUP },
-    { "eject", sdl.C.SDLK_EJECT },
-    { "sleep", sdl.C.SDLK_SLEEP },
-}
-
-return Keyboard
diff --git a/src/lib/luigi/backend/ffisdl/resource/DejaVuSans.ttf b/src/lib/luigi/backend/ffisdl/resource/DejaVuSans.ttf
deleted file mode 100644
index 5267218..0000000
Binary files a/src/lib/luigi/backend/ffisdl/resource/DejaVuSans.ttf and /dev/null differ
diff --git a/src/lib/luigi/backend/ffisdl/sdl.lua b/src/lib/luigi/backend/ffisdl/sdl.lua
deleted file mode 100644
index 427f454..0000000
--- a/src/lib/luigi/backend/ffisdl/sdl.lua
+++ /dev/null
@@ -1,66 +0,0 @@
-local REL = (...):gsub('[^.]*$', '')
-
-local ffi = require 'ffi'
-local sdl = require(REL .. 'sdl2.init')
-
-sdl.AudioCVT = ffi.typeof 'SDL_AudioCVT'
--- sdl.AudioDeviceEvent = ffi.typeof 'SDL_AudioDeviceEvent'
-sdl.AudioSpec = ffi.typeof 'SDL_AudioSpec'
-sdl.Color = ffi.typeof 'SDL_Color'
-sdl.ControllerAxisEvent = ffi.typeof 'SDL_ControllerAxisEvent'
-sdl.ControllerButtonEvent = ffi.typeof 'SDL_ControllerButtonEvent'
-sdl.ControllerDeviceEvent = ffi.typeof 'SDL_ControllerDeviceEvent'
-sdl.DisplayMode = ffi.typeof 'SDL_DisplayMode'
-sdl.DollarGestureEvent = ffi.typeof 'SDL_DollarGestureEvent'
-sdl.DropEvent = ffi.typeof 'SDL_DropEvent'
-sdl.Event = ffi.typeof 'SDL_Event'
-sdl.Finger = ffi.typeof 'SDL_Finger'
-sdl.HapticCondition = ffi.typeof 'SDL_HapticCondition'
-sdl.HapticConstant = ffi.typeof 'SDL_HapticConstant'
-sdl.HapticCustom = ffi.typeof 'SDL_HapticCustom'
-sdl.HapticDirection = ffi.typeof 'SDL_HapticDirection'
-sdl.HapticEffect = ffi.typeof 'SDL_HapticEffect'
-sdl.HapticLeftRight = ffi.typeof 'SDL_HapticLeftRight'
-sdl.HapticPeriodic = ffi.typeof 'SDL_HapticPeriodic'
-sdl.HapticRamp = ffi.typeof 'SDL_HapticRamp'
-sdl.JoyAxisEvent = ffi.typeof 'SDL_JoyAxisEvent'
-sdl.JoyBallEvent = ffi.typeof 'SDL_JoyBallEvent'
-sdl.JoyButtonEvent = ffi.typeof 'SDL_JoyButtonEvent'
-sdl.JoyDeviceEvent = ffi.typeof 'SDL_JoyDeviceEvent'
-sdl.JoyHatEvent = ffi.typeof 'SDL_JoyHatEvent'
-sdl.KeyboardEvent = ffi.typeof 'SDL_KeyboardEvent'
-sdl.Keysym = ffi.typeof 'SDL_Keysym'
-sdl.MessageBoxButtonData = ffi.typeof 'SDL_MessageBoxButtonData'
-sdl.MessageBoxColor = ffi.typeof 'SDL_MessageBoxColor'
-sdl.MessageBoxColorScheme = ffi.typeof 'SDL_MessageBoxColorScheme'
-sdl.MessageBoxData = ffi.typeof 'SDL_MessageBoxData'
-sdl.MouseButtonEvent = ffi.typeof 'SDL_MouseButtonEvent'
-sdl.MouseMotionEvent = ffi.typeof 'SDL_MouseMotionEvent'
-sdl.MouseWheelEvent = ffi.typeof 'SDL_MouseWheelEvent'
-sdl.MultiGestureEvent = ffi.typeof 'SDL_MultiGestureEvent'
-sdl.Palette = ffi.typeof 'SDL_Palette'
-sdl.PixelFormat = ffi.typeof 'SDL_PixelFormat'
-sdl.Point = ffi.typeof 'SDL_Point'
-sdl.QuitEvent = ffi.typeof 'SDL_QuitEvent'
-sdl.RWops = ffi.typeof 'SDL_RWops'
-sdl.Rect = ffi.typeof 'SDL_Rect'
-sdl.RendererInfo = ffi.typeof 'SDL_RendererInfo'
-sdl.Surface = ffi.typeof 'SDL_Surface'
-sdl.SysWMEvent = ffi.typeof 'SDL_SysWMEvent'
--- sdl.SysWMinfo = ffi.typeof 'SDL_SysWMinfo'
-sdl.SysWMmsg = ffi.typeof 'SDL_SysWMmsg'
-sdl.TextEditingEvent = ffi.typeof 'SDL_TextEditingEvent'
-sdl.TextInputEvent = ffi.typeof 'SDL_TextInputEvent'
-sdl.Texture = ffi.typeof 'SDL_Texture'
-sdl.TouchFingerEvent = ffi.typeof 'SDL_TouchFingerEvent'
-sdl.UserEvent = ffi.typeof 'SDL_UserEvent'
-sdl.WindowEvent = ffi.typeof 'SDL_WindowEvent'
-sdl.assert_data = ffi.typeof 'SDL_assert_data'
-sdl.atomic_t = ffi.typeof 'SDL_atomic_t'
-sdl.version = ffi.typeof 'SDL_version'
-
-if sdl.init(sdl.INIT_VIDEO) ~= 0 then
-    error(ffi.string(sdl.getError()))
-end
-
-return sdl
diff --git a/src/lib/luigi/backend/ffisdl/sdl2/LICENSE b/src/lib/luigi/backend/ffisdl/sdl2/LICENSE
deleted file mode 100644
index c9cc784..0000000
--- a/src/lib/luigi/backend/ffisdl/sdl2/LICENSE
+++ /dev/null
@@ -1,36 +0,0 @@
-Copyright (c) 2011-2014 Idiap Research Institute (Ronan Collobert)
-Copyright (c) 2012-2014 Deepmind Technologies (Koray Kavukcuoglu)
-Copyright (c) 2011-2012 NEC Laboratories America (Koray Kavukcuoglu)
-Copyright (c) 2011-2013 NYU (Clement Farabet)
-Copyright (c) 2006-2010 NEC Laboratories America (Ronan Collobert, Leon Bottou, Iain Melvin, Jason Weston)
-Copyright (c) 2006      Idiap Research Institute (Samy Bengio)
-Copyright (c) 2001-2004 Idiap Research Institute (Ronan Collobert, Samy Bengio, Johnny Mariethoz)
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-3. Neither the names of Deepmind Technologies, NYU, NEC Laboratories America 
-   and IDIAP Research Institute nor the names of its contributors may be 
-   used to endorse or promote products derived from this software without 
-   specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
diff --git a/src/lib/luigi/backend/ffisdl/sdl2/README.md b/src/lib/luigi/backend/ffisdl/sdl2/README.md
deleted file mode 100644
index 379ce5d..0000000
--- a/src/lib/luigi/backend/ffisdl/sdl2/README.md
+++ /dev/null
@@ -1,32 +0,0 @@
-sdl2-ffi
-========
-
-A LuaJIT interface to SDL2
-
-# Installation #
-
-First, make sure SDL2 is installed on your system. This package only requires the binary shared libraries (.so, .dylib, .dll).
-Please see your package management system to install SDL2. You can also download yourself binaries on the
-[SDL2 web page](http://libsdl.org/download-2.0.php)
-
-```sh
-luarocks install https://raw.github.com/torch/sdl2-ffi/master/rocks/sdl2-scm-1.rockspec
-```
-
-*Note*: this SDL interface supports only SDL2, not SDL 1.2.
-
-# Usage #
-
-```lua
-local sdl = require 'sdl2'
-sdl.init(sdl.INIT_VIDEO)
-...
-```
-
-All SDL C functions are available in the `sdl` namespace returned by require. The only difference is the naming, which is not prefixed
-by `SDL_` anymore. The same goes for all C defines (like `SDL_INIT_VIDEO`, which can now be accessed with `sdl.INIT_VIDEO`).
-
-Although the interface is quite complete, there are still few defines not ported in this package. Fill free to post a message about it,
-or to request pulls.
-
-
diff --git a/src/lib/luigi/backend/ffisdl/sdl2/cdefs.lua b/src/lib/luigi/backend/ffisdl/sdl2/cdefs.lua
deleted file mode 100644
index f02cd1b..0000000
--- a/src/lib/luigi/backend/ffisdl/sdl2/cdefs.lua
+++ /dev/null
@@ -1,2600 +0,0 @@
--- Cut and paste from the C preprocessor output
--- Removed inline/defined functions which are not supported by luajit
--- Instead, those are defined into defines.lua
--- Note there are some tests here and there to stay cross-platform
-
-local ffi = require 'ffi'
-
-ffi.cdef[[
-typedef struct _FILE FILE;
-]]
-
-ffi.cdef[[
-
-const char * SDL_GetPlatform (void);
-typedef enum
-{
-    SDL_FALSE = 0,
-    SDL_TRUE = 1
-} SDL_bool;
-typedef int8_t Sint8;
-typedef uint8_t Uint8;
-typedef int16_t Sint16;
-typedef uint16_t Uint16;
-typedef int32_t Sint32;
-typedef uint32_t Uint32;
-typedef int64_t Sint64;
-typedef uint64_t Uint64;
-typedef int SDL_dummy_uint8[(sizeof(Uint8) == 1) * 2 - 1];
-typedef int SDL_dummy_sint8[(sizeof(Sint8) == 1) * 2 - 1];
-typedef int SDL_dummy_uint16[(sizeof(Uint16) == 2) * 2 - 1];
-typedef int SDL_dummy_sint16[(sizeof(Sint16) == 2) * 2 - 1];
-typedef int SDL_dummy_uint32[(sizeof(Uint32) == 4) * 2 - 1];
-typedef int SDL_dummy_sint32[(sizeof(Sint32) == 4) * 2 - 1];
-typedef int SDL_dummy_uint64[(sizeof(Uint64) == 8) * 2 - 1];
-typedef int SDL_dummy_sint64[(sizeof(Sint64) == 8) * 2 - 1];
-typedef enum
-{
-    DUMMY_ENUM_VALUE
-} SDL_DUMMY_ENUM;
-typedef int SDL_dummy_enum[(sizeof(SDL_DUMMY_ENUM) == sizeof(int)) * 2 - 1];
-void * SDL_malloc(size_t size);
-void * SDL_calloc(size_t nmemb, size_t size);
-void * SDL_realloc(void *mem, size_t size);
-void SDL_free(void *mem);
-char * SDL_getenv(const char *name);
-int SDL_setenv(const char *name, const char *value, int overwrite);
-void SDL_qsort(void *base, size_t nmemb, size_t size, int (*compare) (const void *, const void *));
-int SDL_abs(int x);
-int SDL_isdigit(int x);
-int SDL_isspace(int x);
-int SDL_toupper(int x);
-int SDL_tolower(int x);
-void * SDL_memset(void *dst, int c, size_t len);
-void * SDL_memcpy(void *dst, const void *src, size_t len);
-void * SDL_memmove(void *dst, const void *src, size_t len);
-int SDL_memcmp(const void *s1, const void *s2, size_t len);
-size_t SDL_wcslen(const wchar_t *wstr);
-size_t SDL_wcslcpy(wchar_t *dst, const wchar_t *src, size_t maxlen);
-size_t SDL_wcslcat(wchar_t *dst, const wchar_t *src, size_t maxlen);
-size_t SDL_strlen(const char *str);
-size_t SDL_strlcpy(char *dst, const char *src, size_t maxlen);
-size_t SDL_utf8strlcpy(char *dst, const char *src, size_t dst_bytes);
-size_t SDL_strlcat(char *dst, const char *src, size_t maxlen);
-char * SDL_strdup(const char *str);
-char * SDL_strrev(char *str);
-char * SDL_strupr(char *str);
-char * SDL_strlwr(char *str);
-char * SDL_strchr(const char *str, int c);
-char * SDL_strrchr(const char *str, int c);
-char * SDL_strstr(const char *haystack, const char *needle);
-char * SDL_itoa(int value, char *str, int radix);
-char * SDL_uitoa(unsigned int value, char *str, int radix);
-char * SDL_ltoa(long value, char *str, int radix);
-char * SDL_ultoa(unsigned long value, char *str, int radix);
-char * SDL_lltoa(Sint64 value, char *str, int radix);
-char * SDL_ulltoa(Uint64 value, char *str, int radix);
-int SDL_atoi(const char *str);
-double SDL_atof(const char *str);
-long SDL_strtol(const char *str, char **endp, int base);
-unsigned long SDL_strtoul(const char *str, char **endp, int base);
-Sint64 SDL_strtoll(const char *str, char **endp, int base);
-Uint64 SDL_strtoull(const char *str, char **endp, int base);
-double SDL_strtod(const char *str, char **endp);
-int SDL_strcmp(const char *str1, const char *str2);
-int SDL_strncmp(const char *str1, const char *str2, size_t maxlen);
-int SDL_strcasecmp(const char *str1, const char *str2);
-int SDL_strncasecmp(const char *str1, const char *str2, size_t len);
-int SDL_sscanf(const char *text, const char *fmt, ...);
-int SDL_snprintf(char *text, size_t maxlen, const char *fmt, ...);
-int SDL_vsnprintf(char *text, size_t maxlen, const char *fmt, va_list ap);
-double SDL_atan(double x);
-double SDL_atan2(double x, double y);
-double SDL_ceil(double x);
-double SDL_copysign(double x, double y);
-double SDL_cos(double x);
-float SDL_cosf(float x);
-double SDL_fabs(double x);
-double SDL_floor(double x);
-double SDL_log(double x);
-double SDL_pow(double x, double y);
-double SDL_scalbn(double x, int n);
-double SDL_sin(double x);
-float SDL_sinf(float x);
-double SDL_sqrt(double x);
-typedef struct _SDL_iconv_t *SDL_iconv_t;
-SDL_iconv_t SDL_iconv_open(const char *tocode,
-                                                   const char *fromcode);
-int SDL_iconv_close(SDL_iconv_t cd);
-size_t SDL_iconv(SDL_iconv_t cd, const char **inbuf,
-                                         size_t * inbytesleft, char **outbuf,
-                                         size_t * outbytesleft);
-char * SDL_iconv_string(const char *tocode,
-                                               const char *fromcode,
-                                               const char *inbuf,
-                                               size_t inbytesleft);
-int SDL_main(int argc, char *argv[]);
-void SDL_SetMainReady(void);
-typedef enum
-{
-    SDL_ASSERTION_RETRY,
-    SDL_ASSERTION_BREAK,
-    SDL_ASSERTION_ABORT,
-    SDL_ASSERTION_IGNORE,
-    SDL_ASSERTION_ALWAYS_IGNORE
-} SDL_assert_state;
-typedef struct SDL_assert_data
-{
-    int always_ignore;
-    unsigned int trigger_count;
-    const char *condition;
-    const char *filename;
-    int linenum;
-    const char *function;
-    const struct SDL_assert_data *next;
-} SDL_assert_data;
-SDL_assert_state SDL_ReportAssertion(SDL_assert_data *,
-                                                             const char *,
-                                                             const char *, int);
-typedef SDL_assert_state ( *SDL_AssertionHandler)(
-                                 const SDL_assert_data* data, void* userdata);
-void SDL_SetAssertionHandler(
-                                            SDL_AssertionHandler handler,
-                                            void *userdata);
-const SDL_assert_data * SDL_GetAssertionReport(void);
-void SDL_ResetAssertionReport(void);
-typedef int SDL_SpinLock;
-SDL_bool SDL_AtomicTryLock(SDL_SpinLock *lock);
-void SDL_AtomicLock(SDL_SpinLock *lock);
-void SDL_AtomicUnlock(SDL_SpinLock *lock);
-typedef struct { int value; } SDL_atomic_t;
-int SDL_SetError(const char *fmt, ...);
-const char * SDL_GetError(void);
-void SDL_ClearError(void);
-typedef enum
-{
-    SDL_ENOMEM,
-    SDL_EFREAD,
-    SDL_EFWRITE,
-    SDL_EFSEEK,
-    SDL_UNSUPPORTED,
-    SDL_LASTERROR
-} SDL_errorcode;
-int SDL_Error(SDL_errorcode code);
-struct SDL_mutex;
-typedef struct SDL_mutex SDL_mutex;
-SDL_mutex * SDL_CreateMutex(void);
-int SDL_LockMutex(SDL_mutex * mutex);
-int SDL_TryLockMutex(SDL_mutex * mutex);
-int SDL_UnlockMutex(SDL_mutex * mutex);
-void SDL_DestroyMutex(SDL_mutex * mutex);
-struct SDL_semaphore;
-typedef struct SDL_semaphore SDL_sem;
-SDL_sem * SDL_CreateSemaphore(Uint32 initial_value);
-void SDL_DestroySemaphore(SDL_sem * sem);
-int SDL_SemWait(SDL_sem * sem);
-int SDL_SemTryWait(SDL_sem * sem);
-int SDL_SemWaitTimeout(SDL_sem * sem, Uint32 ms);
-int SDL_SemPost(SDL_sem * sem);
-Uint32 SDL_SemValue(SDL_sem * sem);
-struct SDL_cond;
-typedef struct SDL_cond SDL_cond;
-SDL_cond * SDL_CreateCond(void);
-void SDL_DestroyCond(SDL_cond * cond);
-int SDL_CondSignal(SDL_cond * cond);
-int SDL_CondBroadcast(SDL_cond * cond);
-int SDL_CondWait(SDL_cond * cond, SDL_mutex * mutex);
-int SDL_CondWaitTimeout(SDL_cond * cond,
-                                                SDL_mutex * mutex, Uint32 ms);
-struct SDL_Thread;
-typedef struct SDL_Thread SDL_Thread;
-typedef unsigned long SDL_threadID;
-typedef unsigned int SDL_TLSID;
-typedef enum {
-    SDL_THREAD_PRIORITY_LOW,
-    SDL_THREAD_PRIORITY_NORMAL,
-    SDL_THREAD_PRIORITY_HIGH
-} SDL_ThreadPriority;
-typedef int ( * SDL_ThreadFunction) (void *data);
-]]
-
-if jit.os == 'Windows' then
-  ffi.cdef[[
-
-typedef uintptr_t (*pfnSDL_CurrentBeginThread) (void *, unsigned,
-						unsigned (*func)(void*),
-						void *arg, unsigned,
-						unsigned *threadID);
-
-typedef void (*pfnSDL_CurrentEndThread) (unsigned code);
-
-uintptr_t _beginthreadex(void *, unsigned,
-			 unsigned (*func)(void*),
-			 void *arg, unsigned,
-			 unsigned *threadID);
-
-void _endthreadex(unsigned retval);
-
-/* note: this fails. why?
-   pfnSDL_CurrentBeginThread _beginthreadex;
-   pfnSDL_CurrentEndThread _endthreadex;
-*/
-
-SDL_Thread *
-SDL_CreateThread(SDL_ThreadFunction fn, const char *name, void *data,
-                 pfnSDL_CurrentBeginThread pfnBeginThread,
-                 pfnSDL_CurrentEndThread pfnEndThread);
-]]
-else
-  ffi.cdef[[
-SDL_Thread *
-SDL_CreateThread(SDL_ThreadFunction fn, const char *name, void *data);
-]]
-end
-
-ffi.cdef[[
-const char * SDL_GetThreadName(SDL_Thread *thread);
-SDL_threadID SDL_ThreadID(void);
-SDL_threadID SDL_GetThreadID(SDL_Thread * thread);
-int SDL_SetThreadPriority(SDL_ThreadPriority priority);
-void SDL_WaitThread(SDL_Thread * thread, int *status);
-SDL_TLSID SDL_TLSCreate(void);
-void * SDL_TLSGet(SDL_TLSID id);
-int SDL_TLSSet(SDL_TLSID id, const void *value, void (*destructor)(void*));
-typedef struct SDL_RWops
-{
-    Sint64 ( * size) (struct SDL_RWops * context);
-    Sint64 ( * seek) (struct SDL_RWops * context, Sint64 offset,
-                             int whence);
-    size_t ( * read) (struct SDL_RWops * context, void *ptr,
-                             size_t size, size_t maxnum);
-    size_t ( * write) (struct SDL_RWops * context, const void *ptr,
-                              size_t size, size_t num);
-    int ( * close) (struct SDL_RWops * context);
-    Uint32 type;
-    union
-    {
-        struct
-        {
-            SDL_bool autoclose;
-            FILE *fp;
-        } stdio;
-        struct
-        {
-            Uint8 *base;
-            Uint8 *here;
-            Uint8 *stop;
-        } mem;
-        struct
-        {
-            void *data1;
-            void *data2;
-        } unknown;
-    } hidden;
-} SDL_RWops;
-SDL_RWops * SDL_RWFromFile(const char *file,
-                                                  const char *mode);
-SDL_RWops * SDL_RWFromFP(FILE * fp,
-                                                SDL_bool autoclose);
-SDL_RWops * SDL_RWFromMem(void *mem, int size);
-SDL_RWops * SDL_RWFromConstMem(const void *mem,
-                                                      int size);
-SDL_RWops * SDL_AllocRW(void);
-void SDL_FreeRW(SDL_RWops * area);
-Uint8 SDL_ReadU8(SDL_RWops * src);
-Uint16 SDL_ReadLE16(SDL_RWops * src);
-Uint16 SDL_ReadBE16(SDL_RWops * src);
-Uint32 SDL_ReadLE32(SDL_RWops * src);
-Uint32 SDL_ReadBE32(SDL_RWops * src);
-Uint64 SDL_ReadLE64(SDL_RWops * src);
-Uint64 SDL_ReadBE64(SDL_RWops * src);
-size_t SDL_WriteU8(SDL_RWops * dst, Uint8 value);
-size_t SDL_WriteLE16(SDL_RWops * dst, Uint16 value);
-size_t SDL_WriteBE16(SDL_RWops * dst, Uint16 value);
-size_t SDL_WriteLE32(SDL_RWops * dst, Uint32 value);
-size_t SDL_WriteBE32(SDL_RWops * dst, Uint32 value);
-size_t SDL_WriteLE64(SDL_RWops * dst, Uint64 value);
-size_t SDL_WriteBE64(SDL_RWops * dst, Uint64 value);
-typedef Uint16 SDL_AudioFormat;
-typedef void ( * SDL_AudioCallback) (void *userdata, Uint8 * stream,
-                                            int len);
-typedef struct SDL_AudioSpec
-{
-    int freq;
-    SDL_AudioFormat format;
-    Uint8 channels;
-    Uint8 silence;
-    Uint16 samples;
-    Uint16 padding;
-    Uint32 size;
-    SDL_AudioCallback callback;
-    void *userdata;
-} SDL_AudioSpec;
-struct SDL_AudioCVT;
-typedef void ( * SDL_AudioFilter) (struct SDL_AudioCVT * cvt,
-                                          SDL_AudioFormat format);
-typedef struct SDL_AudioCVT
-{
-    int needed;
-    SDL_AudioFormat src_format;
-    SDL_AudioFormat dst_format;
-    double rate_incr;
-    Uint8 *buf;
-    int len;
-    int len_cvt;
-    int len_mult;
-    double len_ratio;
-    SDL_AudioFilter filters[10];
-    int filter_index;
-} __attribute__((packed)) SDL_AudioCVT;
-int SDL_GetNumAudioDrivers(void);
-const char * SDL_GetAudioDriver(int index);
-int SDL_AudioInit(const char *driver_name);
-void SDL_AudioQuit(void);
-const char * SDL_GetCurrentAudioDriver(void);
-int SDL_OpenAudio(SDL_AudioSpec * desired,
-                                          SDL_AudioSpec * obtained);
-typedef Uint32 SDL_AudioDeviceID;
-int SDL_GetNumAudioDevices(int iscapture);
-const char * SDL_GetAudioDeviceName(int index,
-                                                           int iscapture);
-SDL_AudioDeviceID SDL_OpenAudioDevice(const char
-                                                              *device,
-                                                              int iscapture,
-                                                              const
-                                                              SDL_AudioSpec *
-                                                              desired,
-                                                              SDL_AudioSpec *
-                                                              obtained,
-                                                              int
-                                                              allowed_changes);
-typedef enum
-{
-    SDL_AUDIO_STOPPED = 0,
-    SDL_AUDIO_PLAYING,
-    SDL_AUDIO_PAUSED
-} SDL_AudioStatus;
-SDL_AudioStatus SDL_GetAudioStatus(void);
-SDL_AudioStatus
-SDL_GetAudioDeviceStatus(SDL_AudioDeviceID dev);
-void SDL_PauseAudio(int pause_on);
-void SDL_PauseAudioDevice(SDL_AudioDeviceID dev,
-                                                  int pause_on);
-SDL_AudioSpec * SDL_LoadWAV_RW(SDL_RWops * src,
-                                                      int freesrc,
-                                                      SDL_AudioSpec * spec,
-                                                      Uint8 ** audio_buf,
-                                                      Uint32 * audio_len);
-void SDL_FreeWAV(Uint8 * audio_buf);
-int SDL_BuildAudioCVT(SDL_AudioCVT * cvt,
-                                              SDL_AudioFormat src_format,
-                                              Uint8 src_channels,
-                                              int src_rate,
-                                              SDL_AudioFormat dst_format,
-                                              Uint8 dst_channels,
-                                              int dst_rate);
-int SDL_ConvertAudio(SDL_AudioCVT * cvt);
-void SDL_MixAudio(Uint8 * dst, const Uint8 * src,
-                                          Uint32 len, int volume);
-void SDL_MixAudioFormat(Uint8 * dst,
-                                                const Uint8 * src,
-                                                SDL_AudioFormat format,
-                                                Uint32 len, int volume);
-void SDL_LockAudio(void);
-void SDL_LockAudioDevice(SDL_AudioDeviceID dev);
-void SDL_UnlockAudio(void);
-void SDL_UnlockAudioDevice(SDL_AudioDeviceID dev);
-void SDL_CloseAudio(void);
-void SDL_CloseAudioDevice(SDL_AudioDeviceID dev);
-int SDL_SetClipboardText(const char *text);
-char * SDL_GetClipboardText(void);
-SDL_bool SDL_HasClipboardText(void);
-int SDL_GetCPUCount(void);
-int SDL_GetCPUCacheLineSize(void);
-SDL_bool SDL_HasRDTSC(void);
-SDL_bool SDL_HasAltiVec(void);
-SDL_bool SDL_HasMMX(void);
-SDL_bool SDL_Has3DNow(void);
-SDL_bool SDL_HasSSE(void);
-SDL_bool SDL_HasSSE2(void);
-SDL_bool SDL_HasSSE3(void);
-SDL_bool SDL_HasSSE41(void);
-SDL_bool SDL_HasSSE42(void);
-enum
-{
-    SDL_PIXELTYPE_UNKNOWN,
-    SDL_PIXELTYPE_INDEX1,
-    SDL_PIXELTYPE_INDEX4,
-    SDL_PIXELTYPE_INDEX8,
-    SDL_PIXELTYPE_PACKED8,
-    SDL_PIXELTYPE_PACKED16,
-    SDL_PIXELTYPE_PACKED32,
-    SDL_PIXELTYPE_ARRAYU8,
-    SDL_PIXELTYPE_ARRAYU16,
-    SDL_PIXELTYPE_ARRAYU32,
-    SDL_PIXELTYPE_ARRAYF16,
-    SDL_PIXELTYPE_ARRAYF32
-};
-enum
-{
-    SDL_BITMAPORDER_NONE,
-    SDL_BITMAPORDER_4321,
-    SDL_BITMAPORDER_1234
-};
-enum
-{
-    SDL_PACKEDORDER_NONE,
-    SDL_PACKEDORDER_XRGB,
-    SDL_PACKEDORDER_RGBX,
-    SDL_PACKEDORDER_ARGB,
-    SDL_PACKEDORDER_RGBA,
-    SDL_PACKEDORDER_XBGR,
-    SDL_PACKEDORDER_BGRX,
-    SDL_PACKEDORDER_ABGR,
-    SDL_PACKEDORDER_BGRA
-};
-enum
-{
-    SDL_ARRAYORDER_NONE,
-    SDL_ARRAYORDER_RGB,
-    SDL_ARRAYORDER_RGBA,
-    SDL_ARRAYORDER_ARGB,
-    SDL_ARRAYORDER_BGR,
-    SDL_ARRAYORDER_BGRA,
-    SDL_ARRAYORDER_ABGR
-};
-enum
-{
-    SDL_PACKEDLAYOUT_NONE,
-    SDL_PACKEDLAYOUT_332,
-    SDL_PACKEDLAYOUT_4444,
-    SDL_PACKEDLAYOUT_1555,
-    SDL_PACKEDLAYOUT_5551,
-    SDL_PACKEDLAYOUT_565,
-    SDL_PACKEDLAYOUT_8888,
-    SDL_PACKEDLAYOUT_2101010,
-    SDL_PACKEDLAYOUT_1010102
-};
-enum
-{
-    SDL_PIXELFORMAT_UNKNOWN,
-    SDL_PIXELFORMAT_INDEX1LSB =
-        ((1 << 28) | ((SDL_PIXELTYPE_INDEX1) << 24) | ((SDL_BITMAPORDER_4321) << 20) | ((0) << 16) | ((1) << 8) | ((0) << 0)),
-    SDL_PIXELFORMAT_INDEX1MSB =
-        ((1 << 28) | ((SDL_PIXELTYPE_INDEX1) << 24) | ((SDL_BITMAPORDER_1234) << 20) | ((0) << 16) | ((1) << 8) | ((0) << 0)),
-    SDL_PIXELFORMAT_INDEX4LSB =
-        ((1 << 28) | ((SDL_PIXELTYPE_INDEX4) << 24) | ((SDL_BITMAPORDER_4321) << 20) | ((0) << 16) | ((4) << 8) | ((0) << 0)),
-    SDL_PIXELFORMAT_INDEX4MSB =
-        ((1 << 28) | ((SDL_PIXELTYPE_INDEX4) << 24) | ((SDL_BITMAPORDER_1234) << 20) | ((0) << 16) | ((4) << 8) | ((0) << 0)),
-    SDL_PIXELFORMAT_INDEX8 =
-        ((1 << 28) | ((SDL_PIXELTYPE_INDEX8) << 24) | ((0) << 20) | ((0) << 16) | ((8) << 8) | ((1) << 0)),
-    SDL_PIXELFORMAT_RGB332 =
-        ((1 << 28) | ((SDL_PIXELTYPE_PACKED8) << 24) | ((SDL_PACKEDORDER_XRGB) << 20) | ((SDL_PACKEDLAYOUT_332) << 16) | ((8) << 8) | ((1) << 0)),
-    SDL_PIXELFORMAT_RGB444 =
-        ((1 << 28) | ((SDL_PIXELTYPE_PACKED16) << 24) | ((SDL_PACKEDORDER_XRGB) << 20) | ((SDL_PACKEDLAYOUT_4444) << 16) | ((12) << 8) | ((2) << 0)),
-    SDL_PIXELFORMAT_RGB555 =
-        ((1 << 28) | ((SDL_PIXELTYPE_PACKED16) << 24) | ((SDL_PACKEDORDER_XRGB) << 20) | ((SDL_PACKEDLAYOUT_1555) << 16) | ((15) << 8) | ((2) << 0)),
-    SDL_PIXELFORMAT_BGR555 =
-        ((1 << 28) | ((SDL_PIXELTYPE_PACKED16) << 24) | ((SDL_PACKEDORDER_XBGR) << 20) | ((SDL_PACKEDLAYOUT_1555) << 16) | ((15) << 8) | ((2) << 0)),
-    SDL_PIXELFORMAT_ARGB4444 =
-        ((1 << 28) | ((SDL_PIXELTYPE_PACKED16) << 24) | ((SDL_PACKEDORDER_ARGB) << 20) | ((SDL_PACKEDLAYOUT_4444) << 16) | ((16) << 8) | ((2) << 0)),
-    SDL_PIXELFORMAT_RGBA4444 =
-        ((1 << 28) | ((SDL_PIXELTYPE_PACKED16) << 24) | ((SDL_PACKEDORDER_RGBA) << 20) | ((SDL_PACKEDLAYOUT_4444) << 16) | ((16) << 8) | ((2) << 0)),
-    SDL_PIXELFORMAT_ABGR4444 =
-        ((1 << 28) | ((SDL_PIXELTYPE_PACKED16) << 24) | ((SDL_PACKEDORDER_ABGR) << 20) | ((SDL_PACKEDLAYOUT_4444) << 16) | ((16) << 8) | ((2) << 0)),
-    SDL_PIXELFORMAT_BGRA4444 =
-        ((1 << 28) | ((SDL_PIXELTYPE_PACKED16) << 24) | ((SDL_PACKEDORDER_BGRA) << 20) | ((SDL_PACKEDLAYOUT_4444) << 16) | ((16) << 8) | ((2) << 0)),
-    SDL_PIXELFORMAT_ARGB1555 =
-        ((1 << 28) | ((SDL_PIXELTYPE_PACKED16) << 24) | ((SDL_PACKEDORDER_ARGB) << 20) | ((SDL_PACKEDLAYOUT_1555) << 16) | ((16) << 8) | ((2) << 0)),
-    SDL_PIXELFORMAT_RGBA5551 =
-        ((1 << 28) | ((SDL_PIXELTYPE_PACKED16) << 24) | ((SDL_PACKEDORDER_RGBA) << 20) | ((SDL_PACKEDLAYOUT_5551) << 16) | ((16) << 8) | ((2) << 0)),
-    SDL_PIXELFORMAT_ABGR1555 =
-        ((1 << 28) | ((SDL_PIXELTYPE_PACKED16) << 24) | ((SDL_PACKEDORDER_ABGR) << 20) | ((SDL_PACKEDLAYOUT_1555) << 16) | ((16) << 8) | ((2) << 0)),
-    SDL_PIXELFORMAT_BGRA5551 =
-        ((1 << 28) | ((SDL_PIXELTYPE_PACKED16) << 24) | ((SDL_PACKEDORDER_BGRA) << 20) | ((SDL_PACKEDLAYOUT_5551) << 16) | ((16) << 8) | ((2) << 0)),
-    SDL_PIXELFORMAT_RGB565 =
-        ((1 << 28) | ((SDL_PIXELTYPE_PACKED16) << 24) | ((SDL_PACKEDORDER_XRGB) << 20) | ((SDL_PACKEDLAYOUT_565) << 16) | ((16) << 8) | ((2) << 0)),
-    SDL_PIXELFORMAT_BGR565 =
-        ((1 << 28) | ((SDL_PIXELTYPE_PACKED16) << 24) | ((SDL_PACKEDORDER_XBGR) << 20) | ((SDL_PACKEDLAYOUT_565) << 16) | ((16) << 8) | ((2) << 0)),
-    SDL_PIXELFORMAT_RGB24 =
-        ((1 << 28) | ((SDL_PIXELTYPE_ARRAYU8) << 24) | ((SDL_ARRAYORDER_RGB) << 20) | ((0) << 16) | ((24) << 8) | ((3) << 0)),
-    SDL_PIXELFORMAT_BGR24 =
-        ((1 << 28) | ((SDL_PIXELTYPE_ARRAYU8) << 24) | ((SDL_ARRAYORDER_BGR) << 20) | ((0) << 16) | ((24) << 8) | ((3) << 0)),
-    SDL_PIXELFORMAT_RGB888 =
-        ((1 << 28) | ((SDL_PIXELTYPE_PACKED32) << 24) | ((SDL_PACKEDORDER_XRGB) << 20) | ((SDL_PACKEDLAYOUT_8888) << 16) | ((24) << 8) | ((4) << 0)),
-    SDL_PIXELFORMAT_RGBX8888 =
-        ((1 << 28) | ((SDL_PIXELTYPE_PACKED32) << 24) | ((SDL_PACKEDORDER_RGBX) << 20) | ((SDL_PACKEDLAYOUT_8888) << 16) | ((24) << 8) | ((4) << 0)),
-    SDL_PIXELFORMAT_BGR888 =
-        ((1 << 28) | ((SDL_PIXELTYPE_PACKED32) << 24) | ((SDL_PACKEDORDER_XBGR) << 20) | ((SDL_PACKEDLAYOUT_8888) << 16) | ((24) << 8) | ((4) << 0)),
-    SDL_PIXELFORMAT_BGRX8888 =
-        ((1 << 28) | ((SDL_PIXELTYPE_PACKED32) << 24) | ((SDL_PACKEDORDER_BGRX) << 20) | ((SDL_PACKEDLAYOUT_8888) << 16) | ((24) << 8) | ((4) << 0)),
-    SDL_PIXELFORMAT_ARGB8888 =
-        ((1 << 28) | ((SDL_PIXELTYPE_PACKED32) << 24) | ((SDL_PACKEDORDER_ARGB) << 20) | ((SDL_PACKEDLAYOUT_8888) << 16) | ((32) << 8) | ((4) << 0)),
-    SDL_PIXELFORMAT_RGBA8888 =
-        ((1 << 28) | ((SDL_PIXELTYPE_PACKED32) << 24) | ((SDL_PACKEDORDER_RGBA) << 20) | ((SDL_PACKEDLAYOUT_8888) << 16) | ((32) << 8) | ((4) << 0)),
-    SDL_PIXELFORMAT_ABGR8888 =
-        ((1 << 28) | ((SDL_PIXELTYPE_PACKED32) << 24) | ((SDL_PACKEDORDER_ABGR) << 20) | ((SDL_PACKEDLAYOUT_8888) << 16) | ((32) << 8) | ((4) << 0)),
-    SDL_PIXELFORMAT_BGRA8888 =
-        ((1 << 28) | ((SDL_PIXELTYPE_PACKED32) << 24) | ((SDL_PACKEDORDER_BGRA) << 20) | ((SDL_PACKEDLAYOUT_8888) << 16) | ((32) << 8) | ((4) << 0)),
-    SDL_PIXELFORMAT_ARGB2101010 =
-        ((1 << 28) | ((SDL_PIXELTYPE_PACKED32) << 24) | ((SDL_PACKEDORDER_ARGB) << 20) | ((SDL_PACKEDLAYOUT_2101010) << 16) | ((32) << 8) | ((4) << 0)),
-    SDL_PIXELFORMAT_YV12 =
-        ((((Uint32)(((Uint8)(('Y'))))) << 0) | (((Uint32)(((Uint8)(('V'))))) << 8) | (((Uint32)(((Uint8)(('1'))))) << 16) | (((Uint32)(((Uint8)(('2'))))) << 24)),
-    SDL_PIXELFORMAT_IYUV =
-        ((((Uint32)(((Uint8)(('I'))))) << 0) | (((Uint32)(((Uint8)(('Y'))))) << 8) | (((Uint32)(((Uint8)(('U'))))) << 16) | (((Uint32)(((Uint8)(('V'))))) << 24)),
-    SDL_PIXELFORMAT_YUY2 =
-        ((((Uint32)(((Uint8)(('Y'))))) << 0) | (((Uint32)(((Uint8)(('U'))))) << 8) | (((Uint32)(((Uint8)(('Y'))))) << 16) | (((Uint32)(((Uint8)(('2'))))) << 24)),
-    SDL_PIXELFORMAT_UYVY =
-        ((((Uint32)(((Uint8)(('U'))))) << 0) | (((Uint32)(((Uint8)(('Y'))))) << 8) | (((Uint32)(((Uint8)(('V'))))) << 16) | (((Uint32)(((Uint8)(('Y'))))) << 24)),
-    SDL_PIXELFORMAT_YVYU =
-        ((((Uint32)(((Uint8)(('Y'))))) << 0) | (((Uint32)(((Uint8)(('V'))))) << 8) | (((Uint32)(((Uint8)(('Y'))))) << 16) | (((Uint32)(((Uint8)(('U'))))) << 24))
-};
-typedef struct SDL_Color
-{
-    Uint8 r;
-    Uint8 g;
-    Uint8 b;
-    Uint8 a;
-} SDL_Color;
-typedef struct SDL_Palette
-{
-    int ncolors;
-    SDL_Color *colors;
-    Uint32 version;
-    int refcount;
-} SDL_Palette;
-typedef struct SDL_PixelFormat
-{
-    Uint32 format;
-    SDL_Palette *palette;
-    Uint8 BitsPerPixel;
-    Uint8 BytesPerPixel;
-    Uint8 padding[2];
-    Uint32 Rmask;
-    Uint32 Gmask;
-    Uint32 Bmask;
-    Uint32 Amask;
-    Uint8 Rloss;
-    Uint8 Gloss;
-    Uint8 Bloss;
-    Uint8 Aloss;
-    Uint8 Rshift;
-    Uint8 Gshift;
-    Uint8 Bshift;
-    Uint8 Ashift;
-    int refcount;
-    struct SDL_PixelFormat *next;
-} SDL_PixelFormat;
-const char* SDL_GetPixelFormatName(Uint32 format);
-SDL_bool SDL_PixelFormatEnumToMasks(Uint32 format,
-                                                            int *bpp,
-                                                            Uint32 * Rmask,
-                                                            Uint32 * Gmask,
-                                                            Uint32 * Bmask,
-                                                            Uint32 * Amask);
-Uint32 SDL_MasksToPixelFormatEnum(int bpp,
-                                                          Uint32 Rmask,
-                                                          Uint32 Gmask,
-                                                          Uint32 Bmask,
-                                                          Uint32 Amask);
-SDL_PixelFormat * SDL_AllocFormat(Uint32 pixel_format);
-void SDL_FreeFormat(SDL_PixelFormat *format);
-SDL_Palette * SDL_AllocPalette(int ncolors);
-int SDL_SetPixelFormatPalette(SDL_PixelFormat * format,
-                                                      SDL_Palette *palette);
-int SDL_SetPaletteColors(SDL_Palette * palette,
-                                                 const SDL_Color * colors,
-                                                 int firstcolor, int ncolors);
-void SDL_FreePalette(SDL_Palette * palette);
-Uint32 SDL_MapRGB(const SDL_PixelFormat * format,
-                                          Uint8 r, Uint8 g, Uint8 b);
-Uint32 SDL_MapRGBA(const SDL_PixelFormat * format,
-                                           Uint8 r, Uint8 g, Uint8 b,
-                                           Uint8 a);
-void SDL_GetRGB(Uint32 pixel,
-                                        const SDL_PixelFormat * format,
-                                        Uint8 * r, Uint8 * g, Uint8 * b);
-void SDL_GetRGBA(Uint32 pixel,
-                                         const SDL_PixelFormat * format,
-                                         Uint8 * r, Uint8 * g, Uint8 * b,
-                                         Uint8 * a);
-void SDL_CalculateGammaRamp(float gamma, Uint16 * ramp);
-typedef struct
-{
-    int x;
-    int y;
-} SDL_Point;
-typedef struct SDL_Rect
-{
-    int x, y;
-    int w, h;
-} SDL_Rect;
-SDL_bool SDL_HasIntersection(const SDL_Rect * A,
-                                                     const SDL_Rect * B);
-SDL_bool SDL_IntersectRect(const SDL_Rect * A,
-                                                   const SDL_Rect * B,
-                                                   SDL_Rect * result);
-void SDL_UnionRect(const SDL_Rect * A,
-                                           const SDL_Rect * B,
-                                           SDL_Rect * result);
-SDL_bool SDL_EnclosePoints(const SDL_Point * points,
-                                                   int count,
-                                                   const SDL_Rect * clip,
-                                                   SDL_Rect * result);
-SDL_bool SDL_IntersectRectAndLine(const SDL_Rect *
-                                                          rect, int *X1,
-                                                          int *Y1, int *X2,
-                                                          int *Y2);
-typedef enum
-{
-    SDL_BLENDMODE_NONE = 0x00000000,
-    SDL_BLENDMODE_BLEND = 0x00000001,
-    SDL_BLENDMODE_ADD = 0x00000002,
-    SDL_BLENDMODE_MOD = 0x00000004
-} SDL_BlendMode;
-typedef struct SDL_Surface
-{
-    Uint32 flags;
-    SDL_PixelFormat *format;
-    int w, h;
-    int pitch;
-    void *pixels;
-    void *userdata;
-    int locked;
-    void *lock_data;
-    SDL_Rect clip_rect;
-    struct SDL_BlitMap *map;
-    int refcount;
-} SDL_Surface;
-typedef int (*SDL_blit) (struct SDL_Surface * src, SDL_Rect * srcrect,
-                         struct SDL_Surface * dst, SDL_Rect * dstrect);
-SDL_Surface * SDL_CreateRGBSurface
-    (Uint32 flags, int width, int height, int depth,
-     Uint32 Rmask, Uint32 Gmask, Uint32 Bmask, Uint32 Amask);
-SDL_Surface * SDL_CreateRGBSurfaceFrom(void *pixels,
-                                                              int width,
-                                                              int height,
-                                                              int depth,
-                                                              int pitch,
-                                                              Uint32 Rmask,
-                                                              Uint32 Gmask,
-                                                              Uint32 Bmask,
-                                                              Uint32 Amask);
-void SDL_FreeSurface(SDL_Surface * surface);
-int SDL_SetSurfacePalette(SDL_Surface * surface,
-                                                  SDL_Palette * palette);
-int SDL_LockSurface(SDL_Surface * surface);
-void SDL_UnlockSurface(SDL_Surface * surface);
-SDL_Surface * SDL_LoadBMP_RW(SDL_RWops * src,
-                                                    int freesrc);
-int SDL_SaveBMP_RW
-    (SDL_Surface * surface, SDL_RWops * dst, int freedst);
-int SDL_SetSurfaceRLE(SDL_Surface * surface,
-                                              int flag);
-int SDL_SetColorKey(SDL_Surface * surface,
-                                            int flag, Uint32 key);
-int SDL_GetColorKey(SDL_Surface * surface,
-                                            Uint32 * key);
-int SDL_SetSurfaceColorMod(SDL_Surface * surface,
-                                                   Uint8 r, Uint8 g, Uint8 b);
-int SDL_GetSurfaceColorMod(SDL_Surface * surface,
-                                                   Uint8 * r, Uint8 * g,
-                                                   Uint8 * b);
-int SDL_SetSurfaceAlphaMod(SDL_Surface * surface,
-                                                   Uint8 alpha);
-int SDL_GetSurfaceAlphaMod(SDL_Surface * surface,
-                                                   Uint8 * alpha);
-int SDL_SetSurfaceBlendMode(SDL_Surface * surface,
-                                                    SDL_BlendMode blendMode);
-int SDL_GetSurfaceBlendMode(SDL_Surface * surface,
-                                                    SDL_BlendMode *blendMode);
-SDL_bool SDL_SetClipRect(SDL_Surface * surface,
-                                                 const SDL_Rect * rect);
-void SDL_GetClipRect(SDL_Surface * surface,
-                                             SDL_Rect * rect);
-SDL_Surface * SDL_ConvertSurface
-    (SDL_Surface * src, SDL_PixelFormat * fmt, Uint32 flags);
-SDL_Surface * SDL_ConvertSurfaceFormat
-    (SDL_Surface * src, Uint32 pixel_format, Uint32 flags);
-int SDL_ConvertPixels(int width, int height,
-                                              Uint32 src_format,
-                                              const void * src, int src_pitch,
-                                              Uint32 dst_format,
-                                              void * dst, int dst_pitch);
-int SDL_FillRect
-    (SDL_Surface * dst, const SDL_Rect * rect, Uint32 color);
-int SDL_FillRects
-    (SDL_Surface * dst, const SDL_Rect * rects, int count, Uint32 color);
-int SDL_UpperBlit
-    (SDL_Surface * src, const SDL_Rect * srcrect,
-     SDL_Surface * dst, SDL_Rect * dstrect);
-int SDL_LowerBlit
-    (SDL_Surface * src, SDL_Rect * srcrect,
-     SDL_Surface * dst, SDL_Rect * dstrect);
-int SDL_SoftStretch(SDL_Surface * src,
-                                            const SDL_Rect * srcrect,
-                                            SDL_Surface * dst,
-                                            const SDL_Rect * dstrect);
-int SDL_UpperBlitScaled
-    (SDL_Surface * src, const SDL_Rect * srcrect,
-    SDL_Surface * dst, SDL_Rect * dstrect);
-int SDL_LowerBlitScaled
-    (SDL_Surface * src, SDL_Rect * srcrect,
-    SDL_Surface * dst, SDL_Rect * dstrect);
-typedef struct
-{
-    Uint32 format;
-    int w;
-    int h;
-    int refresh_rate;
-    void *driverdata;
-} SDL_DisplayMode;
-typedef struct SDL_Window SDL_Window;
-typedef enum
-{
-    SDL_WINDOW_FULLSCREEN = 0x00000001,
-    SDL_WINDOW_OPENGL = 0x00000002,
-    SDL_WINDOW_SHOWN = 0x00000004,
-    SDL_WINDOW_HIDDEN = 0x00000008,
-    SDL_WINDOW_BORDERLESS = 0x00000010,
-    SDL_WINDOW_RESIZABLE = 0x00000020,
-    SDL_WINDOW_MINIMIZED = 0x00000040,
-    SDL_WINDOW_MAXIMIZED = 0x00000080,
-    SDL_WINDOW_INPUT_GRABBED = 0x00000100,
-    SDL_WINDOW_INPUT_FOCUS = 0x00000200,
-    SDL_WINDOW_MOUSE_FOCUS = 0x00000400,
-    SDL_WINDOW_FULLSCREEN_DESKTOP = ( SDL_WINDOW_FULLSCREEN | 0x00001000 ),
-    SDL_WINDOW_FOREIGN = 0x00000800
-} SDL_WindowFlags;
-typedef enum
-{
-    SDL_WINDOWEVENT_NONE,
-    SDL_WINDOWEVENT_SHOWN,
-    SDL_WINDOWEVENT_HIDDEN,
-    SDL_WINDOWEVENT_EXPOSED,
-    SDL_WINDOWEVENT_MOVED,
-    SDL_WINDOWEVENT_RESIZED,
-    SDL_WINDOWEVENT_SIZE_CHANGED,
-    SDL_WINDOWEVENT_MINIMIZED,
-    SDL_WINDOWEVENT_MAXIMIZED,
-    SDL_WINDOWEVENT_RESTORED,
-    SDL_WINDOWEVENT_ENTER,
-    SDL_WINDOWEVENT_LEAVE,
-    SDL_WINDOWEVENT_FOCUS_GAINED,
-    SDL_WINDOWEVENT_FOCUS_LOST,
-    SDL_WINDOWEVENT_CLOSE
-} SDL_WindowEventID;
-typedef void *SDL_GLContext;
-typedef enum
-{
-    SDL_GL_RED_SIZE,
-    SDL_GL_GREEN_SIZE,
-    SDL_GL_BLUE_SIZE,
-    SDL_GL_ALPHA_SIZE,
-    SDL_GL_BUFFER_SIZE,
-    SDL_GL_DOUBLEBUFFER,
-    SDL_GL_DEPTH_SIZE,
-    SDL_GL_STENCIL_SIZE,
-    SDL_GL_ACCUM_RED_SIZE,
-    SDL_GL_ACCUM_GREEN_SIZE,
-    SDL_GL_ACCUM_BLUE_SIZE,
-    SDL_GL_ACCUM_ALPHA_SIZE,
-    SDL_GL_STEREO,
-    SDL_GL_MULTISAMPLEBUFFERS,
-    SDL_GL_MULTISAMPLESAMPLES,
-    SDL_GL_ACCELERATED_VISUAL,
-    SDL_GL_RETAINED_BACKING,
-    SDL_GL_CONTEXT_MAJOR_VERSION,
-    SDL_GL_CONTEXT_MINOR_VERSION,
-    SDL_GL_CONTEXT_EGL,
-    SDL_GL_CONTEXT_FLAGS,
-    SDL_GL_CONTEXT_PROFILE_MASK,
-    SDL_GL_SHARE_WITH_CURRENT_CONTEXT
-} SDL_GLattr;
-typedef enum
-{
-    SDL_GL_CONTEXT_PROFILE_CORE = 0x0001,
-    SDL_GL_CONTEXT_PROFILE_COMPATIBILITY = 0x0002,
-    SDL_GL_CONTEXT_PROFILE_ES = 0x0004
-} SDL_GLprofile;
-typedef enum
-{
-    SDL_GL_CONTEXT_DEBUG_FLAG = 0x0001,
-    SDL_GL_CONTEXT_FORWARD_COMPATIBLE_FLAG = 0x0002,
-    SDL_GL_CONTEXT_ROBUST_ACCESS_FLAG = 0x0004,
-    SDL_GL_CONTEXT_RESET_ISOLATION_FLAG = 0x0008
-} SDL_GLcontextFlag;
-int SDL_GetNumVideoDrivers(void);
-const char * SDL_GetVideoDriver(int index);
-int SDL_VideoInit(const char *driver_name);
-void SDL_VideoQuit(void);
-const char * SDL_GetCurrentVideoDriver(void);
-int SDL_GetNumVideoDisplays(void);
-const char * SDL_GetDisplayName(int displayIndex);
-int SDL_GetDisplayBounds(int displayIndex, SDL_Rect * rect);
-int SDL_GetNumDisplayModes(int displayIndex);
-int SDL_GetDisplayMode(int displayIndex, int modeIndex,
-                                               SDL_DisplayMode * mode);
-int SDL_GetDesktopDisplayMode(int displayIndex, SDL_DisplayMode * mode);
-int SDL_GetCurrentDisplayMode(int displayIndex, SDL_DisplayMode * mode);
-SDL_DisplayMode * SDL_GetClosestDisplayMode(int displayIndex, const SDL_DisplayMode * mode, SDL_DisplayMode * closest);
-int SDL_GetWindowDisplayIndex(SDL_Window * window);
-int SDL_SetWindowDisplayMode(SDL_Window * window,
-                                                     const SDL_DisplayMode
-                                                         * mode);
-int SDL_GetWindowDisplayMode(SDL_Window * window,
-                                                     SDL_DisplayMode * mode);
-Uint32 SDL_GetWindowPixelFormat(SDL_Window * window);
-SDL_Window * SDL_CreateWindow(const char *title,
-                                                      int x, int y, int w,
-                                                      int h, Uint32 flags);
-SDL_Window * SDL_CreateWindowFrom(const void *data);
-Uint32 SDL_GetWindowID(SDL_Window * window);
-SDL_Window * SDL_GetWindowFromID(Uint32 id);
-Uint32 SDL_GetWindowFlags(SDL_Window * window);
-void SDL_SetWindowTitle(SDL_Window * window,
-                                                const char *title);
-const char * SDL_GetWindowTitle(SDL_Window * window);
-void SDL_SetWindowIcon(SDL_Window * window,
-                                               SDL_Surface * icon);
-void* SDL_SetWindowData(SDL_Window * window,
-                                                const char *name,
-                                                void *userdata);
-void * SDL_GetWindowData(SDL_Window * window,
-                                                const char *name);
-void SDL_SetWindowPosition(SDL_Window * window,
-                                                   int x, int y);
-void SDL_GetWindowPosition(SDL_Window * window,
-                                                   int *x, int *y);
-void SDL_SetWindowSize(SDL_Window * window, int w,
-                                               int h);
-void SDL_GetWindowSize(SDL_Window * window, int *w,
-                                               int *h);
-void SDL_SetWindowMinimumSize(SDL_Window * window,
-                                                      int min_w, int min_h);
-void SDL_GetWindowMinimumSize(SDL_Window * window,
-                                                      int *w, int *h);
-void SDL_SetWindowMaximumSize(SDL_Window * window,
-                                                      int max_w, int max_h);
-void SDL_GetWindowMaximumSize(SDL_Window * window,
-                                                      int *w, int *h);
-void SDL_SetWindowBordered(SDL_Window * window,
-                                                   SDL_bool bordered);
-void SDL_ShowWindow(SDL_Window * window);
-void SDL_HideWindow(SDL_Window * window);
-void SDL_RaiseWindow(SDL_Window * window);
-void SDL_MaximizeWindow(SDL_Window * window);
-void SDL_MinimizeWindow(SDL_Window * window);
-void SDL_RestoreWindow(SDL_Window * window);
-int SDL_SetWindowFullscreen(SDL_Window * window,
-                                                    Uint32 flags);
-SDL_Surface * SDL_GetWindowSurface(SDL_Window * window);
-int SDL_UpdateWindowSurface(SDL_Window * window);
-int SDL_UpdateWindowSurfaceRects(SDL_Window * window,
-                                                         const SDL_Rect * rects,
-                                                         int numrects);
-void SDL_SetWindowGrab(SDL_Window * window,
-                                               SDL_bool grabbed);
-SDL_bool SDL_GetWindowGrab(SDL_Window * window);
-int SDL_SetWindowBrightness(SDL_Window * window, float brightness);
-float SDL_GetWindowBrightness(SDL_Window * window);
-int SDL_SetWindowGammaRamp(SDL_Window * window,
-                                                   const Uint16 * red,
-                                                   const Uint16 * green,
-                                                   const Uint16 * blue);
-int SDL_GetWindowGammaRamp(SDL_Window * window,
-                                                   Uint16 * red,
-                                                   Uint16 * green,
-                                                   Uint16 * blue);
-void SDL_DestroyWindow(SDL_Window * window);
-SDL_bool SDL_IsScreenSaverEnabled(void);
-void SDL_EnableScreenSaver(void);
-void SDL_DisableScreenSaver(void);
-int SDL_GL_LoadLibrary(const char *path);
-void * SDL_GL_GetProcAddress(const char *proc);
-void SDL_GL_UnloadLibrary(void);
-SDL_bool SDL_GL_ExtensionSupported(const char
-                                                           *extension);
-int SDL_GL_SetAttribute(SDL_GLattr attr, int value);
-int SDL_GL_GetAttribute(SDL_GLattr attr, int *value);
-SDL_GLContext SDL_GL_CreateContext(SDL_Window *
-                                                           window);
-int SDL_GL_MakeCurrent(SDL_Window * window,
-                                               SDL_GLContext context);
-SDL_Window* SDL_GL_GetCurrentWindow(void);
-SDL_GLContext SDL_GL_GetCurrentContext(void);
-int SDL_GL_SetSwapInterval(int interval);
-int SDL_GL_GetSwapInterval(void);
-void SDL_GL_SwapWindow(SDL_Window * window);
-void SDL_GL_DeleteContext(SDL_GLContext context);
-typedef Sint32 SDL_Scancode;
-enum
-{
-    SDL_SCANCODE_UNKNOWN = 0,
-    SDL_SCANCODE_A = 4,
-    SDL_SCANCODE_B = 5,
-    SDL_SCANCODE_C = 6,
-    SDL_SCANCODE_D = 7,
-    SDL_SCANCODE_E = 8,
-    SDL_SCANCODE_F = 9,
-    SDL_SCANCODE_G = 10,
-    SDL_SCANCODE_H = 11,
-    SDL_SCANCODE_I = 12,
-    SDL_SCANCODE_J = 13,
-    SDL_SCANCODE_K = 14,
-    SDL_SCANCODE_L = 15,
-    SDL_SCANCODE_M = 16,
-    SDL_SCANCODE_N = 17,
-    SDL_SCANCODE_O = 18,
-    SDL_SCANCODE_P = 19,
-    SDL_SCANCODE_Q = 20,
-    SDL_SCANCODE_R = 21,
-    SDL_SCANCODE_S = 22,
-    SDL_SCANCODE_T = 23,
-    SDL_SCANCODE_U = 24,
-    SDL_SCANCODE_V = 25,
-    SDL_SCANCODE_W = 26,
-    SDL_SCANCODE_X = 27,
-    SDL_SCANCODE_Y = 28,
-    SDL_SCANCODE_Z = 29,
-    SDL_SCANCODE_1 = 30,
-    SDL_SCANCODE_2 = 31,
-    SDL_SCANCODE_3 = 32,
-    SDL_SCANCODE_4 = 33,
-    SDL_SCANCODE_5 = 34,
-    SDL_SCANCODE_6 = 35,
-    SDL_SCANCODE_7 = 36,
-    SDL_SCANCODE_8 = 37,
-    SDL_SCANCODE_9 = 38,
-    SDL_SCANCODE_0 = 39,
-    SDL_SCANCODE_RETURN = 40,
-    SDL_SCANCODE_ESCAPE = 41,
-    SDL_SCANCODE_BACKSPACE = 42,
-    SDL_SCANCODE_TAB = 43,
-    SDL_SCANCODE_SPACE = 44,
-    SDL_SCANCODE_MINUS = 45,
-    SDL_SCANCODE_EQUALS = 46,
-    SDL_SCANCODE_LEFTBRACKET = 47,
-    SDL_SCANCODE_RIGHTBRACKET = 48,
-    SDL_SCANCODE_BACKSLASH = 49,
-    SDL_SCANCODE_NONUSHASH = 50,
-    SDL_SCANCODE_SEMICOLON = 51,
-    SDL_SCANCODE_APOSTROPHE = 52,
-    SDL_SCANCODE_GRAVE = 53,
-    SDL_SCANCODE_COMMA = 54,
-    SDL_SCANCODE_PERIOD = 55,
-    SDL_SCANCODE_SLASH = 56,
-    SDL_SCANCODE_CAPSLOCK = 57,
-    SDL_SCANCODE_F1 = 58,
-    SDL_SCANCODE_F2 = 59,
-    SDL_SCANCODE_F3 = 60,
-    SDL_SCANCODE_F4 = 61,
-    SDL_SCANCODE_F5 = 62,
-    SDL_SCANCODE_F6 = 63,
-    SDL_SCANCODE_F7 = 64,
-    SDL_SCANCODE_F8 = 65,
-    SDL_SCANCODE_F9 = 66,
-    SDL_SCANCODE_F10 = 67,
-    SDL_SCANCODE_F11 = 68,
-    SDL_SCANCODE_F12 = 69,
-    SDL_SCANCODE_PRINTSCREEN = 70,
-    SDL_SCANCODE_SCROLLLOCK = 71,
-    SDL_SCANCODE_PAUSE = 72,
-    SDL_SCANCODE_INSERT = 73,
-    SDL_SCANCODE_HOME = 74,
-    SDL_SCANCODE_PAGEUP = 75,
-    SDL_SCANCODE_DELETE = 76,
-    SDL_SCANCODE_END = 77,
-    SDL_SCANCODE_PAGEDOWN = 78,
-    SDL_SCANCODE_RIGHT = 79,
-    SDL_SCANCODE_LEFT = 80,
-    SDL_SCANCODE_DOWN = 81,
-    SDL_SCANCODE_UP = 82,
-    SDL_SCANCODE_NUMLOCKCLEAR = 83,
-    SDL_SCANCODE_KP_DIVIDE = 84,
-    SDL_SCANCODE_KP_MULTIPLY = 85,
-    SDL_SCANCODE_KP_MINUS = 86,
-    SDL_SCANCODE_KP_PLUS = 87,
-    SDL_SCANCODE_KP_ENTER = 88,
-    SDL_SCANCODE_KP_1 = 89,
-    SDL_SCANCODE_KP_2 = 90,
-    SDL_SCANCODE_KP_3 = 91,
-    SDL_SCANCODE_KP_4 = 92,
-    SDL_SCANCODE_KP_5 = 93,
-    SDL_SCANCODE_KP_6 = 94,
-    SDL_SCANCODE_KP_7 = 95,
-    SDL_SCANCODE_KP_8 = 96,
-    SDL_SCANCODE_KP_9 = 97,
-    SDL_SCANCODE_KP_0 = 98,
-    SDL_SCANCODE_KP_PERIOD = 99,
-    SDL_SCANCODE_NONUSBACKSLASH = 100,
-    SDL_SCANCODE_APPLICATION = 101,
-    SDL_SCANCODE_POWER = 102,
-    SDL_SCANCODE_KP_EQUALS = 103,
-    SDL_SCANCODE_F13 = 104,
-    SDL_SCANCODE_F14 = 105,
-    SDL_SCANCODE_F15 = 106,
-    SDL_SCANCODE_F16 = 107,
-    SDL_SCANCODE_F17 = 108,
-    SDL_SCANCODE_F18 = 109,
-    SDL_SCANCODE_F19 = 110,
-    SDL_SCANCODE_F20 = 111,
-    SDL_SCANCODE_F21 = 112,
-    SDL_SCANCODE_F22 = 113,
-    SDL_SCANCODE_F23 = 114,
-    SDL_SCANCODE_F24 = 115,
-    SDL_SCANCODE_EXECUTE = 116,
-    SDL_SCANCODE_HELP = 117,
-    SDL_SCANCODE_MENU = 118,
-    SDL_SCANCODE_SELECT = 119,
-    SDL_SCANCODE_STOP = 120,
-    SDL_SCANCODE_AGAIN = 121,
-    SDL_SCANCODE_UNDO = 122,
-    SDL_SCANCODE_CUT = 123,
-    SDL_SCANCODE_COPY = 124,
-    SDL_SCANCODE_PASTE = 125,
-    SDL_SCANCODE_FIND = 126,
-    SDL_SCANCODE_MUTE = 127,
-    SDL_SCANCODE_VOLUMEUP = 128,
-    SDL_SCANCODE_VOLUMEDOWN = 129,
-    SDL_SCANCODE_KP_COMMA = 133,
-    SDL_SCANCODE_KP_EQUALSAS400 = 134,
-    SDL_SCANCODE_INTERNATIONAL1 = 135,
-    SDL_SCANCODE_INTERNATIONAL2 = 136,
-    SDL_SCANCODE_INTERNATIONAL3 = 137,
-    SDL_SCANCODE_INTERNATIONAL4 = 138,
-    SDL_SCANCODE_INTERNATIONAL5 = 139,
-    SDL_SCANCODE_INTERNATIONAL6 = 140,
-    SDL_SCANCODE_INTERNATIONAL7 = 141,
-    SDL_SCANCODE_INTERNATIONAL8 = 142,
-    SDL_SCANCODE_INTERNATIONAL9 = 143,
-    SDL_SCANCODE_LANG1 = 144,
-    SDL_SCANCODE_LANG2 = 145,
-    SDL_SCANCODE_LANG3 = 146,
-    SDL_SCANCODE_LANG4 = 147,
-    SDL_SCANCODE_LANG5 = 148,
-    SDL_SCANCODE_LANG6 = 149,
-    SDL_SCANCODE_LANG7 = 150,
-    SDL_SCANCODE_LANG8 = 151,
-    SDL_SCANCODE_LANG9 = 152,
-    SDL_SCANCODE_ALTERASE = 153,
-    SDL_SCANCODE_SYSREQ = 154,
-    SDL_SCANCODE_CANCEL = 155,
-    SDL_SCANCODE_CLEAR = 156,
-    SDL_SCANCODE_PRIOR = 157,
-    SDL_SCANCODE_RETURN2 = 158,
-    SDL_SCANCODE_SEPARATOR = 159,
-    SDL_SCANCODE_OUT = 160,
-    SDL_SCANCODE_OPER = 161,
-    SDL_SCANCODE_CLEARAGAIN = 162,
-    SDL_SCANCODE_CRSEL = 163,
-    SDL_SCANCODE_EXSEL = 164,
-    SDL_SCANCODE_KP_00 = 176,
-    SDL_SCANCODE_KP_000 = 177,
-    SDL_SCANCODE_THOUSANDSSEPARATOR = 178,
-    SDL_SCANCODE_DECIMALSEPARATOR = 179,
-    SDL_SCANCODE_CURRENCYUNIT = 180,
-    SDL_SCANCODE_CURRENCYSUBUNIT = 181,
-    SDL_SCANCODE_KP_LEFTPAREN = 182,
-    SDL_SCANCODE_KP_RIGHTPAREN = 183,
-    SDL_SCANCODE_KP_LEFTBRACE = 184,
-    SDL_SCANCODE_KP_RIGHTBRACE = 185,
-    SDL_SCANCODE_KP_TAB = 186,
-    SDL_SCANCODE_KP_BACKSPACE = 187,
-    SDL_SCANCODE_KP_A = 188,
-    SDL_SCANCODE_KP_B = 189,
-    SDL_SCANCODE_KP_C = 190,
-    SDL_SCANCODE_KP_D = 191,
-    SDL_SCANCODE_KP_E = 192,
-    SDL_SCANCODE_KP_F = 193,
-    SDL_SCANCODE_KP_XOR = 194,
-    SDL_SCANCODE_KP_POWER = 195,
-    SDL_SCANCODE_KP_PERCENT = 196,
-    SDL_SCANCODE_KP_LESS = 197,
-    SDL_SCANCODE_KP_GREATER = 198,
-    SDL_SCANCODE_KP_AMPERSAND = 199,
-    SDL_SCANCODE_KP_DBLAMPERSAND = 200,
-    SDL_SCANCODE_KP_VERTICALBAR = 201,
-    SDL_SCANCODE_KP_DBLVERTICALBAR = 202,
-    SDL_SCANCODE_KP_COLON = 203,
-    SDL_SCANCODE_KP_HASH = 204,
-    SDL_SCANCODE_KP_SPACE = 205,
-    SDL_SCANCODE_KP_AT = 206,
-    SDL_SCANCODE_KP_EXCLAM = 207,
-    SDL_SCANCODE_KP_MEMSTORE = 208,
-    SDL_SCANCODE_KP_MEMRECALL = 209,
-    SDL_SCANCODE_KP_MEMCLEAR = 210,
-    SDL_SCANCODE_KP_MEMADD = 211,
-    SDL_SCANCODE_KP_MEMSUBTRACT = 212,
-    SDL_SCANCODE_KP_MEMMULTIPLY = 213,
-    SDL_SCANCODE_KP_MEMDIVIDE = 214,
-    SDL_SCANCODE_KP_PLUSMINUS = 215,
-    SDL_SCANCODE_KP_CLEAR = 216,
-    SDL_SCANCODE_KP_CLEARENTRY = 217,
-    SDL_SCANCODE_KP_BINARY = 218,
-    SDL_SCANCODE_KP_OCTAL = 219,
-    SDL_SCANCODE_KP_DECIMAL = 220,
-    SDL_SCANCODE_KP_HEXADECIMAL = 221,
-    SDL_SCANCODE_LCTRL = 224,
-    SDL_SCANCODE_LSHIFT = 225,
-    SDL_SCANCODE_LALT = 226,
-    SDL_SCANCODE_LGUI = 227,
-    SDL_SCANCODE_RCTRL = 228,
-    SDL_SCANCODE_RSHIFT = 229,
-    SDL_SCANCODE_RALT = 230,
-    SDL_SCANCODE_RGUI = 231,
-    SDL_SCANCODE_MODE = 257,
-    SDL_SCANCODE_AUDIONEXT = 258,
-    SDL_SCANCODE_AUDIOPREV = 259,
-    SDL_SCANCODE_AUDIOSTOP = 260,
-    SDL_SCANCODE_AUDIOPLAY = 261,
-    SDL_SCANCODE_AUDIOMUTE = 262,
-    SDL_SCANCODE_MEDIASELECT = 263,
-    SDL_SCANCODE_WWW = 264,
-    SDL_SCANCODE_MAIL = 265,
-    SDL_SCANCODE_CALCULATOR = 266,
-    SDL_SCANCODE_COMPUTER = 267,
-    SDL_SCANCODE_AC_SEARCH = 268,
-    SDL_SCANCODE_AC_HOME = 269,
-    SDL_SCANCODE_AC_BACK = 270,
-    SDL_SCANCODE_AC_FORWARD = 271,
-    SDL_SCANCODE_AC_STOP = 272,
-    SDL_SCANCODE_AC_REFRESH = 273,
-    SDL_SCANCODE_AC_BOOKMARKS = 274,
-    SDL_SCANCODE_BRIGHTNESSDOWN = 275,
-    SDL_SCANCODE_BRIGHTNESSUP = 276,
-    SDL_SCANCODE_DISPLAYSWITCH = 277,
-    SDL_SCANCODE_KBDILLUMTOGGLE = 278,
-    SDL_SCANCODE_KBDILLUMDOWN = 279,
-    SDL_SCANCODE_KBDILLUMUP = 280,
-    SDL_SCANCODE_EJECT = 281,
-    SDL_SCANCODE_SLEEP = 282,
-    SDL_SCANCODE_APP1 = 283,
-    SDL_SCANCODE_APP2 = 284,
-    SDL_NUM_SCANCODES = 512
-};
-typedef Sint32 SDL_Keycode;
-enum
-{
-    SDLK_UNKNOWN = 0,
-    SDLK_RETURN = '\r',
-    SDLK_ESCAPE = '\033',
-    SDLK_BACKSPACE = '\b',
-    SDLK_TAB = '\t',
-    SDLK_SPACE = ' ',
-    SDLK_EXCLAIM = '!',
-    SDLK_QUOTEDBL = '"',
-    SDLK_HASH = '#',
-    SDLK_PERCENT = '%',
-    SDLK_DOLLAR = '$',
-    SDLK_AMPERSAND = '&',
-    SDLK_QUOTE = '\'',
-    SDLK_LEFTPAREN = '(',
-    SDLK_RIGHTPAREN = ')',
-    SDLK_ASTERISK = '*',
-    SDLK_PLUS = '+',
-    SDLK_COMMA = ',',
-    SDLK_MINUS = '-',
-    SDLK_PERIOD = '.',
-    SDLK_SLASH = '/',
-    SDLK_0 = '0',
-    SDLK_1 = '1',
-    SDLK_2 = '2',
-    SDLK_3 = '3',
-    SDLK_4 = '4',
-    SDLK_5 = '5',
-    SDLK_6 = '6',
-    SDLK_7 = '7',
-    SDLK_8 = '8',
-    SDLK_9 = '9',
-    SDLK_COLON = ':',
-    SDLK_SEMICOLON = ';',
-    SDLK_LESS = '<',
-    SDLK_EQUALS = '=',
-    SDLK_GREATER = '>',
-    SDLK_QUESTION = '?',
-    SDLK_AT = '@',
-    SDLK_LEFTBRACKET = '[',
-    SDLK_BACKSLASH = '\\',
-    SDLK_RIGHTBRACKET = ']',
-    SDLK_CARET = '^',
-    SDLK_UNDERSCORE = '_',
-    SDLK_BACKQUOTE = '`',
-    SDLK_a = 'a',
-    SDLK_b = 'b',
-    SDLK_c = 'c',
-    SDLK_d = 'd',
-    SDLK_e = 'e',
-    SDLK_f = 'f',
-    SDLK_g = 'g',
-    SDLK_h = 'h',
-    SDLK_i = 'i',
-    SDLK_j = 'j',
-    SDLK_k = 'k',
-    SDLK_l = 'l',
-    SDLK_m = 'm',
-    SDLK_n = 'n',
-    SDLK_o = 'o',
-    SDLK_p = 'p',
-    SDLK_q = 'q',
-    SDLK_r = 'r',
-    SDLK_s = 's',
-    SDLK_t = 't',
-    SDLK_u = 'u',
-    SDLK_v = 'v',
-    SDLK_w = 'w',
-    SDLK_x = 'x',
-    SDLK_y = 'y',
-    SDLK_z = 'z',
-    SDLK_CAPSLOCK = (SDL_SCANCODE_CAPSLOCK | (1<<30)),
-    SDLK_F1 = (SDL_SCANCODE_F1 | (1<<30)),
-    SDLK_F2 = (SDL_SCANCODE_F2 | (1<<30)),
-    SDLK_F3 = (SDL_SCANCODE_F3 | (1<<30)),
-    SDLK_F4 = (SDL_SCANCODE_F4 | (1<<30)),
-    SDLK_F5 = (SDL_SCANCODE_F5 | (1<<30)),
-    SDLK_F6 = (SDL_SCANCODE_F6 | (1<<30)),
-    SDLK_F7 = (SDL_SCANCODE_F7 | (1<<30)),
-    SDLK_F8 = (SDL_SCANCODE_F8 | (1<<30)),
-    SDLK_F9 = (SDL_SCANCODE_F9 | (1<<30)),
-    SDLK_F10 = (SDL_SCANCODE_F10 | (1<<30)),
-    SDLK_F11 = (SDL_SCANCODE_F11 | (1<<30)),
-    SDLK_F12 = (SDL_SCANCODE_F12 | (1<<30)),
-    SDLK_PRINTSCREEN = (SDL_SCANCODE_PRINTSCREEN | (1<<30)),
-    SDLK_SCROLLLOCK = (SDL_SCANCODE_SCROLLLOCK | (1<<30)),
-    SDLK_PAUSE = (SDL_SCANCODE_PAUSE | (1<<30)),
-    SDLK_INSERT = (SDL_SCANCODE_INSERT | (1<<30)),
-    SDLK_HOME = (SDL_SCANCODE_HOME | (1<<30)),
-    SDLK_PAGEUP = (SDL_SCANCODE_PAGEUP | (1<<30)),
-    SDLK_DELETE = '\177',
-    SDLK_END = (SDL_SCANCODE_END | (1<<30)),
-    SDLK_PAGEDOWN = (SDL_SCANCODE_PAGEDOWN | (1<<30)),
-    SDLK_RIGHT = (SDL_SCANCODE_RIGHT | (1<<30)),
-    SDLK_LEFT = (SDL_SCANCODE_LEFT | (1<<30)),
-    SDLK_DOWN = (SDL_SCANCODE_DOWN | (1<<30)),
-    SDLK_UP = (SDL_SCANCODE_UP | (1<<30)),
-    SDLK_NUMLOCKCLEAR = (SDL_SCANCODE_NUMLOCKCLEAR | (1<<30)),
-    SDLK_KP_DIVIDE = (SDL_SCANCODE_KP_DIVIDE | (1<<30)),
-    SDLK_KP_MULTIPLY = (SDL_SCANCODE_KP_MULTIPLY | (1<<30)),
-    SDLK_KP_MINUS = (SDL_SCANCODE_KP_MINUS | (1<<30)),
-    SDLK_KP_PLUS = (SDL_SCANCODE_KP_PLUS | (1<<30)),
-    SDLK_KP_ENTER = (SDL_SCANCODE_KP_ENTER | (1<<30)),
-    SDLK_KP_1 = (SDL_SCANCODE_KP_1 | (1<<30)),
-    SDLK_KP_2 = (SDL_SCANCODE_KP_2 | (1<<30)),
-    SDLK_KP_3 = (SDL_SCANCODE_KP_3 | (1<<30)),
-    SDLK_KP_4 = (SDL_SCANCODE_KP_4 | (1<<30)),
-    SDLK_KP_5 = (SDL_SCANCODE_KP_5 | (1<<30)),
-    SDLK_KP_6 = (SDL_SCANCODE_KP_6 | (1<<30)),
-    SDLK_KP_7 = (SDL_SCANCODE_KP_7 | (1<<30)),
-    SDLK_KP_8 = (SDL_SCANCODE_KP_8 | (1<<30)),
-    SDLK_KP_9 = (SDL_SCANCODE_KP_9 | (1<<30)),
-    SDLK_KP_0 = (SDL_SCANCODE_KP_0 | (1<<30)),
-    SDLK_KP_PERIOD = (SDL_SCANCODE_KP_PERIOD | (1<<30)),
-    SDLK_APPLICATION = (SDL_SCANCODE_APPLICATION | (1<<30)),
-    SDLK_POWER = (SDL_SCANCODE_POWER | (1<<30)),
-    SDLK_KP_EQUALS = (SDL_SCANCODE_KP_EQUALS | (1<<30)),
-    SDLK_F13 = (SDL_SCANCODE_F13 | (1<<30)),
-    SDLK_F14 = (SDL_SCANCODE_F14 | (1<<30)),
-    SDLK_F15 = (SDL_SCANCODE_F15 | (1<<30)),
-    SDLK_F16 = (SDL_SCANCODE_F16 | (1<<30)),
-    SDLK_F17 = (SDL_SCANCODE_F17 | (1<<30)),
-    SDLK_F18 = (SDL_SCANCODE_F18 | (1<<30)),
-    SDLK_F19 = (SDL_SCANCODE_F19 | (1<<30)),
-    SDLK_F20 = (SDL_SCANCODE_F20 | (1<<30)),
-    SDLK_F21 = (SDL_SCANCODE_F21 | (1<<30)),
-    SDLK_F22 = (SDL_SCANCODE_F22 | (1<<30)),
-    SDLK_F23 = (SDL_SCANCODE_F23 | (1<<30)),
-    SDLK_F24 = (SDL_SCANCODE_F24 | (1<<30)),
-    SDLK_EXECUTE = (SDL_SCANCODE_EXECUTE | (1<<30)),
-    SDLK_HELP = (SDL_SCANCODE_HELP | (1<<30)),
-    SDLK_MENU = (SDL_SCANCODE_MENU | (1<<30)),
-    SDLK_SELECT = (SDL_SCANCODE_SELECT | (1<<30)),
-    SDLK_STOP = (SDL_SCANCODE_STOP | (1<<30)),
-    SDLK_AGAIN = (SDL_SCANCODE_AGAIN | (1<<30)),
-    SDLK_UNDO = (SDL_SCANCODE_UNDO | (1<<30)),
-    SDLK_CUT = (SDL_SCANCODE_CUT | (1<<30)),
-    SDLK_COPY = (SDL_SCANCODE_COPY | (1<<30)),
-    SDLK_PASTE = (SDL_SCANCODE_PASTE | (1<<30)),
-    SDLK_FIND = (SDL_SCANCODE_FIND | (1<<30)),
-    SDLK_MUTE = (SDL_SCANCODE_MUTE | (1<<30)),
-    SDLK_VOLUMEUP = (SDL_SCANCODE_VOLUMEUP | (1<<30)),
-    SDLK_VOLUMEDOWN = (SDL_SCANCODE_VOLUMEDOWN | (1<<30)),
-    SDLK_KP_COMMA = (SDL_SCANCODE_KP_COMMA | (1<<30)),
-    SDLK_KP_EQUALSAS400 =
-        (SDL_SCANCODE_KP_EQUALSAS400 | (1<<30)),
-    SDLK_ALTERASE = (SDL_SCANCODE_ALTERASE | (1<<30)),
-    SDLK_SYSREQ = (SDL_SCANCODE_SYSREQ | (1<<30)),
-    SDLK_CANCEL = (SDL_SCANCODE_CANCEL | (1<<30)),
-    SDLK_CLEAR = (SDL_SCANCODE_CLEAR | (1<<30)),
-    SDLK_PRIOR = (SDL_SCANCODE_PRIOR | (1<<30)),
-    SDLK_RETURN2 = (SDL_SCANCODE_RETURN2 | (1<<30)),
-    SDLK_SEPARATOR = (SDL_SCANCODE_SEPARATOR | (1<<30)),
-    SDLK_OUT = (SDL_SCANCODE_OUT | (1<<30)),
-    SDLK_OPER = (SDL_SCANCODE_OPER | (1<<30)),
-    SDLK_CLEARAGAIN = (SDL_SCANCODE_CLEARAGAIN | (1<<30)),
-    SDLK_CRSEL = (SDL_SCANCODE_CRSEL | (1<<30)),
-    SDLK_EXSEL = (SDL_SCANCODE_EXSEL | (1<<30)),
-    SDLK_KP_00 = (SDL_SCANCODE_KP_00 | (1<<30)),
-    SDLK_KP_000 = (SDL_SCANCODE_KP_000 | (1<<30)),
-    SDLK_THOUSANDSSEPARATOR =
-        (SDL_SCANCODE_THOUSANDSSEPARATOR | (1<<30)),
-    SDLK_DECIMALSEPARATOR =
-        (SDL_SCANCODE_DECIMALSEPARATOR | (1<<30)),
-    SDLK_CURRENCYUNIT = (SDL_SCANCODE_CURRENCYUNIT | (1<<30)),
-    SDLK_CURRENCYSUBUNIT =
-        (SDL_SCANCODE_CURRENCYSUBUNIT | (1<<30)),
-    SDLK_KP_LEFTPAREN = (SDL_SCANCODE_KP_LEFTPAREN | (1<<30)),
-    SDLK_KP_RIGHTPAREN = (SDL_SCANCODE_KP_RIGHTPAREN | (1<<30)),
-    SDLK_KP_LEFTBRACE = (SDL_SCANCODE_KP_LEFTBRACE | (1<<30)),
-    SDLK_KP_RIGHTBRACE = (SDL_SCANCODE_KP_RIGHTBRACE | (1<<30)),
-    SDLK_KP_TAB = (SDL_SCANCODE_KP_TAB | (1<<30)),
-    SDLK_KP_BACKSPACE = (SDL_SCANCODE_KP_BACKSPACE | (1<<30)),
-    SDLK_KP_A = (SDL_SCANCODE_KP_A | (1<<30)),
-    SDLK_KP_B = (SDL_SCANCODE_KP_B | (1<<30)),
-    SDLK_KP_C = (SDL_SCANCODE_KP_C | (1<<30)),
-    SDLK_KP_D = (SDL_SCANCODE_KP_D | (1<<30)),
-    SDLK_KP_E = (SDL_SCANCODE_KP_E | (1<<30)),
-    SDLK_KP_F = (SDL_SCANCODE_KP_F | (1<<30)),
-    SDLK_KP_XOR = (SDL_SCANCODE_KP_XOR | (1<<30)),
-    SDLK_KP_POWER = (SDL_SCANCODE_KP_POWER | (1<<30)),
-    SDLK_KP_PERCENT = (SDL_SCANCODE_KP_PERCENT | (1<<30)),
-    SDLK_KP_LESS = (SDL_SCANCODE_KP_LESS | (1<<30)),
-    SDLK_KP_GREATER = (SDL_SCANCODE_KP_GREATER | (1<<30)),
-    SDLK_KP_AMPERSAND = (SDL_SCANCODE_KP_AMPERSAND | (1<<30)),
-    SDLK_KP_DBLAMPERSAND =
-        (SDL_SCANCODE_KP_DBLAMPERSAND | (1<<30)),
-    SDLK_KP_VERTICALBAR =
-        (SDL_SCANCODE_KP_VERTICALBAR | (1<<30)),
-    SDLK_KP_DBLVERTICALBAR =
-        (SDL_SCANCODE_KP_DBLVERTICALBAR | (1<<30)),
-    SDLK_KP_COLON = (SDL_SCANCODE_KP_COLON | (1<<30)),
-    SDLK_KP_HASH = (SDL_SCANCODE_KP_HASH | (1<<30)),
-    SDLK_KP_SPACE = (SDL_SCANCODE_KP_SPACE | (1<<30)),
-    SDLK_KP_AT = (SDL_SCANCODE_KP_AT | (1<<30)),
-    SDLK_KP_EXCLAM = (SDL_SCANCODE_KP_EXCLAM | (1<<30)),
-    SDLK_KP_MEMSTORE = (SDL_SCANCODE_KP_MEMSTORE | (1<<30)),
-    SDLK_KP_MEMRECALL = (SDL_SCANCODE_KP_MEMRECALL | (1<<30)),
-    SDLK_KP_MEMCLEAR = (SDL_SCANCODE_KP_MEMCLEAR | (1<<30)),
-    SDLK_KP_MEMADD = (SDL_SCANCODE_KP_MEMADD | (1<<30)),
-    SDLK_KP_MEMSUBTRACT =
-        (SDL_SCANCODE_KP_MEMSUBTRACT | (1<<30)),
-    SDLK_KP_MEMMULTIPLY =
-        (SDL_SCANCODE_KP_MEMMULTIPLY | (1<<30)),
-    SDLK_KP_MEMDIVIDE = (SDL_SCANCODE_KP_MEMDIVIDE | (1<<30)),
-    SDLK_KP_PLUSMINUS = (SDL_SCANCODE_KP_PLUSMINUS | (1<<30)),
-    SDLK_KP_CLEAR = (SDL_SCANCODE_KP_CLEAR | (1<<30)),
-    SDLK_KP_CLEARENTRY = (SDL_SCANCODE_KP_CLEARENTRY | (1<<30)),
-    SDLK_KP_BINARY = (SDL_SCANCODE_KP_BINARY | (1<<30)),
-    SDLK_KP_OCTAL = (SDL_SCANCODE_KP_OCTAL | (1<<30)),
-    SDLK_KP_DECIMAL = (SDL_SCANCODE_KP_DECIMAL | (1<<30)),
-    SDLK_KP_HEXADECIMAL =
-        (SDL_SCANCODE_KP_HEXADECIMAL | (1<<30)),
-    SDLK_LCTRL = (SDL_SCANCODE_LCTRL | (1<<30)),
-    SDLK_LSHIFT = (SDL_SCANCODE_LSHIFT | (1<<30)),
-    SDLK_LALT = (SDL_SCANCODE_LALT | (1<<30)),
-    SDLK_LGUI = (SDL_SCANCODE_LGUI | (1<<30)),
-    SDLK_RCTRL = (SDL_SCANCODE_RCTRL | (1<<30)),
-    SDLK_RSHIFT = (SDL_SCANCODE_RSHIFT | (1<<30)),
-    SDLK_RALT = (SDL_SCANCODE_RALT | (1<<30)),
-    SDLK_RGUI = (SDL_SCANCODE_RGUI | (1<<30)),
-    SDLK_MODE = (SDL_SCANCODE_MODE | (1<<30)),
-    SDLK_AUDIONEXT = (SDL_SCANCODE_AUDIONEXT | (1<<30)),
-    SDLK_AUDIOPREV = (SDL_SCANCODE_AUDIOPREV | (1<<30)),
-    SDLK_AUDIOSTOP = (SDL_SCANCODE_AUDIOSTOP | (1<<30)),
-    SDLK_AUDIOPLAY = (SDL_SCANCODE_AUDIOPLAY | (1<<30)),
-    SDLK_AUDIOMUTE = (SDL_SCANCODE_AUDIOMUTE | (1<<30)),
-    SDLK_MEDIASELECT = (SDL_SCANCODE_MEDIASELECT | (1<<30)),
-    SDLK_WWW = (SDL_SCANCODE_WWW | (1<<30)),
-    SDLK_MAIL = (SDL_SCANCODE_MAIL | (1<<30)),
-    SDLK_CALCULATOR = (SDL_SCANCODE_CALCULATOR | (1<<30)),
-    SDLK_COMPUTER = (SDL_SCANCODE_COMPUTER | (1<<30)),
-    SDLK_AC_SEARCH = (SDL_SCANCODE_AC_SEARCH | (1<<30)),
-    SDLK_AC_HOME = (SDL_SCANCODE_AC_HOME | (1<<30)),
-    SDLK_AC_BACK = (SDL_SCANCODE_AC_BACK | (1<<30)),
-    SDLK_AC_FORWARD = (SDL_SCANCODE_AC_FORWARD | (1<<30)),
-    SDLK_AC_STOP = (SDL_SCANCODE_AC_STOP | (1<<30)),
-    SDLK_AC_REFRESH = (SDL_SCANCODE_AC_REFRESH | (1<<30)),
-    SDLK_AC_BOOKMARKS = (SDL_SCANCODE_AC_BOOKMARKS | (1<<30)),
-    SDLK_BRIGHTNESSDOWN =
-        (SDL_SCANCODE_BRIGHTNESSDOWN | (1<<30)),
-    SDLK_BRIGHTNESSUP = (SDL_SCANCODE_BRIGHTNESSUP | (1<<30)),
-    SDLK_DISPLAYSWITCH = (SDL_SCANCODE_DISPLAYSWITCH | (1<<30)),
-    SDLK_KBDILLUMTOGGLE =
-        (SDL_SCANCODE_KBDILLUMTOGGLE | (1<<30)),
-    SDLK_KBDILLUMDOWN = (SDL_SCANCODE_KBDILLUMDOWN | (1<<30)),
-    SDLK_KBDILLUMUP = (SDL_SCANCODE_KBDILLUMUP | (1<<30)),
-    SDLK_EJECT = (SDL_SCANCODE_EJECT | (1<<30)),
-    SDLK_SLEEP = (SDL_SCANCODE_SLEEP | (1<<30))
-};
-typedef enum
-{
-    SDL_KMOD_NONE = 0x0000,
-    SDL_KMOD_LSHIFT = 0x0001,
-    SDL_KMOD_RSHIFT = 0x0002,
-    SDL_KMOD_LCTRL = 0x0040,
-    SDL_KMOD_RCTRL = 0x0080,
-    SDL_KMOD_LALT = 0x0100,
-    SDL_KMOD_RALT = 0x0200,
-    SDL_KMOD_LGUI = 0x0400,
-    SDL_KMOD_RGUI = 0x0800,
-    SDL_KMOD_NUM = 0x1000,
-    SDL_KMOD_CAPS = 0x2000,
-    SDL_KMOD_MODE = 0x4000,
-    SDL_KMOD_RESERVED = 0x8000
-} SDL_Keymod;
-typedef struct SDL_Keysym
-{
-    SDL_Scancode scancode;
-    SDL_Keycode sym;
-    Uint16 mod;
-    Uint32 unused;
-} SDL_Keysym;
-SDL_Window * SDL_GetKeyboardFocus(void);
-const Uint8 * SDL_GetKeyboardState(int *numkeys);
-SDL_Keymod SDL_GetModState(void);
-void SDL_SetModState(SDL_Keymod modstate);
-SDL_Keycode SDL_GetKeyFromScancode(SDL_Scancode scancode);
-SDL_Scancode SDL_GetScancodeFromKey(SDL_Keycode key);
-const char * SDL_GetScancodeName(SDL_Scancode scancode);
-SDL_Scancode SDL_GetScancodeFromName(const char *name);
-const char * SDL_GetKeyName(SDL_Keycode key);
-SDL_Keycode SDL_GetKeyFromName(const char *name);
-void SDL_StartTextInput(void);
-SDL_bool SDL_IsTextInputActive(void);
-void SDL_StopTextInput(void);
-void SDL_SetTextInputRect(SDL_Rect *rect);
-SDL_bool SDL_HasScreenKeyboardSupport(void);
-SDL_bool SDL_IsScreenKeyboardShown(SDL_Window *window);
-typedef struct SDL_Cursor SDL_Cursor;
-typedef enum
-{
-    SDL_SYSTEM_CURSOR_ARROW,
-    SDL_SYSTEM_CURSOR_IBEAM,
-    SDL_SYSTEM_CURSOR_WAIT,
-    SDL_SYSTEM_CURSOR_CROSSHAIR,
-    SDL_SYSTEM_CURSOR_WAITARROW,
-    SDL_SYSTEM_CURSOR_SIZENWSE,
-    SDL_SYSTEM_CURSOR_SIZENESW,
-    SDL_SYSTEM_CURSOR_SIZEWE,
-    SDL_SYSTEM_CURSOR_SIZENS,
-    SDL_SYSTEM_CURSOR_SIZEALL,
-    SDL_SYSTEM_CURSOR_NO,
-    SDL_SYSTEM_CURSOR_HAND,
-    SDL_NUM_SYSTEM_CURSORS
-} SDL_SystemCursor;
-SDL_Window * SDL_GetMouseFocus(void);
-Uint32 SDL_GetMouseState(int *x, int *y);
-Uint32 SDL_GetRelativeMouseState(int *x, int *y);
-void SDL_WarpMouseInWindow(SDL_Window * window,
-                                                   int x, int y);
-int SDL_SetRelativeMouseMode(SDL_bool enabled);
-SDL_bool SDL_GetRelativeMouseMode(void);
-SDL_Cursor * SDL_CreateCursor(const Uint8 * data,
-                                                     const Uint8 * mask,
-                                                     int w, int h, int hot_x,
-                                                     int hot_y);
-SDL_Cursor * SDL_CreateColorCursor(SDL_Surface *surface,
-                                                          int hot_x,
-                                                          int hot_y);
-SDL_Cursor * SDL_CreateSystemCursor(SDL_SystemCursor id);
-void SDL_SetCursor(SDL_Cursor * cursor);
-SDL_Cursor * SDL_GetCursor(void);
-SDL_Cursor * SDL_GetDefaultCursor(void);
-void SDL_FreeCursor(SDL_Cursor * cursor);
-int SDL_ShowCursor(int toggle);
-struct _SDL_Joystick;
-typedef struct _SDL_Joystick SDL_Joystick;
-typedef struct {
-    Uint8 data[16];
-} SDL_JoystickGUID;
-typedef Sint32 SDL_JoystickID;
-int SDL_NumJoysticks(void);
-const char * SDL_JoystickNameForIndex(int device_index);
-SDL_Joystick * SDL_JoystickOpen(int device_index);
-const char * SDL_JoystickName(SDL_Joystick * joystick);
-SDL_JoystickGUID SDL_JoystickGetDeviceGUID(int device_index);
-SDL_JoystickGUID SDL_JoystickGetGUID(SDL_Joystick * joystick);
-void SDL_JoystickGetGUIDString(SDL_JoystickGUID guid, char *pszGUID, int cbGUID);
-SDL_JoystickGUID SDL_JoystickGetGUIDFromString(const char *pchGUID);
-SDL_bool SDL_JoystickGetAttached(SDL_Joystick * joystick);
-SDL_JoystickID SDL_JoystickInstanceID(SDL_Joystick * joystick);
-int SDL_JoystickNumAxes(SDL_Joystick * joystick);
-int SDL_JoystickNumBalls(SDL_Joystick * joystick);
-int SDL_JoystickNumHats(SDL_Joystick * joystick);
-int SDL_JoystickNumButtons(SDL_Joystick * joystick);
-void SDL_JoystickUpdate(void);
-int SDL_JoystickEventState(int state);
-Sint16 SDL_JoystickGetAxis(SDL_Joystick * joystick,
-                                                   int axis);
-Uint8 SDL_JoystickGetHat(SDL_Joystick * joystick,
-                                                 int hat);
-int SDL_JoystickGetBall(SDL_Joystick * joystick,
-                                                int ball, int *dx, int *dy);
-Uint8 SDL_JoystickGetButton(SDL_Joystick * joystick,
-                                                    int button);
-void SDL_JoystickClose(SDL_Joystick * joystick);
-struct _SDL_GameController;
-typedef struct _SDL_GameController SDL_GameController;
-typedef enum
-{
-    SDL_CONTROLLER_BINDTYPE_NONE = 0,
-    SDL_CONTROLLER_BINDTYPE_BUTTON,
-    SDL_CONTROLLER_BINDTYPE_AXIS,
-    SDL_CONTROLLER_BINDTYPE_HAT
-} SDL_GameControllerBindType;
-typedef struct SDL_GameControllerButtonBind
-{
-    SDL_GameControllerBindType bindType;
-    union
-    {
-        int button;
-        int axis;
-        struct {
-            int hat;
-            int hat_mask;
-        } hat;
-    } value;
-} SDL_GameControllerButtonBind;
-int SDL_GameControllerAddMapping( const char* mappingString );
-char * SDL_GameControllerMappingForGUID( SDL_JoystickGUID guid );
-char * SDL_GameControllerMapping( SDL_GameController * gamecontroller );
-SDL_bool SDL_IsGameController(int joystick_index);
-const char * SDL_GameControllerNameForIndex(int joystick_index);
-SDL_GameController * SDL_GameControllerOpen(int joystick_index);
-const char * SDL_GameControllerName(SDL_GameController *gamecontroller);
-SDL_bool SDL_GameControllerGetAttached(SDL_GameController *gamecontroller);
-SDL_Joystick * SDL_GameControllerGetJoystick(SDL_GameController *gamecontroller);
-int SDL_GameControllerEventState(int state);
-void SDL_GameControllerUpdate(void);
-typedef enum
-{
-    SDL_CONTROLLER_AXIS_INVALID = -1,
-    SDL_CONTROLLER_AXIS_LEFTX,
-    SDL_CONTROLLER_AXIS_LEFTY,
-    SDL_CONTROLLER_AXIS_RIGHTX,
-    SDL_CONTROLLER_AXIS_RIGHTY,
-    SDL_CONTROLLER_AXIS_TRIGGERLEFT,
-    SDL_CONTROLLER_AXIS_TRIGGERRIGHT,
-    SDL_CONTROLLER_AXIS_MAX
-} SDL_GameControllerAxis;
-SDL_GameControllerAxis SDL_GameControllerGetAxisFromString(const char *pchString);
-const char* SDL_GameControllerGetStringForAxis(SDL_GameControllerAxis axis);
-SDL_GameControllerButtonBind
-SDL_GameControllerGetBindForAxis(SDL_GameController *gamecontroller,
-                                 SDL_GameControllerAxis axis);
-Sint16
-SDL_GameControllerGetAxis(SDL_GameController *gamecontroller,
-                          SDL_GameControllerAxis axis);
-typedef enum
-{
-    SDL_CONTROLLER_BUTTON_INVALID = -1,
-    SDL_CONTROLLER_BUTTON_A,
-    SDL_CONTROLLER_BUTTON_B,
-    SDL_CONTROLLER_BUTTON_X,
-    SDL_CONTROLLER_BUTTON_Y,
-    SDL_CONTROLLER_BUTTON_BACK,
-    SDL_CONTROLLER_BUTTON_GUIDE,
-    SDL_CONTROLLER_BUTTON_START,
-    SDL_CONTROLLER_BUTTON_LEFTSTICK,
-    SDL_CONTROLLER_BUTTON_RIGHTSTICK,
-    SDL_CONTROLLER_BUTTON_LEFTSHOULDER,
-    SDL_CONTROLLER_BUTTON_RIGHTSHOULDER,
-    SDL_CONTROLLER_BUTTON_DPAD_UP,
-    SDL_CONTROLLER_BUTTON_DPAD_DOWN,
-    SDL_CONTROLLER_BUTTON_DPAD_LEFT,
-    SDL_CONTROLLER_BUTTON_DPAD_RIGHT,
-    SDL_CONTROLLER_BUTTON_MAX
-} SDL_GameControllerButton;
-SDL_GameControllerButton SDL_GameControllerGetButtonFromString(const char *pchString);
-const char* SDL_GameControllerGetStringForButton(SDL_GameControllerButton button);
-SDL_GameControllerButtonBind
-SDL_GameControllerGetBindForButton(SDL_GameController *gamecontroller,
-                                   SDL_GameControllerButton button);
-Uint8 SDL_GameControllerGetButton(SDL_GameController *gamecontroller,
-                                                          SDL_GameControllerButton button);
-void SDL_GameControllerClose(SDL_GameController *gamecontroller);
-typedef Sint64 SDL_TouchID;
-typedef Sint64 SDL_FingerID;
-typedef struct SDL_Finger
-{
-    SDL_FingerID id;
-    float x;
-    float y;
-    float pressure;
-} SDL_Finger;
-int SDL_GetNumTouchDevices(void);
-SDL_TouchID SDL_GetTouchDevice(int index);
-int SDL_GetNumTouchFingers(SDL_TouchID touchID);
-SDL_Finger * SDL_GetTouchFinger(SDL_TouchID touchID, int index);
-typedef Sint64 SDL_GestureID;
-int SDL_RecordGesture(SDL_TouchID touchId);
-int SDL_SaveAllDollarTemplates(SDL_RWops *src);
-int SDL_SaveDollarTemplate(SDL_GestureID gestureId,SDL_RWops *src);
-int SDL_LoadDollarTemplates(SDL_TouchID touchId, SDL_RWops *src);
-typedef enum
-{
-    SDL_FIRSTEVENT = 0,
-    SDL_QUIT = 0x100,
-    SDL_APP_TERMINATING,
-    SDL_APP_LOWMEMORY,
-    SDL_APP_WILLENTERBACKGROUND,
-    SDL_APP_DIDENTERBACKGROUND,
-    SDL_APP_WILLENTERFOREGROUND,
-    SDL_APP_DIDENTERFOREGROUND,
-    SDL_WINDOWEVENT = 0x200,
-    SDL_SYSWMEVENT,
-    SDL_KEYDOWN = 0x300,
-    SDL_KEYUP,
-    SDL_TEXTEDITING,
-    SDL_TEXTINPUT,
-    SDL_MOUSEMOTION = 0x400,
-    SDL_MOUSEBUTTONDOWN,
-    SDL_MOUSEBUTTONUP,
-    SDL_MOUSEWHEEL,
-    SDL_JOYAXISMOTION = 0x600,
-    SDL_JOYBALLMOTION,
-    SDL_JOYHATMOTION,
-    SDL_JOYBUTTONDOWN,
-    SDL_JOYBUTTONUP,
-    SDL_JOYDEVICEADDED,
-    SDL_JOYDEVICEREMOVED,
-    SDL_CONTROLLERAXISMOTION = 0x650,
-    SDL_CONTROLLERBUTTONDOWN,
-    SDL_CONTROLLERBUTTONUP,
-    SDL_CONTROLLERDEVICEADDED,
-    SDL_CONTROLLERDEVICEREMOVED,
-    SDL_CONTROLLERDEVICEREMAPPED,
-    SDL_FINGERDOWN = 0x700,
-    SDL_FINGERUP,
-    SDL_FINGERMOTION,
-    SDL_DOLLARGESTURE = 0x800,
-    SDL_DOLLARRECORD,
-    SDL_MULTIGESTURE,
-    SDL_CLIPBOARDUPDATE = 0x900,
-    SDL_DROPFILE = 0x1000,
-    SDL_USEREVENT = 0x8000,
-    SDL_LASTEVENT = 0xFFFF
-} SDL_EventType;
-typedef struct SDL_CommonEvent
-{
-    Uint32 type;
-    Uint32 timestamp;
-} SDL_CommonEvent;
-typedef struct SDL_WindowEvent
-{
-    Uint32 type;
-    Uint32 timestamp;
-    Uint32 windowID;
-    Uint8 event;
-    Uint8 padding1;
-    Uint8 padding2;
-    Uint8 padding3;
-    Sint32 data1;
-    Sint32 data2;
-} SDL_WindowEvent;
-typedef struct SDL_KeyboardEvent
-{
-    Uint32 type;
-    Uint32 timestamp;
-    Uint32 windowID;
-    Uint8 state;
-    Uint8 repeat;
-    Uint8 padding2;
-    Uint8 padding3;
-    SDL_Keysym keysym;
-} SDL_KeyboardEvent;
-typedef struct SDL_TextEditingEvent
-{
-    Uint32 type;
-    Uint32 timestamp;
-    Uint32 windowID;
-    char text[(32)];
-    Sint32 start;
-    Sint32 length;
-} SDL_TextEditingEvent;
-typedef struct SDL_TextInputEvent
-{
-    Uint32 type;
-    Uint32 timestamp;
-    Uint32 windowID;
-    char text[(32)];
-} SDL_TextInputEvent;
-typedef struct SDL_MouseMotionEvent
-{
-    Uint32 type;
-    Uint32 timestamp;
-    Uint32 windowID;
-    Uint32 which;
-    Uint32 state;
-    Sint32 x;
-    Sint32 y;
-    Sint32 xrel;
-    Sint32 yrel;
-} SDL_MouseMotionEvent;
-typedef struct SDL_MouseButtonEvent
-{
-    Uint32 type;
-    Uint32 timestamp;
-    Uint32 windowID;
-    Uint32 which;
-    Uint8 button;
-    Uint8 state;
-    Uint8 padding1;
-    Uint8 padding2;
-    Sint32 x;
-    Sint32 y;
-} SDL_MouseButtonEvent;
-typedef struct SDL_MouseWheelEvent
-{
-    Uint32 type;
-    Uint32 timestamp;
-    Uint32 windowID;
-    Uint32 which;
-    Sint32 x;
-    Sint32 y;
-} SDL_MouseWheelEvent;
-typedef struct SDL_JoyAxisEvent
-{
-    Uint32 type;
-    Uint32 timestamp;
-    SDL_JoystickID which;
-    Uint8 axis;
-    Uint8 padding1;
-    Uint8 padding2;
-    Uint8 padding3;
-    Sint16 value;
-    Uint16 padding4;
-} SDL_JoyAxisEvent;
-typedef struct SDL_JoyBallEvent
-{
-    Uint32 type;
-    Uint32 timestamp;
-    SDL_JoystickID which;
-    Uint8 ball;
-    Uint8 padding1;
-    Uint8 padding2;
-    Uint8 padding3;
-    Sint16 xrel;
-    Sint16 yrel;
-} SDL_JoyBallEvent;
-typedef struct SDL_JoyHatEvent
-{
-    Uint32 type;
-    Uint32 timestamp;
-    SDL_JoystickID which;
-    Uint8 hat;
-    Uint8 value;
-    Uint8 padding1;
-    Uint8 padding2;
-} SDL_JoyHatEvent;
-typedef struct SDL_JoyButtonEvent
-{
-    Uint32 type;
-    Uint32 timestamp;
-    SDL_JoystickID which;
-    Uint8 button;
-    Uint8 state;
-    Uint8 padding1;
-    Uint8 padding2;
-} SDL_JoyButtonEvent;
-typedef struct SDL_JoyDeviceEvent
-{
-    Uint32 type;
-    Uint32 timestamp;
-    Sint32 which;
-} SDL_JoyDeviceEvent;
-typedef struct SDL_ControllerAxisEvent
-{
-    Uint32 type;
-    Uint32 timestamp;
-    SDL_JoystickID which;
-    Uint8 axis;
-    Uint8 padding1;
-    Uint8 padding2;
-    Uint8 padding3;
-    Sint16 value;
-    Uint16 padding4;
-} SDL_ControllerAxisEvent;
-typedef struct SDL_ControllerButtonEvent
-{
-    Uint32 type;
-    Uint32 timestamp;
-    SDL_JoystickID which;
-    Uint8 button;
-    Uint8 state;
-    Uint8 padding1;
-    Uint8 padding2;
-} SDL_ControllerButtonEvent;
-typedef struct SDL_ControllerDeviceEvent
-{
-    Uint32 type;
-    Uint32 timestamp;
-    Sint32 which;
-} SDL_ControllerDeviceEvent;
-typedef struct SDL_TouchFingerEvent
-{
-    Uint32 type;
-    Uint32 timestamp;
-    SDL_TouchID touchId;
-    SDL_FingerID fingerId;
-    float x;
-    float y;
-    float dx;
-    float dy;
-    float pressure;
-} SDL_TouchFingerEvent;
-typedef struct SDL_MultiGestureEvent
-{
-    Uint32 type;
-    Uint32 timestamp;
-    SDL_TouchID touchId;
-    float dTheta;
-    float dDist;
-    float x;
-    float y;
-    Uint16 numFingers;
-    Uint16 padding;
-} SDL_MultiGestureEvent;
-typedef struct SDL_DollarGestureEvent
-{
-    Uint32 type;
-    Uint32 timestamp;
-    SDL_TouchID touchId;
-    SDL_GestureID gestureId;
-    Uint32 numFingers;
-    float error;
-    float x;
-    float y;
-} SDL_DollarGestureEvent;
-typedef struct SDL_DropEvent
-{
-    Uint32 type;
-    Uint32 timestamp;
-    char *file;
-} SDL_DropEvent;
-typedef struct SDL_QuitEvent
-{
-    Uint32 type;
-    Uint32 timestamp;
-} SDL_QuitEvent;
-typedef struct SDL_OSEvent
-{
-    Uint32 type;
-    Uint32 timestamp;
-} SDL_OSEvent;
-typedef struct SDL_UserEvent
-{
-    Uint32 type;
-    Uint32 timestamp;
-    Uint32 windowID;
-    Sint32 code;
-    void *data1;
-    void *data2;
-} SDL_UserEvent;
-struct SDL_SysWMmsg;
-typedef struct SDL_SysWMmsg SDL_SysWMmsg;
-typedef struct SDL_SysWMEvent
-{
-    Uint32 type;
-    Uint32 timestamp;
-    SDL_SysWMmsg *msg;
-} SDL_SysWMEvent;
-typedef union SDL_Event
-{
-    Uint32 type;
-    SDL_CommonEvent common;
-    SDL_WindowEvent window;
-    SDL_KeyboardEvent key;
-    SDL_TextEditingEvent edit;
-    SDL_TextInputEvent text;
-    SDL_MouseMotionEvent motion;
-    SDL_MouseButtonEvent button;
-    SDL_MouseWheelEvent wheel;
-    SDL_JoyAxisEvent jaxis;
-    SDL_JoyBallEvent jball;
-    SDL_JoyHatEvent jhat;
-    SDL_JoyButtonEvent jbutton;
-    SDL_JoyDeviceEvent jdevice;
-    SDL_ControllerAxisEvent caxis;
-    SDL_ControllerButtonEvent cbutton;
-    SDL_ControllerDeviceEvent cdevice;
-    SDL_QuitEvent quit;
-    SDL_UserEvent user;
-    SDL_SysWMEvent syswm;
-    SDL_TouchFingerEvent tfinger;
-    SDL_MultiGestureEvent mgesture;
-    SDL_DollarGestureEvent dgesture;
-    SDL_DropEvent drop;
-    Uint8 padding[56];
-} SDL_Event;
-void SDL_PumpEvents(void);
-typedef enum
-{
-    SDL_ADDEVENT,
-    SDL_PEEKEVENT,
-    SDL_GETEVENT
-} SDL_eventaction;
-int SDL_PeepEvents(SDL_Event * events, int numevents,
-                                           SDL_eventaction action,
-                                           Uint32 minType, Uint32 maxType);
-SDL_bool SDL_HasEvent(Uint32 type);
-SDL_bool SDL_HasEvents(Uint32 minType, Uint32 maxType);
-void SDL_FlushEvent(Uint32 type);
-void SDL_FlushEvents(Uint32 minType, Uint32 maxType);
-int SDL_PollEvent(SDL_Event * event);
-int SDL_WaitEvent(SDL_Event * event);
-int SDL_WaitEventTimeout(SDL_Event * event,
-                                                 int timeout);
-int SDL_PushEvent(SDL_Event * event);
-typedef int ( * SDL_EventFilter) (void *userdata, SDL_Event * event);
-void SDL_SetEventFilter(SDL_EventFilter filter,
-                                                void *userdata);
-SDL_bool SDL_GetEventFilter(SDL_EventFilter * filter,
-                                                    void **userdata);
-void SDL_AddEventWatch(SDL_EventFilter filter,
-                                               void *userdata);
-void SDL_DelEventWatch(SDL_EventFilter filter,
-                                               void *userdata);
-void SDL_FilterEvents(SDL_EventFilter filter,
-                                              void *userdata);
-Uint8 SDL_EventState(Uint32 type, int state);
-Uint32 SDL_RegisterEvents(int numevents);
-struct _SDL_Haptic;
-typedef struct _SDL_Haptic SDL_Haptic;
-typedef struct SDL_HapticDirection
-{
-    Uint8 type;
-    Sint32 dir[3];
-} SDL_HapticDirection;
-typedef struct SDL_HapticConstant
-{
-    Uint16 type;
-    SDL_HapticDirection direction;
-    Uint32 length;
-    Uint16 delay;
-    Uint16 button;
-    Uint16 interval;
-    Sint16 level;
-    Uint16 attack_length;
-    Uint16 attack_level;
-    Uint16 fade_length;
-    Uint16 fade_level;
-} SDL_HapticConstant;
-typedef struct SDL_HapticPeriodic
-{
-    Uint16 type;
-    SDL_HapticDirection direction;
-    Uint32 length;
-    Uint16 delay;
-    Uint16 button;
-    Uint16 interval;
-    Uint16 period;
-    Sint16 magnitude;
-    Sint16 offset;
-    Uint16 phase;
-    Uint16 attack_length;
-    Uint16 attack_level;
-    Uint16 fade_length;
-    Uint16 fade_level;
-} SDL_HapticPeriodic;
-typedef struct SDL_HapticCondition
-{
-    Uint16 type;
-    SDL_HapticDirection direction;
-    Uint32 length;
-    Uint16 delay;
-    Uint16 button;
-    Uint16 interval;
-    Uint16 right_sat[3];
-    Uint16 left_sat[3];
-    Sint16 right_coeff[3];
-    Sint16 left_coeff[3];
-    Uint16 deadband[3];
-    Sint16 center[3];
-} SDL_HapticCondition;
-typedef struct SDL_HapticRamp
-{
-    Uint16 type;
-    SDL_HapticDirection direction;
-    Uint32 length;
-    Uint16 delay;
-    Uint16 button;
-    Uint16 interval;
-    Sint16 start;
-    Sint16 end;
-    Uint16 attack_length;
-    Uint16 attack_level;
-    Uint16 fade_length;
-    Uint16 fade_level;
-} SDL_HapticRamp;
-typedef struct SDL_HapticLeftRight
-{
-    Uint16 type;
-    Uint32 length;
-    Uint16 large_magnitude;
-    Uint16 small_magnitude;
-} SDL_HapticLeftRight;
-typedef struct SDL_HapticCustom
-{
-    Uint16 type;
-    SDL_HapticDirection direction;
-    Uint32 length;
-    Uint16 delay;
-    Uint16 button;
-    Uint16 interval;
-    Uint8 channels;
-    Uint16 period;
-    Uint16 samples;
-    Uint16 *data;
-    Uint16 attack_length;
-    Uint16 attack_level;
-    Uint16 fade_length;
-    Uint16 fade_level;
-} SDL_HapticCustom;
-typedef union SDL_HapticEffect
-{
-    Uint16 type;
-    SDL_HapticConstant constant;
-    SDL_HapticPeriodic periodic;
-    SDL_HapticCondition condition;
-    SDL_HapticRamp ramp;
-    SDL_HapticLeftRight leftright;
-    SDL_HapticCustom custom;
-} SDL_HapticEffect;
-int SDL_NumHaptics(void);
-const char * SDL_HapticName(int device_index);
-SDL_Haptic * SDL_HapticOpen(int device_index);
-int SDL_HapticOpened(int device_index);
-int SDL_HapticIndex(SDL_Haptic * haptic);
-int SDL_MouseIsHaptic(void);
-SDL_Haptic * SDL_HapticOpenFromMouse(void);
-int SDL_JoystickIsHaptic(SDL_Joystick * joystick);
-SDL_Haptic * SDL_HapticOpenFromJoystick(SDL_Joystick *
-                                                               joystick);
-void SDL_HapticClose(SDL_Haptic * haptic);
-int SDL_HapticNumEffects(SDL_Haptic * haptic);
-int SDL_HapticNumEffectsPlaying(SDL_Haptic * haptic);
-unsigned int SDL_HapticQuery(SDL_Haptic * haptic);
-int SDL_HapticNumAxes(SDL_Haptic * haptic);
-int SDL_HapticEffectSupported(SDL_Haptic * haptic,
-                                                      SDL_HapticEffect *
-                                                      effect);
-int SDL_HapticNewEffect(SDL_Haptic * haptic,
-                                                SDL_HapticEffect * effect);
-int SDL_HapticUpdateEffect(SDL_Haptic * haptic,
-                                                   int effect,
-                                                   SDL_HapticEffect * data);
-int SDL_HapticRunEffect(SDL_Haptic * haptic,
-                                                int effect,
-                                                Uint32 iterations);
-int SDL_HapticStopEffect(SDL_Haptic * haptic,
-                                                 int effect);
-void SDL_HapticDestroyEffect(SDL_Haptic * haptic,
-                                                     int effect);
-int SDL_HapticGetEffectStatus(SDL_Haptic * haptic,
-                                                      int effect);
-int SDL_HapticSetGain(SDL_Haptic * haptic, int gain);
-int SDL_HapticSetAutocenter(SDL_Haptic * haptic,
-                                                    int autocenter);
-int SDL_HapticPause(SDL_Haptic * haptic);
-int SDL_HapticUnpause(SDL_Haptic * haptic);
-int SDL_HapticStopAll(SDL_Haptic * haptic);
-int SDL_HapticRumbleSupported(SDL_Haptic * haptic);
-int SDL_HapticRumbleInit(SDL_Haptic * haptic);
-int SDL_HapticRumblePlay(SDL_Haptic * haptic, float strength, Uint32 length );
-int SDL_HapticRumbleStop(SDL_Haptic * haptic);
-typedef enum
-{
-    SDL_HINT_DEFAULT,
-    SDL_HINT_NORMAL,
-    SDL_HINT_OVERRIDE
-} SDL_HintPriority;
-SDL_bool SDL_SetHintWithPriority(const char *name,
-                                                         const char *value,
-                                                         SDL_HintPriority priority);
-SDL_bool SDL_SetHint(const char *name,
-                                             const char *value);
-const char * SDL_GetHint(const char *name);
-typedef void (*SDL_HintCallback)(void *userdata, const char *name, const char *oldValue, const char *newValue);
-void SDL_AddHintCallback(const char *name,
-                                                 SDL_HintCallback callback,
-                                                 void *userdata);
-void SDL_DelHintCallback(const char *name,
-                                                 SDL_HintCallback callback,
-                                                 void *userdata);
-void SDL_ClearHints(void);
-void * SDL_LoadObject(const char *sofile);
-void * SDL_LoadFunction(void *handle,
-                                               const char *name);
-void SDL_UnloadObject(void *handle);
-enum
-{
-    SDL_LOG_CATEGORY_APPLICATION,
-    SDL_LOG_CATEGORY_ERROR,
-    SDL_LOG_CATEGORY_ASSERT,
-    SDL_LOG_CATEGORY_SYSTEM,
-    SDL_LOG_CATEGORY_AUDIO,
-    SDL_LOG_CATEGORY_VIDEO,
-    SDL_LOG_CATEGORY_RENDER,
-    SDL_LOG_CATEGORY_INPUT,
-    SDL_LOG_CATEGORY_TEST,
-    SDL_LOG_CATEGORY_RESERVED1,
-    SDL_LOG_CATEGORY_RESERVED2,
-    SDL_LOG_CATEGORY_RESERVED3,
-    SDL_LOG_CATEGORY_RESERVED4,
-    SDL_LOG_CATEGORY_RESERVED5,
-    SDL_LOG_CATEGORY_RESERVED6,
-    SDL_LOG_CATEGORY_RESERVED7,
-    SDL_LOG_CATEGORY_RESERVED8,
-    SDL_LOG_CATEGORY_RESERVED9,
-    SDL_LOG_CATEGORY_RESERVED10,
-    SDL_LOG_CATEGORY_CUSTOM
-};
-typedef enum
-{
-    SDL_LOG_PRIORITY_VERBOSE = 1,
-    SDL_LOG_PRIORITY_DEBUG,
-    SDL_LOG_PRIORITY_INFO,
-    SDL_LOG_PRIORITY_WARN,
-    SDL_LOG_PRIORITY_ERROR,
-    SDL_LOG_PRIORITY_CRITICAL,
-    SDL_NUM_LOG_PRIORITIES
-} SDL_LogPriority;
-void SDL_LogSetAllPriority(SDL_LogPriority priority);
-void SDL_LogSetPriority(int category,
-                                                SDL_LogPriority priority);
-SDL_LogPriority SDL_LogGetPriority(int category);
-void SDL_LogResetPriorities(void);
-void SDL_Log(const char *fmt, ...);
-void SDL_LogVerbose(int category, const char *fmt, ...);
-void SDL_LogDebug(int category, const char *fmt, ...);
-void SDL_LogInfo(int category, const char *fmt, ...);
-void SDL_LogWarn(int category, const char *fmt, ...);
-void SDL_LogError(int category, const char *fmt, ...);
-void SDL_LogCritical(int category, const char *fmt, ...);
-void SDL_LogMessage(int category,
-                                            SDL_LogPriority priority,
-                                            const char *fmt, ...);
-void SDL_LogMessageV(int category,
-                                             SDL_LogPriority priority,
-                                             const char *fmt, va_list ap);
-typedef void (*SDL_LogOutputFunction)(void *userdata, int category, SDL_LogPriority priority, const char *message);
-void SDL_LogGetOutputFunction(SDL_LogOutputFunction *callback, void **userdata);
-void SDL_LogSetOutputFunction(SDL_LogOutputFunction callback, void *userdata);
-typedef enum
-{
-    SDL_MESSAGEBOX_ERROR = 0x00000010,
-    SDL_MESSAGEBOX_WARNING = 0x00000020,
-    SDL_MESSAGEBOX_INFORMATION = 0x00000040
-} SDL_MessageBoxFlags;
-typedef enum
-{
-    SDL_MESSAGEBOX_BUTTON_RETURNKEY_DEFAULT = 0x00000001,
-    SDL_MESSAGEBOX_BUTTON_ESCAPEKEY_DEFAULT = 0x00000002
-} SDL_MessageBoxButtonFlags;
-typedef struct
-{
-    Uint32 flags;
-    int buttonid;
-    const char * text;
-} SDL_MessageBoxButtonData;
-typedef struct
-{
-    Uint8 r, g, b;
-} SDL_MessageBoxColor;
-typedef enum
-{
-    SDL_MESSAGEBOX_COLOR_BACKGROUND,
-    SDL_MESSAGEBOX_COLOR_TEXT,
-    SDL_MESSAGEBOX_COLOR_BUTTON_BORDER,
-    SDL_MESSAGEBOX_COLOR_BUTTON_BACKGROUND,
-    SDL_MESSAGEBOX_COLOR_BUTTON_SELECTED,
-    SDL_MESSAGEBOX_COLOR_MAX
-} SDL_MessageBoxColorType;
-typedef struct
-{
-    SDL_MessageBoxColor colors[SDL_MESSAGEBOX_COLOR_MAX];
-} SDL_MessageBoxColorScheme;
-typedef struct
-{
-    Uint32 flags;
-    SDL_Window *window;
-    const char *title;
-    const char *message;
-    int numbuttons;
-    const SDL_MessageBoxButtonData *buttons;
-    const SDL_MessageBoxColorScheme *colorScheme;
-} SDL_MessageBoxData;
-int SDL_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid);
-int SDL_ShowSimpleMessageBox(Uint32 flags, const char *title, const char *message, SDL_Window *window);
-typedef enum
-{
-    SDL_POWERSTATE_UNKNOWN,
-    SDL_POWERSTATE_ON_BATTERY,
-    SDL_POWERSTATE_NO_BATTERY,
-    SDL_POWERSTATE_CHARGING,
-    SDL_POWERSTATE_CHARGED
-} SDL_PowerState;
-SDL_PowerState SDL_GetPowerInfo(int *secs, int *pct);
-typedef enum
-{
-    SDL_RENDERER_SOFTWARE = 0x00000001,
-    SDL_RENDERER_ACCELERATED = 0x00000002,
-    SDL_RENDERER_PRESENTVSYNC = 0x00000004,
-    SDL_RENDERER_TARGETTEXTURE = 0x00000008
-} SDL_RendererFlags;
-typedef struct SDL_RendererInfo
-{
-    const char *name;
-    Uint32 flags;
-    Uint32 num_texture_formats;
-    Uint32 texture_formats[16];
-    int max_texture_width;
-    int max_texture_height;
-} SDL_RendererInfo;
-typedef enum
-{
-    SDL_TEXTUREACCESS_STATIC,
-    SDL_TEXTUREACCESS_STREAMING,
-    SDL_TEXTUREACCESS_TARGET
-} SDL_TextureAccess;
-typedef enum
-{
-    SDL_TEXTUREMODULATE_NONE = 0x00000000,
-    SDL_TEXTUREMODULATE_COLOR = 0x00000001,
-    SDL_TEXTUREMODULATE_ALPHA = 0x00000002
-} SDL_TextureModulate;
-typedef enum
-{
-    SDL_FLIP_NONE = 0x00000000,
-    SDL_FLIP_HORIZONTAL = 0x00000001,
-    SDL_FLIP_VERTICAL = 0x00000002
-} SDL_RendererFlip;
-struct SDL_Renderer;
-typedef struct SDL_Renderer SDL_Renderer;
-struct SDL_Texture;
-typedef struct SDL_Texture SDL_Texture;
-int SDL_GetNumRenderDrivers(void);
-int SDL_GetRenderDriverInfo(int index,
-                                                    SDL_RendererInfo * info);
-int SDL_CreateWindowAndRenderer(
-                                int width, int height, Uint32 window_flags,
-                                SDL_Window **window, SDL_Renderer **renderer);
-SDL_Renderer * SDL_CreateRenderer(SDL_Window * window,
-                                               int index, Uint32 flags);
-SDL_Renderer * SDL_CreateSoftwareRenderer(SDL_Surface * surface);
-SDL_Renderer * SDL_GetRenderer(SDL_Window * window);
-int SDL_GetRendererInfo(SDL_Renderer * renderer,
-                                                SDL_RendererInfo * info);
-int SDL_GetRendererOutputSize(SDL_Renderer * renderer,
-                                                      int *w, int *h);
-SDL_Texture * SDL_CreateTexture(SDL_Renderer * renderer,
-                                                        Uint32 format,
-                                                        int access, int w,
-                                                        int h);
-SDL_Texture * SDL_CreateTextureFromSurface(SDL_Renderer * renderer, SDL_Surface * surface);
-int SDL_QueryTexture(SDL_Texture * texture,
-                                             Uint32 * format, int *access,
-                                             int *w, int *h);
-int SDL_SetTextureColorMod(SDL_Texture * texture,
-                                                   Uint8 r, Uint8 g, Uint8 b);
-int SDL_GetTextureColorMod(SDL_Texture * texture,
-                                                   Uint8 * r, Uint8 * g,
-                                                   Uint8 * b);
-int SDL_SetTextureAlphaMod(SDL_Texture * texture,
-                                                   Uint8 alpha);
-int SDL_GetTextureAlphaMod(SDL_Texture * texture,
-                                                   Uint8 * alpha);
-int SDL_SetTextureBlendMode(SDL_Texture * texture,
-                                                    SDL_BlendMode blendMode);
-int SDL_GetTextureBlendMode(SDL_Texture * texture,
-                                                    SDL_BlendMode *blendMode);
-int SDL_UpdateTexture(SDL_Texture * texture,
-                                              const SDL_Rect * rect,
-                                              const void *pixels, int pitch);
-int SDL_LockTexture(SDL_Texture * texture,
-                                            const SDL_Rect * rect,
-                                            void **pixels, int *pitch);
-void SDL_UnlockTexture(SDL_Texture * texture);
-SDL_bool SDL_RenderTargetSupported(SDL_Renderer *renderer);
-int SDL_SetRenderTarget(SDL_Renderer *renderer,
-                                                SDL_Texture *texture);
-SDL_Texture * SDL_GetRenderTarget(SDL_Renderer *renderer);
-int SDL_RenderSetLogicalSize(SDL_Renderer * renderer, int w, int h);
-void SDL_RenderGetLogicalSize(SDL_Renderer * renderer, int *w, int *h);
-int SDL_RenderSetViewport(SDL_Renderer * renderer,
-                                                  const SDL_Rect * rect);
-void SDL_RenderGetViewport(SDL_Renderer * renderer,
-                                                   SDL_Rect * rect);
-int SDL_RenderSetClipRect(SDL_Renderer * renderer,
-                                                  const SDL_Rect * rect);
-void SDL_RenderGetClipRect(SDL_Renderer * renderer,
-                                                   SDL_Rect * rect);
-int SDL_RenderSetScale(SDL_Renderer * renderer,
-                                               float scaleX, float scaleY);
-void SDL_RenderGetScale(SDL_Renderer * renderer,
-                                               float *scaleX, float *scaleY);
-int SDL_SetRenderDrawColor(SDL_Renderer * renderer,
-                                           Uint8 r, Uint8 g, Uint8 b,
-                                           Uint8 a);
-int SDL_GetRenderDrawColor(SDL_Renderer * renderer,
-                                           Uint8 * r, Uint8 * g, Uint8 * b,
-                                           Uint8 * a);
-int SDL_SetRenderDrawBlendMode(SDL_Renderer * renderer,
-                                                       SDL_BlendMode blendMode);
-int SDL_GetRenderDrawBlendMode(SDL_Renderer * renderer,
-                                                       SDL_BlendMode *blendMode);
-int SDL_RenderClear(SDL_Renderer * renderer);
-int SDL_RenderDrawPoint(SDL_Renderer * renderer,
-                                                int x, int y);
-int SDL_RenderDrawPoints(SDL_Renderer * renderer,
-                                                 const SDL_Point * points,
-                                                 int count);
-int SDL_RenderDrawLine(SDL_Renderer * renderer,
-                                               int x1, int y1, int x2, int y2);
-int SDL_RenderDrawLines(SDL_Renderer * renderer,
-                                                const SDL_Point * points,
-                                                int count);
-int SDL_RenderDrawRect(SDL_Renderer * renderer,
-                                               const SDL_Rect * rect);
-int SDL_RenderDrawRects(SDL_Renderer * renderer,
-                                                const SDL_Rect * rects,
-                                                int count);
-int SDL_RenderFillRect(SDL_Renderer * renderer,
-                                               const SDL_Rect * rect);
-int SDL_RenderFillRects(SDL_Renderer * renderer,
-                                                const SDL_Rect * rects,
-                                                int count);
-int SDL_RenderCopy(SDL_Renderer * renderer,
-                                           SDL_Texture * texture,
-                                           const SDL_Rect * srcrect,
-                                           const SDL_Rect * dstrect);
-int SDL_RenderCopyEx(SDL_Renderer * renderer,
-                                           SDL_Texture * texture,
-                                           const SDL_Rect * srcrect,
-                                           const SDL_Rect * dstrect,
-                                           const double angle,
-                                           const SDL_Point *center,
-                                           const SDL_RendererFlip flip);
-int SDL_RenderReadPixels(SDL_Renderer * renderer,
-                                                 const SDL_Rect * rect,
-                                                 Uint32 format,
-                                                 void *pixels, int pitch);
-void SDL_RenderPresent(SDL_Renderer * renderer);
-void SDL_DestroyTexture(SDL_Texture * texture);
-void SDL_DestroyRenderer(SDL_Renderer * renderer);
-int SDL_GL_BindTexture(SDL_Texture *texture, float *texw, float *texh);
-int SDL_GL_UnbindTexture(SDL_Texture *texture);
-Uint32 SDL_GetTicks(void);
-Uint64 SDL_GetPerformanceCounter(void);
-Uint64 SDL_GetPerformanceFrequency(void);
-void SDL_Delay(Uint32 ms);
-typedef Uint32 ( * SDL_TimerCallback) (Uint32 interval, void *param);
-typedef int SDL_TimerID;
-SDL_TimerID SDL_AddTimer(Uint32 interval,
-                                                 SDL_TimerCallback callback,
-                                                 void *param);
-SDL_bool SDL_RemoveTimer(SDL_TimerID id);
-typedef struct SDL_version
-{
-    Uint8 major;
-    Uint8 minor;
-    Uint8 patch;
-} SDL_version;
-void SDL_GetVersion(SDL_version * ver);
-const char * SDL_GetRevision(void);
-int SDL_GetRevisionNumber(void);
-int SDL_Init(Uint32 flags);
-int SDL_InitSubSystem(Uint32 flags);
-void SDL_QuitSubSystem(Uint32 flags);
-Uint32 SDL_WasInit(Uint32 flags);
-void SDL_Quit(void);
-
-]]
-
--- sdl
-
-ffi.cdef[[
-enum {
-SDL_INIT_TIMER          = 0x00000001,
-SDL_INIT_AUDIO          = 0x00000010,
-SDL_INIT_VIDEO          = 0x00000020,
-SDL_INIT_JOYSTICK       = 0x00000200,
-SDL_INIT_HAPTIC         = 0x00001000,
-SDL_INIT_GAMECONTROLLER = 0x00002000,
-SDL_INIT_EVENTS         = 0x00004000,
-SDL_INIT_NOPARACHUTE    = 0x00100000,
-SDL_INIT_EVERYTHING     = ( \
-                SDL_INIT_TIMER | SDL_INIT_AUDIO | SDL_INIT_VIDEO | SDL_INIT_EVENTS | \
-                SDL_INIT_JOYSTICK | SDL_INIT_HAPTIC | SDL_INIT_GAMECONTROLLER \
-            )
-};
-]]
--- audio
-
-ffi.cdef[[
-enum {
-SDL_AUDIO_MASK_BITSIZE       = (0xFF),
-SDL_AUDIO_MASK_DATATYPE      = (1<<8),
-SDL_AUDIO_MASK_ENDIAN        = (1<<12),
-SDL_AUDIO_MASK_SIGNED        = (1<<15)
-};
-
-enum {
-SDL_AUDIO_U8        = 0x0008,
-SDL_AUDIO_S8        = 0x8008,
-SDL_AUDIO_U16LSB    = 0x0010,
-SDL_AUDIO_S16LSB    = 0x8010,
-SDL_AUDIO_U16MSB    = 0x1010,
-SDL_AUDIO_S16MSB    = 0x9010,
-SDL_AUDIO_U16       = SDL_AUDIO_U16LSB,
-SDL_AUDIO_S16       = SDL_AUDIO_S16LSB,
-
-SDL_AUDIO_S32LSB    = 0x8020,
-SDL_AUDIO_S32MSB    = 0x9020,
-SDL_AUDIO_S32       = SDL_AUDIO_S32LSB,
-
-SDL_AUDIO_F32LSB    = 0x8120,
-SDL_AUDIO_F32MSB    = 0x9120,
-SDL_AUDIO_F32       = SDL_AUDIO_F32LSB
-};
-
-enum {
-SDL_AUDIO_ALLOW_FREQUENCY_CHANGE    = 0x00000001,
-SDL_AUDIO_ALLOW_FORMAT_CHANGE       = 0x00000002,
-SDL_AUDIO_ALLOW_CHANNELS_CHANGE     = 0x00000004,
-SDL_AUDIO_ALLOW_ANY_CHANGE          = (SDL_AUDIO_ALLOW_FREQUENCY_CHANGE|SDL_AUDIO_ALLOW_FORMAT_CHANGE|SDL_AUDIO_ALLOW_CHANNELS_CHANGE),
-SDL_MIX_MAXVOLUME = 128
-};
-
-]]
-
--- events
-
-ffi.cdef[[
-enum {
-SDL_RELEASED = 0,
-SDL_PRESSED  = 1,
-SDL_QUERY    = -1,
-SDL_IGNORE   = 0,
-SDL_DISABLE  = 0,
-SDL_ENABLE   = 1
-};
-]]
-
--- haptic
-
-ffi.cdef[[
-enum {
-SDL_HAPTIC_CONSTANT   = (1<<0),
-SDL_HAPTIC_SINE       = (1<<1),
-SDL_HAPTIC_LEFTRIGHT     = (1<<2),
-SDL_HAPTIC_TRIANGLE   = (1<<3),
-SDL_HAPTIC_SAWTOOTHUP = (1<<4),
-SDL_HAPTIC_SAWTOOTHDOWN = (1<<5),
-SDL_HAPTIC_RAMP       = (1<<6),
-SDL_HAPTIC_SPRING     = (1<<7),
-SDL_HAPTIC_DAMPER     = (1<<8),
-SDL_HAPTIC_INERTIA    = (1<<9),
-SDL_HAPTIC_FRICTION   = (1<<10),
-SDL_HAPTIC_CUSTOM     = (1<<11),
-SDL_HAPTIC_GAIN       = (1<<12),
-SDL_HAPTIC_AUTOCENTER = (1<<13),
-SDL_HAPTIC_STATUS     = (1<<14),
-SDL_HAPTIC_PAUSE      = (1<<15),
-SDL_HAPTIC_POLAR      = 0,
-SDL_HAPTIC_CARTESIAN  = 1,
-SDL_HAPTIC_SPHERICAL  = 2,
-SDL_HAPTIC_INFINITY   = 4294967295U
-};
-]]
-
--- joystick
-
-ffi.cdef[[
-enum {
-SDL_HAT_CENTERED    = 0x00,
-SDL_HAT_UP          = 0x01,
-SDL_HAT_RIGHT       = 0x02,
-SDL_HAT_DOWN        = 0x04,
-SDL_HAT_LEFT        = 0x08,
-SDL_HAT_RIGHTUP     = (SDL_HAT_RIGHT|SDL_HAT_UP),
-SDL_HAT_RIGHTDOWN   = (SDL_HAT_RIGHT|SDL_HAT_DOWN),
-SDL_HAT_LEFTUP      = (SDL_HAT_LEFT|SDL_HAT_UP),
-SDL_HAT_LEFTDOWN    = (SDL_HAT_LEFT|SDL_HAT_DOWN)
-};
-]]
-
--- keycode
-
-ffi.cdef[[
-enum {
-SDL_SCANCODE_MASK = (1<<30),
-SDL_KMOD_CTRL = (SDL_KMOD_LCTRL|SDL_KMOD_RCTRL),
-SDL_KMOD_SHIFT = (SDL_KMOD_LSHIFT|SDL_KMOD_RSHIFT),
-SDL_KMOD_ALT = (SDL_KMOD_LALT|SDL_KMOD_RALT),
-SDL_KMOD_GUI = (SDL_KMOD_LGUI|SDL_KMOD_RGUI)
-};
-]]
-
--- main
-if jit.os == 'Windows' then
-   ffi.cdef[[
-int SDL_RegisterApp(char *name, Uint32 style,
-                    void *hInst);
-void SDL_UnregisterApp(void);
-   ]]
-end
-
--- mouse
-
-ffi.cdef[[
-enum {
-SDL_BUTTON_LEFT     = 1,
-SDL_BUTTON_MIDDLE   = 2,
-SDL_BUTTON_RIGHT    = 3,
-SDL_BUTTON_X1       = 4,
-SDL_BUTTON_X2       = 5,
-SDL_BUTTON_LMASK    = 1 << (SDL_BUTTON_LEFT-1),
-SDL_BUTTON_MMASK    = 1 << (SDL_BUTTON_MIDDLE-1),
-SDL_BUTTON_RMASK    = 1 << (SDL_BUTTON_RIGHT-1),
-SDL_BUTTON_X1MASK   = 1 << (SDL_BUTTON_X1-1),
-SDL_BUTTON_X2MASK   = 1 << (SDL_BUTTON_X2-1),
-};
-]]
-
--- mutex
-
-ffi.cdef[[
-enum {
-SDL_MUTEX_TIMEDOUT = 1,
-SDL_MUTEX_MAXWAIT = (~(Uint32)0)
-};
-]]
-
--- pixels
-
-ffi.cdef[[
-enum {
-SDL_ALPHA_OPAQUE = 255,
-SDL_ALPHA_TRANSPARENT = 0
-};
-]]
-
--- rwops
-ffi.cdef[[
-enum {
-SDL_RWOPS_UNKNOWN   = 0,
-SDL_RWOPS_WINFILE   = 1,
-SDL_RWOPS_STDFILE   = 2,
-SDL_RWOPS_JNIFILE   = 3,
-SDL_RWOPS_MEMORY    = 4,
-SDL_RWOPS_MEMORY_RO = 5
-};
-]]
-
--- shape
-ffi.cdef[[
-enum {
-SDL_NONSHAPEABLE_WINDOW = -1,
-SDL_INVALID_SHAPE_ARGUMENT = -2,
-SDL_WINDOW_LACKS_SHAPE = -3
-};
-]]
-
--- surface
-ffi.cdef[[
-enum {
-SDL_SWSURFACE       = 0,
-SDL_PREALLOC        = 0x00000001,
-SDL_RLEACCEL        = 0x00000002,
-SDL_DONTFREE        = 0x00000004
-};
-]]
-
--- video
-ffi.cdef[[
-enum {
-SDL_WINDOWPOS_CENTERED_MASK  = 0x2FFF0000,
-SDL_WINDOWPOS_CENTERED = 0x2FFF0000
-};
-]]
diff --git a/src/lib/luigi/backend/ffisdl/sdl2/defines.lua b/src/lib/luigi/backend/ffisdl/sdl2/defines.lua
deleted file mode 100644
index 72d0195..0000000
--- a/src/lib/luigi/backend/ffisdl/sdl2/defines.lua
+++ /dev/null
@@ -1,58 +0,0 @@
--- Function definitions which were not output by
--- the C preprocessor
-
-local sdl
-
-local function registerdefines(sdl)
-
-   -- audio
-
-   function sdl.AUDIO_BITSIZE(x)
-      return bit.band(x, sdl.AUDIO_MASK_BITSIZE)
-   end
-
-   function sdl.AUDIO_ISFLOAT(x)
-      return bit.band(x, sdl.AUDIO_MASK_DATATYPE) ~= 0
-   end
-
-   function sdl.AUDIO_ISBIGENDIAN(x)
-      return bit.band(x, sdl.AUDIO_MASK_ENDIAN) ~= 0
-   end
-
-   function sdl.AUDIO_ISSIGNED(x)
-      return bit.band(x, sdl.AUDIO_MASK_SIGNED) ~= 0
-   end
-
-   function sdl.AUDIO_ISINT(x)
-      return not sdl.AUDIO_ISFLOAT(x)
-   end
-
-   function sdl.AUDIO_ISLITTLEENDIAN(x)
-      return not sdl.AUDIO_ISBIGENDIAN(x)
-   end
-
-   function sdl.AUDIO_ISUNSIGNED(x)
-      return not sdl.AUDIO_ISSIGNED(x)
-   end
-
-   function sdl.loadWAV(file, spec, audio_buf, audio_len)
-      return sdl.loadWAV_RW(sdl.RWFromFile(file, "rb"), 1, spec, audio_buf, audio_len)
-   end
-
-   -- surface
-   sdl.blitSurface = sdl.upperBlit
-
-   function sdl.MUSTLOCK(S)
-      return bit.band(S.flags, sdl.RLEACCEL)
-   end
-
-   function sdl.loadBMP(file)
-      return sdl.loadBMP_RW(sdl.RWFromFile(file, 'rb'), 1)
-   end
-
-   function sdl.saveBMP(surface, file)
-      return sdl.saveBMP_RW(surface, sdl.RWFromFile(file, 'wb'), 1)
-   end
-end
-
-return registerdefines
diff --git a/src/lib/luigi/backend/ffisdl/sdl2/init.lua b/src/lib/luigi/backend/ffisdl/sdl2/init.lua
deleted file mode 100644
index eceab50..0000000
--- a/src/lib/luigi/backend/ffisdl/sdl2/init.lua
+++ /dev/null
@@ -1,1500 +0,0 @@
--- Do not change this file manually
--- Generated with dev/create-init.lua
-
-local ROOT = (...):gsub('[^.]*$', '')
-
-local ffi = require 'ffi'
-local C = ffi.load('SDL2')
-local sdl = {C=C}
-local registerdefines = require(ROOT .. 'defines')
-
-require(ROOT .. 'cdefs')
-
-local function register(luafuncname, funcname)
-   local symexists, msg = pcall(function()
-                              local sym = C[funcname]
-                           end)
-   if symexists then
-      sdl[luafuncname] = C[funcname]
-   end
-end
-
-register('getPlatform', 'SDL_GetPlatform')
-register('dummy_uint8[', 'SDL_dummy_uint8[')
-register('dummy_sint8[', 'SDL_dummy_sint8[')
-register('dummy_uint16[', 'SDL_dummy_uint16[')
-register('dummy_sint16[', 'SDL_dummy_sint16[')
-register('dummy_uint32[', 'SDL_dummy_uint32[')
-register('dummy_sint32[', 'SDL_dummy_sint32[')
-register('dummy_uint64[', 'SDL_dummy_uint64[')
-register('dummy_sint64[', 'SDL_dummy_sint64[')
-register('dummy_enum[', 'SDL_dummy_enum[')
-register('malloc', 'SDL_malloc')
-register('calloc', 'SDL_calloc')
-register('realloc', 'SDL_realloc')
-register('free', 'SDL_free')
-register('getenv', 'SDL_getenv')
-register('setenv', 'SDL_setenv')
-register('qsort', 'SDL_qsort')
-register('abs', 'SDL_abs')
-register('isdigit', 'SDL_isdigit')
-register('isspace', 'SDL_isspace')
-register('toupper', 'SDL_toupper')
-register('tolower', 'SDL_tolower')
-register('memset', 'SDL_memset')
-register('memcpy', 'SDL_memcpy')
-register('memmove', 'SDL_memmove')
-register('memcmp', 'SDL_memcmp')
-register('wcslen', 'SDL_wcslen')
-register('wcslcpy', 'SDL_wcslcpy')
-register('wcslcat', 'SDL_wcslcat')
-register('strlen', 'SDL_strlen')
-register('strlcpy', 'SDL_strlcpy')
-register('utf8strlcpy', 'SDL_utf8strlcpy')
-register('strlcat', 'SDL_strlcat')
-register('strdup', 'SDL_strdup')
-register('strrev', 'SDL_strrev')
-register('strupr', 'SDL_strupr')
-register('strlwr', 'SDL_strlwr')
-register('strchr', 'SDL_strchr')
-register('strrchr', 'SDL_strrchr')
-register('strstr', 'SDL_strstr')
-register('itoa', 'SDL_itoa')
-register('uitoa', 'SDL_uitoa')
-register('ltoa', 'SDL_ltoa')
-register('ultoa', 'SDL_ultoa')
-register('lltoa', 'SDL_lltoa')
-register('ulltoa', 'SDL_ulltoa')
-register('atoi', 'SDL_atoi')
-register('atof', 'SDL_atof')
-register('strtol', 'SDL_strtol')
-register('strtoul', 'SDL_strtoul')
-register('strtoll', 'SDL_strtoll')
-register('strtoull', 'SDL_strtoull')
-register('strtod', 'SDL_strtod')
-register('strcmp', 'SDL_strcmp')
-register('strncmp', 'SDL_strncmp')
-register('strcasecmp', 'SDL_strcasecmp')
-register('strncasecmp', 'SDL_strncasecmp')
-register('sscanf', 'SDL_sscanf')
-register('snprintf', 'SDL_snprintf')
-register('vsnprintf', 'SDL_vsnprintf')
-register('atan', 'SDL_atan')
-register('atan2', 'SDL_atan2')
-register('ceil', 'SDL_ceil')
-register('copysign', 'SDL_copysign')
-register('cos', 'SDL_cos')
-register('cosf', 'SDL_cosf')
-register('fabs', 'SDL_fabs')
-register('floor', 'SDL_floor')
-register('log', 'SDL_log')
-register('pow', 'SDL_pow')
-register('scalbn', 'SDL_scalbn')
-register('sin', 'SDL_sin')
-register('sinf', 'SDL_sinf')
-register('sqrt', 'SDL_sqrt')
-register('iconv_open', 'SDL_iconv_open')
-register('iconv_close', 'SDL_iconv_close')
-register('iconv', 'SDL_iconv')
-register('iconv_string', 'SDL_iconv_string')
-register('main', 'SDL_main')
-register('setMainReady', 'SDL_SetMainReady')
-register('reportAssertion', 'SDL_ReportAssertion')
-register('assert_state', 'SDL_assert_state')
-register('setAssertionHandler', 'SDL_SetAssertionHandler')
-register('getAssertionReport', 'SDL_GetAssertionReport')
-register('resetAssertionReport', 'SDL_ResetAssertionReport')
-register('atomicTryLock', 'SDL_AtomicTryLock')
-register('atomicLock', 'SDL_AtomicLock')
-register('atomicUnlock', 'SDL_AtomicUnlock')
-register('setError', 'SDL_SetError')
-register('getError', 'SDL_GetError')
-register('clearError', 'SDL_ClearError')
-register('error', 'SDL_Error')
-register('createMutex', 'SDL_CreateMutex')
-register('lockMutex', 'SDL_LockMutex')
-register('tryLockMutex', 'SDL_TryLockMutex')
-register('unlockMutex', 'SDL_UnlockMutex')
-register('destroyMutex', 'SDL_DestroyMutex')
-register('createSemaphore', 'SDL_CreateSemaphore')
-register('destroySemaphore', 'SDL_DestroySemaphore')
-register('semWait', 'SDL_SemWait')
-register('semTryWait', 'SDL_SemTryWait')
-register('semWaitTimeout', 'SDL_SemWaitTimeout')
-register('semPost', 'SDL_SemPost')
-register('semValue', 'SDL_SemValue')
-register('createCond', 'SDL_CreateCond')
-register('destroyCond', 'SDL_DestroyCond')
-register('condSignal', 'SDL_CondSignal')
-register('condBroadcast', 'SDL_CondBroadcast')
-register('condWait', 'SDL_CondWait')
-register('condWaitTimeout', 'SDL_CondWaitTimeout')
-
-if jit.os == 'Windows' then
-  sdl.createThread =
-    function(fn, name, data)
-      return C.SDL_CreateThread(fn, name, data, ffi.C._beginthreadex, ffi.C._endthreadex)
-    end
-else
-  register('createThread', 'SDL_CreateThread')
-end
-
-register('getThreadName', 'SDL_GetThreadName')
-register('threadID', 'SDL_ThreadID')
-register('getThreadID', 'SDL_GetThreadID')
-register('setThreadPriority', 'SDL_SetThreadPriority')
-register('waitThread', 'SDL_WaitThread')
-register('tLSCreate', 'SDL_TLSCreate')
-register('tLSGet', 'SDL_TLSGet')
-register('tLSSet', 'SDL_TLSSet')
-register('RWFromFile', 'SDL_RWFromFile')
-register('RWFromFP', 'SDL_RWFromFP')
-register('RWFromMem', 'SDL_RWFromMem')
-register('RWFromConstMem', 'SDL_RWFromConstMem')
-register('allocRW', 'SDL_AllocRW')
-register('freeRW', 'SDL_FreeRW')
-register('readU8', 'SDL_ReadU8')
-register('readLE16', 'SDL_ReadLE16')
-register('readBE16', 'SDL_ReadBE16')
-register('readLE32', 'SDL_ReadLE32')
-register('readBE32', 'SDL_ReadBE32')
-register('readLE64', 'SDL_ReadLE64')
-register('readBE64', 'SDL_ReadBE64')
-register('writeU8', 'SDL_WriteU8')
-register('writeLE16', 'SDL_WriteLE16')
-register('writeBE16', 'SDL_WriteBE16')
-register('writeLE32', 'SDL_WriteLE32')
-register('writeBE32', 'SDL_WriteBE32')
-register('writeLE64', 'SDL_WriteLE64')
-register('writeBE64', 'SDL_WriteBE64')
-register('getNumAudioDrivers', 'SDL_GetNumAudioDrivers')
-register('getAudioDriver', 'SDL_GetAudioDriver')
-register('audioInit', 'SDL_AudioInit')
-register('audioQuit', 'SDL_AudioQuit')
-register('getCurrentAudioDriver', 'SDL_GetCurrentAudioDriver')
-register('openAudio', 'SDL_OpenAudio')
-register('getNumAudioDevices', 'SDL_GetNumAudioDevices')
-register('getAudioDeviceName', 'SDL_GetAudioDeviceName')
-register('openAudioDevice', 'SDL_OpenAudioDevice')
-register('getAudioStatus', 'SDL_GetAudioStatus')
-register('getAudioDeviceStatus', 'SDL_GetAudioDeviceStatus')
-register('pauseAudio', 'SDL_PauseAudio')
-register('pauseAudioDevice', 'SDL_PauseAudioDevice')
-register('loadWAV_RW', 'SDL_LoadWAV_RW')
-register('freeWAV', 'SDL_FreeWAV')
-register('buildAudioCVT', 'SDL_BuildAudioCVT')
-register('convertAudio', 'SDL_ConvertAudio')
-register('mixAudio', 'SDL_MixAudio')
-register('mixAudioFormat', 'SDL_MixAudioFormat')
-register('lockAudio', 'SDL_LockAudio')
-register('lockAudioDevice', 'SDL_LockAudioDevice')
-register('unlockAudio', 'SDL_UnlockAudio')
-register('unlockAudioDevice', 'SDL_UnlockAudioDevice')
-register('closeAudio', 'SDL_CloseAudio')
-register('closeAudioDevice', 'SDL_CloseAudioDevice')
-register('setClipboardText', 'SDL_SetClipboardText')
-register('getClipboardText', 'SDL_GetClipboardText')
-register('hasClipboardText', 'SDL_HasClipboardText')
-register('getCPUCount', 'SDL_GetCPUCount')
-register('getCPUCacheLineSize', 'SDL_GetCPUCacheLineSize')
-register('hasRDTSC', 'SDL_HasRDTSC')
-register('hasAltiVec', 'SDL_HasAltiVec')
-register('hasMMX', 'SDL_HasMMX')
-register('has3DNow', 'SDL_Has3DNow')
-register('hasSSE', 'SDL_HasSSE')
-register('hasSSE2', 'SDL_HasSSE2')
-register('hasSSE3', 'SDL_HasSSE3')
-register('hasSSE41', 'SDL_HasSSE41')
-register('hasSSE42', 'SDL_HasSSE42')
-register('getPixelFormatName', 'SDL_GetPixelFormatName')
-register('pixelFormatEnumToMasks', 'SDL_PixelFormatEnumToMasks')
-register('masksToPixelFormatEnum', 'SDL_MasksToPixelFormatEnum')
-register('allocFormat', 'SDL_AllocFormat')
-register('freeFormat', 'SDL_FreeFormat')
-register('allocPalette', 'SDL_AllocPalette')
-register('setPixelFormatPalette', 'SDL_SetPixelFormatPalette')
-register('setPaletteColors', 'SDL_SetPaletteColors')
-register('freePalette', 'SDL_FreePalette')
-register('mapRGB', 'SDL_MapRGB')
-register('mapRGBA', 'SDL_MapRGBA')
-register('getRGB', 'SDL_GetRGB')
-register('getRGBA', 'SDL_GetRGBA')
-register('calculateGammaRamp', 'SDL_CalculateGammaRamp')
-register('hasIntersection', 'SDL_HasIntersection')
-register('intersectRect', 'SDL_IntersectRect')
-register('unionRect', 'SDL_UnionRect')
-register('enclosePoints', 'SDL_EnclosePoints')
-register('intersectRectAndLine', 'SDL_IntersectRectAndLine')
-register('createRGBSurface', 'SDL_CreateRGBSurface')
-register('createRGBSurfaceFrom', 'SDL_CreateRGBSurfaceFrom')
-register('freeSurface', 'SDL_FreeSurface')
-register('setSurfacePalette', 'SDL_SetSurfacePalette')
-register('lockSurface', 'SDL_LockSurface')
-register('unlockSurface', 'SDL_UnlockSurface')
-register('loadBMP_RW', 'SDL_LoadBMP_RW')
-register('saveBMP_RW', 'SDL_SaveBMP_RW')
-register('setSurfaceRLE', 'SDL_SetSurfaceRLE')
-register('setColorKey', 'SDL_SetColorKey')
-register('getColorKey', 'SDL_GetColorKey')
-register('setSurfaceColorMod', 'SDL_SetSurfaceColorMod')
-register('getSurfaceColorMod', 'SDL_GetSurfaceColorMod')
-register('setSurfaceAlphaMod', 'SDL_SetSurfaceAlphaMod')
-register('getSurfaceAlphaMod', 'SDL_GetSurfaceAlphaMod')
-register('setSurfaceBlendMode', 'SDL_SetSurfaceBlendMode')
-register('getSurfaceBlendMode', 'SDL_GetSurfaceBlendMode')
-register('setClipRect', 'SDL_SetClipRect')
-register('getClipRect', 'SDL_GetClipRect')
-register('convertSurface', 'SDL_ConvertSurface')
-register('convertSurfaceFormat', 'SDL_ConvertSurfaceFormat')
-register('convertPixels', 'SDL_ConvertPixels')
-register('fillRect', 'SDL_FillRect')
-register('fillRects', 'SDL_FillRects')
-register('upperBlit', 'SDL_UpperBlit')
-register('lowerBlit', 'SDL_LowerBlit')
-register('softStretch', 'SDL_SoftStretch')
-register('upperBlitScaled', 'SDL_UpperBlitScaled')
-register('lowerBlitScaled', 'SDL_LowerBlitScaled')
-register('getNumVideoDrivers', 'SDL_GetNumVideoDrivers')
-register('getVideoDriver', 'SDL_GetVideoDriver')
-register('videoInit', 'SDL_VideoInit')
-register('videoQuit', 'SDL_VideoQuit')
-register('getCurrentVideoDriver', 'SDL_GetCurrentVideoDriver')
-register('getNumVideoDisplays', 'SDL_GetNumVideoDisplays')
-register('getDisplayName', 'SDL_GetDisplayName')
-register('getDisplayBounds', 'SDL_GetDisplayBounds')
-register('getNumDisplayModes', 'SDL_GetNumDisplayModes')
-register('getDisplayMode', 'SDL_GetDisplayMode')
-register('getDesktopDisplayMode', 'SDL_GetDesktopDisplayMode')
-register('getCurrentDisplayMode', 'SDL_GetCurrentDisplayMode')
-register('getClosestDisplayMode', 'SDL_GetClosestDisplayMode')
-register('getWindowDisplayIndex', 'SDL_GetWindowDisplayIndex')
-register('setWindowDisplayMode', 'SDL_SetWindowDisplayMode')
-register('getWindowDisplayMode', 'SDL_GetWindowDisplayMode')
-register('getWindowPixelFormat', 'SDL_GetWindowPixelFormat')
-register('createWindow', 'SDL_CreateWindow')
-register('createWindowFrom', 'SDL_CreateWindowFrom')
-register('getWindowID', 'SDL_GetWindowID')
-register('getWindowFromID', 'SDL_GetWindowFromID')
-register('getWindowFlags', 'SDL_GetWindowFlags')
-register('setWindowTitle', 'SDL_SetWindowTitle')
-register('getWindowTitle', 'SDL_GetWindowTitle')
-register('setWindowIcon', 'SDL_SetWindowIcon')
-register('setWindowData', 'SDL_SetWindowData')
-register('getWindowData', 'SDL_GetWindowData')
-register('setWindowPosition', 'SDL_SetWindowPosition')
-register('getWindowPosition', 'SDL_GetWindowPosition')
-register('setWindowSize', 'SDL_SetWindowSize')
-register('getWindowSize', 'SDL_GetWindowSize')
-register('setWindowMinimumSize', 'SDL_SetWindowMinimumSize')
-register('getWindowMinimumSize', 'SDL_GetWindowMinimumSize')
-register('setWindowMaximumSize', 'SDL_SetWindowMaximumSize')
-register('getWindowMaximumSize', 'SDL_GetWindowMaximumSize')
-register('setWindowBordered', 'SDL_SetWindowBordered')
-register('showWindow', 'SDL_ShowWindow')
-register('hideWindow', 'SDL_HideWindow')
-register('raiseWindow', 'SDL_RaiseWindow')
-register('maximizeWindow', 'SDL_MaximizeWindow')
-register('minimizeWindow', 'SDL_MinimizeWindow')
-register('restoreWindow', 'SDL_RestoreWindow')
-register('setWindowFullscreen', 'SDL_SetWindowFullscreen')
-register('getWindowSurface', 'SDL_GetWindowSurface')
-register('updateWindowSurface', 'SDL_UpdateWindowSurface')
-register('updateWindowSurfaceRects', 'SDL_UpdateWindowSurfaceRects')
-register('setWindowGrab', 'SDL_SetWindowGrab')
-register('getWindowGrab', 'SDL_GetWindowGrab')
-register('setWindowBrightness', 'SDL_SetWindowBrightness')
-register('getWindowBrightness', 'SDL_GetWindowBrightness')
-register('setWindowGammaRamp', 'SDL_SetWindowGammaRamp')
-register('getWindowGammaRamp', 'SDL_GetWindowGammaRamp')
-register('destroyWindow', 'SDL_DestroyWindow')
-register('isScreenSaverEnabled', 'SDL_IsScreenSaverEnabled')
-register('enableScreenSaver', 'SDL_EnableScreenSaver')
-register('disableScreenSaver', 'SDL_DisableScreenSaver')
-register('gL_LoadLibrary', 'SDL_GL_LoadLibrary')
-register('gL_GetProcAddress', 'SDL_GL_GetProcAddress')
-register('gL_UnloadLibrary', 'SDL_GL_UnloadLibrary')
-register('gL_ExtensionSupported', 'SDL_GL_ExtensionSupported')
-register('gL_SetAttribute', 'SDL_GL_SetAttribute')
-register('gL_GetAttribute', 'SDL_GL_GetAttribute')
-register('gL_CreateContext', 'SDL_GL_CreateContext')
-register('gL_MakeCurrent', 'SDL_GL_MakeCurrent')
-register('gL_GetCurrentWindow', 'SDL_GL_GetCurrentWindow')
-register('gL_GetCurrentContext', 'SDL_GL_GetCurrentContext')
-register('gL_SetSwapInterval', 'SDL_GL_SetSwapInterval')
-register('gL_GetSwapInterval', 'SDL_GL_GetSwapInterval')
-register('gL_SwapWindow', 'SDL_GL_SwapWindow')
-register('gL_DeleteContext', 'SDL_GL_DeleteContext')
-register('getKeyboardFocus', 'SDL_GetKeyboardFocus')
-register('getKeyboardState', 'SDL_GetKeyboardState')
-register('getModState', 'SDL_GetModState')
-register('setModState', 'SDL_SetModState')
-register('getKeyFromScancode', 'SDL_GetKeyFromScancode')
-register('getScancodeFromKey', 'SDL_GetScancodeFromKey')
-register('getScancodeName', 'SDL_GetScancodeName')
-register('getScancodeFromName', 'SDL_GetScancodeFromName')
-register('getKeyName', 'SDL_GetKeyName')
-register('getKeyFromName', 'SDL_GetKeyFromName')
-register('startTextInput', 'SDL_StartTextInput')
-register('isTextInputActive', 'SDL_IsTextInputActive')
-register('stopTextInput', 'SDL_StopTextInput')
-register('setTextInputRect', 'SDL_SetTextInputRect')
-register('hasScreenKeyboardSupport', 'SDL_HasScreenKeyboardSupport')
-register('isScreenKeyboardShown', 'SDL_IsScreenKeyboardShown')
-register('getMouseFocus', 'SDL_GetMouseFocus')
-register('getMouseState', 'SDL_GetMouseState')
-register('getRelativeMouseState', 'SDL_GetRelativeMouseState')
-register('warpMouseInWindow', 'SDL_WarpMouseInWindow')
-register('setRelativeMouseMode', 'SDL_SetRelativeMouseMode')
-register('getRelativeMouseMode', 'SDL_GetRelativeMouseMode')
-register('createCursor', 'SDL_CreateCursor')
-register('createColorCursor', 'SDL_CreateColorCursor')
-register('createSystemCursor', 'SDL_CreateSystemCursor')
-register('setCursor', 'SDL_SetCursor')
-register('getCursor', 'SDL_GetCursor')
-register('getDefaultCursor', 'SDL_GetDefaultCursor')
-register('freeCursor', 'SDL_FreeCursor')
-register('showCursor', 'SDL_ShowCursor')
-register('numJoysticks', 'SDL_NumJoysticks')
-register('joystickNameForIndex', 'SDL_JoystickNameForIndex')
-register('joystickOpen', 'SDL_JoystickOpen')
-register('joystickName', 'SDL_JoystickName')
-register('joystickGetDeviceGUID', 'SDL_JoystickGetDeviceGUID')
-register('joystickGetGUID', 'SDL_JoystickGetGUID')
-register('joystickGetGUIDString', 'SDL_JoystickGetGUIDString')
-register('joystickGetGUIDFromString', 'SDL_JoystickGetGUIDFromString')
-register('joystickGetAttached', 'SDL_JoystickGetAttached')
-register('joystickInstanceID', 'SDL_JoystickInstanceID')
-register('joystickNumAxes', 'SDL_JoystickNumAxes')
-register('joystickNumBalls', 'SDL_JoystickNumBalls')
-register('joystickNumHats', 'SDL_JoystickNumHats')
-register('joystickNumButtons', 'SDL_JoystickNumButtons')
-register('joystickUpdate', 'SDL_JoystickUpdate')
-register('joystickEventState', 'SDL_JoystickEventState')
-register('joystickGetAxis', 'SDL_JoystickGetAxis')
-register('joystickGetHat', 'SDL_JoystickGetHat')
-register('joystickGetBall', 'SDL_JoystickGetBall')
-register('joystickGetButton', 'SDL_JoystickGetButton')
-register('joystickClose', 'SDL_JoystickClose')
-register('gameControllerAddMapping', 'SDL_GameControllerAddMapping')
-register('gameControllerMappingForGUID', 'SDL_GameControllerMappingForGUID')
-register('gameControllerMapping', 'SDL_GameControllerMapping')
-register('isGameController', 'SDL_IsGameController')
-register('gameControllerNameForIndex', 'SDL_GameControllerNameForIndex')
-register('gameControllerOpen', 'SDL_GameControllerOpen')
-register('gameControllerName', 'SDL_GameControllerName')
-register('gameControllerGetAttached', 'SDL_GameControllerGetAttached')
-register('gameControllerGetJoystick', 'SDL_GameControllerGetJoystick')
-register('gameControllerEventState', 'SDL_GameControllerEventState')
-register('gameControllerUpdate', 'SDL_GameControllerUpdate')
-register('gameControllerGetAxisFromString', 'SDL_GameControllerGetAxisFromString')
-register('gameControllerGetStringForAxis', 'SDL_GameControllerGetStringForAxis')
-register('gameControllerGetBindForAxis', 'SDL_GameControllerGetBindForAxis')
-register('gameControllerGetAxis', 'SDL_GameControllerGetAxis')
-register('gameControllerGetButtonFromString', 'SDL_GameControllerGetButtonFromString')
-register('gameControllerGetStringForButton', 'SDL_GameControllerGetStringForButton')
-register('gameControllerGetBindForButton', 'SDL_GameControllerGetBindForButton')
-register('gameControllerGetButton', 'SDL_GameControllerGetButton')
-register('gameControllerClose', 'SDL_GameControllerClose')
-register('getNumTouchDevices', 'SDL_GetNumTouchDevices')
-register('getTouchDevice', 'SDL_GetTouchDevice')
-register('getNumTouchFingers', 'SDL_GetNumTouchFingers')
-register('getTouchFinger', 'SDL_GetTouchFinger')
-register('recordGesture', 'SDL_RecordGesture')
-register('saveAllDollarTemplates', 'SDL_SaveAllDollarTemplates')
-register('saveDollarTemplate', 'SDL_SaveDollarTemplate')
-register('loadDollarTemplates', 'SDL_LoadDollarTemplates')
-register('pumpEvents', 'SDL_PumpEvents')
-register('peepEvents', 'SDL_PeepEvents')
-register('hasEvent', 'SDL_HasEvent')
-register('hasEvents', 'SDL_HasEvents')
-register('flushEvent', 'SDL_FlushEvent')
-register('flushEvents', 'SDL_FlushEvents')
-register('pollEvent', 'SDL_PollEvent')
-register('waitEvent', 'SDL_WaitEvent')
-register('waitEventTimeout', 'SDL_WaitEventTimeout')
-register('pushEvent', 'SDL_PushEvent')
-register('setEventFilter', 'SDL_SetEventFilter')
-register('getEventFilter', 'SDL_GetEventFilter')
-register('addEventWatch', 'SDL_AddEventWatch')
-register('delEventWatch', 'SDL_DelEventWatch')
-register('filterEvents', 'SDL_FilterEvents')
-register('eventState', 'SDL_EventState')
-register('registerEvents', 'SDL_RegisterEvents')
-register('numHaptics', 'SDL_NumHaptics')
-register('hapticName', 'SDL_HapticName')
-register('hapticOpen', 'SDL_HapticOpen')
-register('hapticOpened', 'SDL_HapticOpened')
-register('hapticIndex', 'SDL_HapticIndex')
-register('mouseIsHaptic', 'SDL_MouseIsHaptic')
-register('hapticOpenFromMouse', 'SDL_HapticOpenFromMouse')
-register('joystickIsHaptic', 'SDL_JoystickIsHaptic')
-register('hapticOpenFromJoystick', 'SDL_HapticOpenFromJoystick')
-register('hapticClose', 'SDL_HapticClose')
-register('hapticNumEffects', 'SDL_HapticNumEffects')
-register('hapticNumEffectsPlaying', 'SDL_HapticNumEffectsPlaying')
-register('hapticQuery', 'SDL_HapticQuery')
-register('hapticNumAxes', 'SDL_HapticNumAxes')
-register('hapticEffectSupported', 'SDL_HapticEffectSupported')
-register('hapticNewEffect', 'SDL_HapticNewEffect')
-register('hapticUpdateEffect', 'SDL_HapticUpdateEffect')
-register('hapticRunEffect', 'SDL_HapticRunEffect')
-register('hapticStopEffect', 'SDL_HapticStopEffect')
-register('hapticDestroyEffect', 'SDL_HapticDestroyEffect')
-register('hapticGetEffectStatus', 'SDL_HapticGetEffectStatus')
-register('hapticSetGain', 'SDL_HapticSetGain')
-register('hapticSetAutocenter', 'SDL_HapticSetAutocenter')
-register('hapticPause', 'SDL_HapticPause')
-register('hapticUnpause', 'SDL_HapticUnpause')
-register('hapticStopAll', 'SDL_HapticStopAll')
-register('hapticRumbleSupported', 'SDL_HapticRumbleSupported')
-register('hapticRumbleInit', 'SDL_HapticRumbleInit')
-register('hapticRumblePlay', 'SDL_HapticRumblePlay')
-register('hapticRumbleStop', 'SDL_HapticRumbleStop')
-register('setHintWithPriority', 'SDL_SetHintWithPriority')
-register('setHint', 'SDL_SetHint')
-register('getHint', 'SDL_GetHint')
-register('addHintCallback', 'SDL_AddHintCallback')
-register('delHintCallback', 'SDL_DelHintCallback')
-register('clearHints', 'SDL_ClearHints')
-register('loadObject', 'SDL_LoadObject')
-register('loadFunction', 'SDL_LoadFunction')
-register('unloadObject', 'SDL_UnloadObject')
-register('logSetAllPriority', 'SDL_LogSetAllPriority')
-register('logSetPriority', 'SDL_LogSetPriority')
-register('logGetPriority', 'SDL_LogGetPriority')
-register('logResetPriorities', 'SDL_LogResetPriorities')
-register('log', 'SDL_Log')
-register('logVerbose', 'SDL_LogVerbose')
-register('logDebug', 'SDL_LogDebug')
-register('logInfo', 'SDL_LogInfo')
-register('logWarn', 'SDL_LogWarn')
-register('logError', 'SDL_LogError')
-register('logCritical', 'SDL_LogCritical')
-register('logMessage', 'SDL_LogMessage')
-register('logMessageV', 'SDL_LogMessageV')
-register('logGetOutputFunction', 'SDL_LogGetOutputFunction')
-register('logSetOutputFunction', 'SDL_LogSetOutputFunction')
-register('showMessageBox', 'SDL_ShowMessageBox')
-register('showSimpleMessageBox', 'SDL_ShowSimpleMessageBox')
-register('getPowerInfo', 'SDL_GetPowerInfo')
-register('getNumRenderDrivers', 'SDL_GetNumRenderDrivers')
-register('getRenderDriverInfo', 'SDL_GetRenderDriverInfo')
-register('createWindowAndRenderer', 'SDL_CreateWindowAndRenderer')
-register('createRenderer', 'SDL_CreateRenderer')
-register('createSoftwareRenderer', 'SDL_CreateSoftwareRenderer')
-register('getRenderer', 'SDL_GetRenderer')
-register('getRendererInfo', 'SDL_GetRendererInfo')
-register('getRendererOutputSize', 'SDL_GetRendererOutputSize')
-register('createTexture', 'SDL_CreateTexture')
-register('createTextureFromSurface', 'SDL_CreateTextureFromSurface')
-register('queryTexture', 'SDL_QueryTexture')
-register('setTextureColorMod', 'SDL_SetTextureColorMod')
-register('getTextureColorMod', 'SDL_GetTextureColorMod')
-register('setTextureAlphaMod', 'SDL_SetTextureAlphaMod')
-register('getTextureAlphaMod', 'SDL_GetTextureAlphaMod')
-register('setTextureBlendMode', 'SDL_SetTextureBlendMode')
-register('getTextureBlendMode', 'SDL_GetTextureBlendMode')
-register('updateTexture', 'SDL_UpdateTexture')
-register('lockTexture', 'SDL_LockTexture')
-register('unlockTexture', 'SDL_UnlockTexture')
-register('renderTargetSupported', 'SDL_RenderTargetSupported')
-register('setRenderTarget', 'SDL_SetRenderTarget')
-register('getRenderTarget', 'SDL_GetRenderTarget')
-register('renderSetLogicalSize', 'SDL_RenderSetLogicalSize')
-register('renderGetLogicalSize', 'SDL_RenderGetLogicalSize')
-register('renderSetViewport', 'SDL_RenderSetViewport')
-register('renderGetViewport', 'SDL_RenderGetViewport')
-register('renderSetClipRect', 'SDL_RenderSetClipRect')
-register('renderGetClipRect', 'SDL_RenderGetClipRect')
-register('renderSetScale', 'SDL_RenderSetScale')
-register('renderGetScale', 'SDL_RenderGetScale')
-register('setRenderDrawColor', 'SDL_SetRenderDrawColor')
-register('getRenderDrawColor', 'SDL_GetRenderDrawColor')
-register('setRenderDrawBlendMode', 'SDL_SetRenderDrawBlendMode')
-register('getRenderDrawBlendMode', 'SDL_GetRenderDrawBlendMode')
-register('renderClear', 'SDL_RenderClear')
-register('renderDrawPoint', 'SDL_RenderDrawPoint')
-register('renderDrawPoints', 'SDL_RenderDrawPoints')
-register('renderDrawLine', 'SDL_RenderDrawLine')
-register('renderDrawLines', 'SDL_RenderDrawLines')
-register('renderDrawRect', 'SDL_RenderDrawRect')
-register('renderDrawRects', 'SDL_RenderDrawRects')
-register('renderFillRect', 'SDL_RenderFillRect')
-register('renderFillRects', 'SDL_RenderFillRects')
-register('renderCopy', 'SDL_RenderCopy')
-register('renderCopyEx', 'SDL_RenderCopyEx')
-register('renderReadPixels', 'SDL_RenderReadPixels')
-register('renderPresent', 'SDL_RenderPresent')
-register('destroyTexture', 'SDL_DestroyTexture')
-register('destroyRenderer', 'SDL_DestroyRenderer')
-register('gL_BindTexture', 'SDL_GL_BindTexture')
-register('gL_UnbindTexture', 'SDL_GL_UnbindTexture')
-register('getTicks', 'SDL_GetTicks')
-register('getPerformanceCounter', 'SDL_GetPerformanceCounter')
-register('getPerformanceFrequency', 'SDL_GetPerformanceFrequency')
-register('delay', 'SDL_Delay')
-register('addTimer', 'SDL_AddTimer')
-register('removeTimer', 'SDL_RemoveTimer')
-register('getVersion', 'SDL_GetVersion')
-register('getRevision', 'SDL_GetRevision')
-register('getRevisionNumber', 'SDL_GetRevisionNumber')
-register('init', 'SDL_Init')
-register('initSubSystem', 'SDL_InitSubSystem')
-register('quitSubSystem', 'SDL_QuitSubSystem')
-register('wasInit', 'SDL_WasInit')
-register('quit', 'SDL_Quit')
-register('registerApp', 'SDL_RegisterApp')
-register('unregisterApp', 'SDL_UnregisterApp')
-
-register('FALSE', 'SDL_FALSE')
-register('TRUE', 'SDL_TRUE')
-register('DUMMY_ENUM', 'SDL_DUMMY_ENUM')
-register('DUMMY_ENUM', 'SDL_DUMMY_ENUM')
-register('ASSERTION_RETRY', 'SDL_ASSERTION_RETRY')
-register('ASSERTION_BREAK', 'SDL_ASSERTION_BREAK')
-register('ASSERTION_ABORT', 'SDL_ASSERTION_ABORT')
-register('ASSERTION_IGNORE', 'SDL_ASSERTION_IGNORE')
-register('ASSERTION_ALWAYS_IGNORE', 'SDL_ASSERTION_ALWAYS_IGNORE')
-register('ENOMEM', 'SDL_ENOMEM')
-register('EFREAD', 'SDL_EFREAD')
-register('EFWRITE', 'SDL_EFWRITE')
-register('EFSEEK', 'SDL_EFSEEK')
-register('UNSUPPORTED', 'SDL_UNSUPPORTED')
-register('LASTERROR', 'SDL_LASTERROR')
-register('TLSID', 'SDL_TLSID')
-register('THREAD_PRIORITY_LOW', 'SDL_THREAD_PRIORITY_LOW')
-register('THREAD_PRIORITY_NORMAL', 'SDL_THREAD_PRIORITY_NORMAL')
-register('THREAD_PRIORITY_HIGH', 'SDL_THREAD_PRIORITY_HIGH')
-register('TLSID', 'SDL_TLSID')
-register('TLSID', 'SDL_TLSID')
-register('TLSID', 'SDL_TLSID')
-register('AUDIO_STOPPED', 'SDL_AUDIO_STOPPED')
-register('AUDIO_PLAYING', 'SDL_AUDIO_PLAYING')
-register('AUDIO_PAUSED', 'SDL_AUDIO_PAUSED')
-register('PIXELTYPE_UNKNOWN', 'SDL_PIXELTYPE_UNKNOWN')
-register('PIXELTYPE_INDEX1', 'SDL_PIXELTYPE_INDEX1')
-register('PIXELTYPE_INDEX4', 'SDL_PIXELTYPE_INDEX4')
-register('PIXELTYPE_INDEX8', 'SDL_PIXELTYPE_INDEX8')
-register('PIXELTYPE_PACKED8', 'SDL_PIXELTYPE_PACKED8')
-register('PIXELTYPE_PACKED16', 'SDL_PIXELTYPE_PACKED16')
-register('PIXELTYPE_PACKED32', 'SDL_PIXELTYPE_PACKED32')
-register('PIXELTYPE_ARRAYU8', 'SDL_PIXELTYPE_ARRAYU8')
-register('PIXELTYPE_ARRAYU16', 'SDL_PIXELTYPE_ARRAYU16')
-register('PIXELTYPE_ARRAYU32', 'SDL_PIXELTYPE_ARRAYU32')
-register('PIXELTYPE_ARRAYF16', 'SDL_PIXELTYPE_ARRAYF16')
-register('PIXELTYPE_ARRAYF32', 'SDL_PIXELTYPE_ARRAYF32')
-register('BITMAPORDER_NONE', 'SDL_BITMAPORDER_NONE')
-register('BITMAPORDER_4321', 'SDL_BITMAPORDER_4321')
-register('BITMAPORDER_1234', 'SDL_BITMAPORDER_1234')
-register('PACKEDORDER_NONE', 'SDL_PACKEDORDER_NONE')
-register('PACKEDORDER_XRGB', 'SDL_PACKEDORDER_XRGB')
-register('PACKEDORDER_RGBX', 'SDL_PACKEDORDER_RGBX')
-register('PACKEDORDER_ARGB', 'SDL_PACKEDORDER_ARGB')
-register('PACKEDORDER_RGBA', 'SDL_PACKEDORDER_RGBA')
-register('PACKEDORDER_XBGR', 'SDL_PACKEDORDER_XBGR')
-register('PACKEDORDER_BGRX', 'SDL_PACKEDORDER_BGRX')
-register('PACKEDORDER_ABGR', 'SDL_PACKEDORDER_ABGR')
-register('PACKEDORDER_BGRA', 'SDL_PACKEDORDER_BGRA')
-register('ARRAYORDER_NONE', 'SDL_ARRAYORDER_NONE')
-register('ARRAYORDER_RGB', 'SDL_ARRAYORDER_RGB')
-register('ARRAYORDER_RGBA', 'SDL_ARRAYORDER_RGBA')
-register('ARRAYORDER_ARGB', 'SDL_ARRAYORDER_ARGB')
-register('ARRAYORDER_BGR', 'SDL_ARRAYORDER_BGR')
-register('ARRAYORDER_BGRA', 'SDL_ARRAYORDER_BGRA')
-register('ARRAYORDER_ABGR', 'SDL_ARRAYORDER_ABGR')
-register('PACKEDLAYOUT_NONE', 'SDL_PACKEDLAYOUT_NONE')
-register('PACKEDLAYOUT_332', 'SDL_PACKEDLAYOUT_332')
-register('PACKEDLAYOUT_4444', 'SDL_PACKEDLAYOUT_4444')
-register('PACKEDLAYOUT_1555', 'SDL_PACKEDLAYOUT_1555')
-register('PACKEDLAYOUT_5551', 'SDL_PACKEDLAYOUT_5551')
-register('PACKEDLAYOUT_565', 'SDL_PACKEDLAYOUT_565')
-register('PACKEDLAYOUT_8888', 'SDL_PACKEDLAYOUT_8888')
-register('PACKEDLAYOUT_2101010', 'SDL_PACKEDLAYOUT_2101010')
-register('PACKEDLAYOUT_1010102', 'SDL_PACKEDLAYOUT_1010102')
-register('PIXELFORMAT_UNKNOWN', 'SDL_PIXELFORMAT_UNKNOWN')
-register('PIXELFORMAT_INDEX1LSB', 'SDL_PIXELFORMAT_INDEX1LSB')
-register('PIXELTYPE_INDEX1', 'SDL_PIXELTYPE_INDEX1')
-register('BITMAPORDER_4321', 'SDL_BITMAPORDER_4321')
-register('PIXELFORMAT_INDEX1MSB', 'SDL_PIXELFORMAT_INDEX1MSB')
-register('PIXELTYPE_INDEX1', 'SDL_PIXELTYPE_INDEX1')
-register('BITMAPORDER_1234', 'SDL_BITMAPORDER_1234')
-register('PIXELFORMAT_INDEX4LSB', 'SDL_PIXELFORMAT_INDEX4LSB')
-register('PIXELTYPE_INDEX4', 'SDL_PIXELTYPE_INDEX4')
-register('BITMAPORDER_4321', 'SDL_BITMAPORDER_4321')
-register('PIXELFORMAT_INDEX4MSB', 'SDL_PIXELFORMAT_INDEX4MSB')
-register('PIXELTYPE_INDEX4', 'SDL_PIXELTYPE_INDEX4')
-register('BITMAPORDER_1234', 'SDL_BITMAPORDER_1234')
-register('PIXELFORMAT_INDEX8', 'SDL_PIXELFORMAT_INDEX8')
-register('PIXELTYPE_INDEX8', 'SDL_PIXELTYPE_INDEX8')
-register('PIXELFORMAT_RGB332', 'SDL_PIXELFORMAT_RGB332')
-register('PIXELTYPE_PACKED8', 'SDL_PIXELTYPE_PACKED8')
-register('PACKEDORDER_XRGB', 'SDL_PACKEDORDER_XRGB')
-register('PACKEDLAYOUT_332', 'SDL_PACKEDLAYOUT_332')
-register('PIXELFORMAT_RGB444', 'SDL_PIXELFORMAT_RGB444')
-register('PIXELTYPE_PACKED16', 'SDL_PIXELTYPE_PACKED16')
-register('PACKEDORDER_XRGB', 'SDL_PACKEDORDER_XRGB')
-register('PACKEDLAYOUT_4444', 'SDL_PACKEDLAYOUT_4444')
-register('PIXELFORMAT_RGB555', 'SDL_PIXELFORMAT_RGB555')
-register('PIXELTYPE_PACKED16', 'SDL_PIXELTYPE_PACKED16')
-register('PACKEDORDER_XRGB', 'SDL_PACKEDORDER_XRGB')
-register('PACKEDLAYOUT_1555', 'SDL_PACKEDLAYOUT_1555')
-register('PIXELFORMAT_BGR555', 'SDL_PIXELFORMAT_BGR555')
-register('PIXELTYPE_PACKED16', 'SDL_PIXELTYPE_PACKED16')
-register('PACKEDORDER_XBGR', 'SDL_PACKEDORDER_XBGR')
-register('PACKEDLAYOUT_1555', 'SDL_PACKEDLAYOUT_1555')
-register('PIXELFORMAT_ARGB4444', 'SDL_PIXELFORMAT_ARGB4444')
-register('PIXELTYPE_PACKED16', 'SDL_PIXELTYPE_PACKED16')
-register('PACKEDORDER_ARGB', 'SDL_PACKEDORDER_ARGB')
-register('PACKEDLAYOUT_4444', 'SDL_PACKEDLAYOUT_4444')
-register('PIXELFORMAT_RGBA4444', 'SDL_PIXELFORMAT_RGBA4444')
-register('PIXELTYPE_PACKED16', 'SDL_PIXELTYPE_PACKED16')
-register('PACKEDORDER_RGBA', 'SDL_PACKEDORDER_RGBA')
-register('PACKEDLAYOUT_4444', 'SDL_PACKEDLAYOUT_4444')
-register('PIXELFORMAT_ABGR4444', 'SDL_PIXELFORMAT_ABGR4444')
-register('PIXELTYPE_PACKED16', 'SDL_PIXELTYPE_PACKED16')
-register('PACKEDORDER_ABGR', 'SDL_PACKEDORDER_ABGR')
-register('PACKEDLAYOUT_4444', 'SDL_PACKEDLAYOUT_4444')
-register('PIXELFORMAT_BGRA4444', 'SDL_PIXELFORMAT_BGRA4444')
-register('PIXELTYPE_PACKED16', 'SDL_PIXELTYPE_PACKED16')
-register('PACKEDORDER_BGRA', 'SDL_PACKEDORDER_BGRA')
-register('PACKEDLAYOUT_4444', 'SDL_PACKEDLAYOUT_4444')
-register('PIXELFORMAT_ARGB1555', 'SDL_PIXELFORMAT_ARGB1555')
-register('PIXELTYPE_PACKED16', 'SDL_PIXELTYPE_PACKED16')
-register('PACKEDORDER_ARGB', 'SDL_PACKEDORDER_ARGB')
-register('PACKEDLAYOUT_1555', 'SDL_PACKEDLAYOUT_1555')
-register('PIXELFORMAT_RGBA5551', 'SDL_PIXELFORMAT_RGBA5551')
-register('PIXELTYPE_PACKED16', 'SDL_PIXELTYPE_PACKED16')
-register('PACKEDORDER_RGBA', 'SDL_PACKEDORDER_RGBA')
-register('PACKEDLAYOUT_5551', 'SDL_PACKEDLAYOUT_5551')
-register('PIXELFORMAT_ABGR1555', 'SDL_PIXELFORMAT_ABGR1555')
-register('PIXELTYPE_PACKED16', 'SDL_PIXELTYPE_PACKED16')
-register('PACKEDORDER_ABGR', 'SDL_PACKEDORDER_ABGR')
-register('PACKEDLAYOUT_1555', 'SDL_PACKEDLAYOUT_1555')
-register('PIXELFORMAT_BGRA5551', 'SDL_PIXELFORMAT_BGRA5551')
-register('PIXELTYPE_PACKED16', 'SDL_PIXELTYPE_PACKED16')
-register('PACKEDORDER_BGRA', 'SDL_PACKEDORDER_BGRA')
-register('PACKEDLAYOUT_5551', 'SDL_PACKEDLAYOUT_5551')
-register('PIXELFORMAT_RGB565', 'SDL_PIXELFORMAT_RGB565')
-register('PIXELTYPE_PACKED16', 'SDL_PIXELTYPE_PACKED16')
-register('PACKEDORDER_XRGB', 'SDL_PACKEDORDER_XRGB')
-register('PACKEDLAYOUT_565', 'SDL_PACKEDLAYOUT_565')
-register('PIXELFORMAT_BGR565', 'SDL_PIXELFORMAT_BGR565')
-register('PIXELTYPE_PACKED16', 'SDL_PIXELTYPE_PACKED16')
-register('PACKEDORDER_XBGR', 'SDL_PACKEDORDER_XBGR')
-register('PACKEDLAYOUT_565', 'SDL_PACKEDLAYOUT_565')
-register('PIXELFORMAT_RGB24', 'SDL_PIXELFORMAT_RGB24')
-register('PIXELTYPE_ARRAYU8', 'SDL_PIXELTYPE_ARRAYU8')
-register('ARRAYORDER_RGB', 'SDL_ARRAYORDER_RGB')
-register('PIXELFORMAT_BGR24', 'SDL_PIXELFORMAT_BGR24')
-register('PIXELTYPE_ARRAYU8', 'SDL_PIXELTYPE_ARRAYU8')
-register('ARRAYORDER_BGR', 'SDL_ARRAYORDER_BGR')
-register('PIXELFORMAT_RGB888', 'SDL_PIXELFORMAT_RGB888')
-register('PIXELTYPE_PACKED32', 'SDL_PIXELTYPE_PACKED32')
-register('PACKEDORDER_XRGB', 'SDL_PACKEDORDER_XRGB')
-register('PACKEDLAYOUT_8888', 'SDL_PACKEDLAYOUT_8888')
-register('PIXELFORMAT_RGBX8888', 'SDL_PIXELFORMAT_RGBX8888')
-register('PIXELTYPE_PACKED32', 'SDL_PIXELTYPE_PACKED32')
-register('PACKEDORDER_RGBX', 'SDL_PACKEDORDER_RGBX')
-register('PACKEDLAYOUT_8888', 'SDL_PACKEDLAYOUT_8888')
-register('PIXELFORMAT_BGR888', 'SDL_PIXELFORMAT_BGR888')
-register('PIXELTYPE_PACKED32', 'SDL_PIXELTYPE_PACKED32')
-register('PACKEDORDER_XBGR', 'SDL_PACKEDORDER_XBGR')
-register('PACKEDLAYOUT_8888', 'SDL_PACKEDLAYOUT_8888')
-register('PIXELFORMAT_BGRX8888', 'SDL_PIXELFORMAT_BGRX8888')
-register('PIXELTYPE_PACKED32', 'SDL_PIXELTYPE_PACKED32')
-register('PACKEDORDER_BGRX', 'SDL_PACKEDORDER_BGRX')
-register('PACKEDLAYOUT_8888', 'SDL_PACKEDLAYOUT_8888')
-register('PIXELFORMAT_ARGB8888', 'SDL_PIXELFORMAT_ARGB8888')
-register('PIXELTYPE_PACKED32', 'SDL_PIXELTYPE_PACKED32')
-register('PACKEDORDER_ARGB', 'SDL_PACKEDORDER_ARGB')
-register('PACKEDLAYOUT_8888', 'SDL_PACKEDLAYOUT_8888')
-register('PIXELFORMAT_RGBA8888', 'SDL_PIXELFORMAT_RGBA8888')
-register('PIXELTYPE_PACKED32', 'SDL_PIXELTYPE_PACKED32')
-register('PACKEDORDER_RGBA', 'SDL_PACKEDORDER_RGBA')
-register('PACKEDLAYOUT_8888', 'SDL_PACKEDLAYOUT_8888')
-register('PIXELFORMAT_ABGR8888', 'SDL_PIXELFORMAT_ABGR8888')
-register('PIXELTYPE_PACKED32', 'SDL_PIXELTYPE_PACKED32')
-register('PACKEDORDER_ABGR', 'SDL_PACKEDORDER_ABGR')
-register('PACKEDLAYOUT_8888', 'SDL_PACKEDLAYOUT_8888')
-register('PIXELFORMAT_BGRA8888', 'SDL_PIXELFORMAT_BGRA8888')
-register('PIXELTYPE_PACKED32', 'SDL_PIXELTYPE_PACKED32')
-register('PACKEDORDER_BGRA', 'SDL_PACKEDORDER_BGRA')
-register('PACKEDLAYOUT_8888', 'SDL_PACKEDLAYOUT_8888')
-register('PIXELFORMAT_ARGB2101010', 'SDL_PIXELFORMAT_ARGB2101010')
-register('PIXELTYPE_PACKED32', 'SDL_PIXELTYPE_PACKED32')
-register('PACKEDORDER_ARGB', 'SDL_PACKEDORDER_ARGB')
-register('PACKEDLAYOUT_2101010', 'SDL_PACKEDLAYOUT_2101010')
-register('PIXELFORMAT_YV12', 'SDL_PIXELFORMAT_YV12')
-register('PIXELFORMAT_IYUV', 'SDL_PIXELFORMAT_IYUV')
-register('PIXELFORMAT_YUY2', 'SDL_PIXELFORMAT_YUY2')
-register('PIXELFORMAT_UYVY', 'SDL_PIXELFORMAT_UYVY')
-register('PIXELFORMAT_YVYU', 'SDL_PIXELFORMAT_YVYU')
-register('BLENDMODE_NONE', 'SDL_BLENDMODE_NONE')
-register('BLENDMODE_BLEND', 'SDL_BLENDMODE_BLEND')
-register('BLENDMODE_ADD', 'SDL_BLENDMODE_ADD')
-register('BLENDMODE_MOD', 'SDL_BLENDMODE_MOD')
-register('WINDOW_FULLSCREEN', 'SDL_WINDOW_FULLSCREEN')
-register('WINDOW_OPENGL', 'SDL_WINDOW_OPENGL')
-register('WINDOW_SHOWN', 'SDL_WINDOW_SHOWN')
-register('WINDOW_HIDDEN', 'SDL_WINDOW_HIDDEN')
-register('WINDOW_BORDERLESS', 'SDL_WINDOW_BORDERLESS')
-register('WINDOW_RESIZABLE', 'SDL_WINDOW_RESIZABLE')
-register('WINDOW_MINIMIZED', 'SDL_WINDOW_MINIMIZED')
-register('WINDOW_MAXIMIZED', 'SDL_WINDOW_MAXIMIZED')
-register('WINDOW_INPUT_GRABBED', 'SDL_WINDOW_INPUT_GRABBED')
-register('WINDOW_INPUT_FOCUS', 'SDL_WINDOW_INPUT_FOCUS')
-register('WINDOW_MOUSE_FOCUS', 'SDL_WINDOW_MOUSE_FOCUS')
-register('WINDOW_FULLSCREEN_DESKTOP', 'SDL_WINDOW_FULLSCREEN_DESKTOP')
-register('WINDOW_FULLSCREEN', 'SDL_WINDOW_FULLSCREEN')
-register('WINDOW_FOREIGN', 'SDL_WINDOW_FOREIGN')
-register('WINDOWEVENT_NONE', 'SDL_WINDOWEVENT_NONE')
-register('WINDOWEVENT_SHOWN', 'SDL_WINDOWEVENT_SHOWN')
-register('WINDOWEVENT_HIDDEN', 'SDL_WINDOWEVENT_HIDDEN')
-register('WINDOWEVENT_EXPOSED', 'SDL_WINDOWEVENT_EXPOSED')
-register('WINDOWEVENT_MOVED', 'SDL_WINDOWEVENT_MOVED')
-register('WINDOWEVENT_RESIZED', 'SDL_WINDOWEVENT_RESIZED')
-register('WINDOWEVENT_SIZE_CHANGED', 'SDL_WINDOWEVENT_SIZE_CHANGED')
-register('WINDOWEVENT_MINIMIZED', 'SDL_WINDOWEVENT_MINIMIZED')
-register('WINDOWEVENT_MAXIMIZED', 'SDL_WINDOWEVENT_MAXIMIZED')
-register('WINDOWEVENT_RESTORED', 'SDL_WINDOWEVENT_RESTORED')
-register('WINDOWEVENT_ENTER', 'SDL_WINDOWEVENT_ENTER')
-register('WINDOWEVENT_LEAVE', 'SDL_WINDOWEVENT_LEAVE')
-register('WINDOWEVENT_FOCUS_GAINED', 'SDL_WINDOWEVENT_FOCUS_GAINED')
-register('WINDOWEVENT_FOCUS_LOST', 'SDL_WINDOWEVENT_FOCUS_LOST')
-register('WINDOWEVENT_CLOSE', 'SDL_WINDOWEVENT_CLOSE')
-register('GL_RED_SIZE', 'SDL_GL_RED_SIZE')
-register('GL_GREEN_SIZE', 'SDL_GL_GREEN_SIZE')
-register('GL_BLUE_SIZE', 'SDL_GL_BLUE_SIZE')
-register('GL_ALPHA_SIZE', 'SDL_GL_ALPHA_SIZE')
-register('GL_BUFFER_SIZE', 'SDL_GL_BUFFER_SIZE')
-register('GL_DOUBLEBUFFER', 'SDL_GL_DOUBLEBUFFER')
-register('GL_DEPTH_SIZE', 'SDL_GL_DEPTH_SIZE')
-register('GL_STENCIL_SIZE', 'SDL_GL_STENCIL_SIZE')
-register('GL_ACCUM_RED_SIZE', 'SDL_GL_ACCUM_RED_SIZE')
-register('GL_ACCUM_GREEN_SIZE', 'SDL_GL_ACCUM_GREEN_SIZE')
-register('GL_ACCUM_BLUE_SIZE', 'SDL_GL_ACCUM_BLUE_SIZE')
-register('GL_ACCUM_ALPHA_SIZE', 'SDL_GL_ACCUM_ALPHA_SIZE')
-register('GL_STEREO', 'SDL_GL_STEREO')
-register('GL_MULTISAMPLEBUFFERS', 'SDL_GL_MULTISAMPLEBUFFERS')
-register('GL_MULTISAMPLESAMPLES', 'SDL_GL_MULTISAMPLESAMPLES')
-register('GL_ACCELERATED_VISUAL', 'SDL_GL_ACCELERATED_VISUAL')
-register('GL_RETAINED_BACKING', 'SDL_GL_RETAINED_BACKING')
-register('GL_CONTEXT_MAJOR_VERSION', 'SDL_GL_CONTEXT_MAJOR_VERSION')
-register('GL_CONTEXT_MINOR_VERSION', 'SDL_GL_CONTEXT_MINOR_VERSION')
-register('GL_CONTEXT_EGL', 'SDL_GL_CONTEXT_EGL')
-register('GL_CONTEXT_FLAGS', 'SDL_GL_CONTEXT_FLAGS')
-register('GL_CONTEXT_PROFILE_MASK', 'SDL_GL_CONTEXT_PROFILE_MASK')
-register('GL_SHARE_WITH_CURRENT_CONTEXT', 'SDL_GL_SHARE_WITH_CURRENT_CONTEXT')
-register('GL_CONTEXT_PROFILE_CORE', 'SDL_GL_CONTEXT_PROFILE_CORE')
-register('GL_CONTEXT_PROFILE_COMPATIBILITY', 'SDL_GL_CONTEXT_PROFILE_COMPATIBILITY')
-register('GL_CONTEXT_PROFILE_ES', 'SDL_GL_CONTEXT_PROFILE_ES')
-register('GL_CONTEXT_DEBUG_FLAG', 'SDL_GL_CONTEXT_DEBUG_FLAG')
-register('GL_CONTEXT_FORWARD_COMPATIBLE_FLAG', 'SDL_GL_CONTEXT_FORWARD_COMPATIBLE_FLAG')
-register('GL_CONTEXT_ROBUST_ACCESS_FLAG', 'SDL_GL_CONTEXT_ROBUST_ACCESS_FLAG')
-register('GL_CONTEXT_RESET_ISOLATION_FLAG', 'SDL_GL_CONTEXT_RESET_ISOLATION_FLAG')
-register('SCANCODE_UNKNOWN', 'SDL_SCANCODE_UNKNOWN')
-register('SCANCODE_A', 'SDL_SCANCODE_A')
-register('SCANCODE_B', 'SDL_SCANCODE_B')
-register('SCANCODE_C', 'SDL_SCANCODE_C')
-register('SCANCODE_D', 'SDL_SCANCODE_D')
-register('SCANCODE_E', 'SDL_SCANCODE_E')
-register('SCANCODE_F', 'SDL_SCANCODE_F')
-register('SCANCODE_G', 'SDL_SCANCODE_G')
-register('SCANCODE_H', 'SDL_SCANCODE_H')
-register('SCANCODE_I', 'SDL_SCANCODE_I')
-register('SCANCODE_J', 'SDL_SCANCODE_J')
-register('SCANCODE_K', 'SDL_SCANCODE_K')
-register('SCANCODE_L', 'SDL_SCANCODE_L')
-register('SCANCODE_M', 'SDL_SCANCODE_M')
-register('SCANCODE_N', 'SDL_SCANCODE_N')
-register('SCANCODE_O', 'SDL_SCANCODE_O')
-register('SCANCODE_P', 'SDL_SCANCODE_P')
-register('SCANCODE_Q', 'SDL_SCANCODE_Q')
-register('SCANCODE_R', 'SDL_SCANCODE_R')
-register('SCANCODE_S', 'SDL_SCANCODE_S')
-register('SCANCODE_T', 'SDL_SCANCODE_T')
-register('SCANCODE_U', 'SDL_SCANCODE_U')
-register('SCANCODE_V', 'SDL_SCANCODE_V')
-register('SCANCODE_W', 'SDL_SCANCODE_W')
-register('SCANCODE_X', 'SDL_SCANCODE_X')
-register('SCANCODE_Y', 'SDL_SCANCODE_Y')
-register('SCANCODE_Z', 'SDL_SCANCODE_Z')
-register('SCANCODE_1', 'SDL_SCANCODE_1')
-register('SCANCODE_2', 'SDL_SCANCODE_2')
-register('SCANCODE_3', 'SDL_SCANCODE_3')
-register('SCANCODE_4', 'SDL_SCANCODE_4')
-register('SCANCODE_5', 'SDL_SCANCODE_5')
-register('SCANCODE_6', 'SDL_SCANCODE_6')
-register('SCANCODE_7', 'SDL_SCANCODE_7')
-register('SCANCODE_8', 'SDL_SCANCODE_8')
-register('SCANCODE_9', 'SDL_SCANCODE_9')
-register('SCANCODE_0', 'SDL_SCANCODE_0')
-register('SCANCODE_RETURN', 'SDL_SCANCODE_RETURN')
-register('SCANCODE_ESCAPE', 'SDL_SCANCODE_ESCAPE')
-register('SCANCODE_BACKSPACE', 'SDL_SCANCODE_BACKSPACE')
-register('SCANCODE_TAB', 'SDL_SCANCODE_TAB')
-register('SCANCODE_SPACE', 'SDL_SCANCODE_SPACE')
-register('SCANCODE_MINUS', 'SDL_SCANCODE_MINUS')
-register('SCANCODE_EQUALS', 'SDL_SCANCODE_EQUALS')
-register('SCANCODE_LEFTBRACKET', 'SDL_SCANCODE_LEFTBRACKET')
-register('SCANCODE_RIGHTBRACKET', 'SDL_SCANCODE_RIGHTBRACKET')
-register('SCANCODE_BACKSLASH', 'SDL_SCANCODE_BACKSLASH')
-register('SCANCODE_NONUSHASH', 'SDL_SCANCODE_NONUSHASH')
-register('SCANCODE_SEMICOLON', 'SDL_SCANCODE_SEMICOLON')
-register('SCANCODE_APOSTROPHE', 'SDL_SCANCODE_APOSTROPHE')
-register('SCANCODE_GRAVE', 'SDL_SCANCODE_GRAVE')
-register('SCANCODE_COMMA', 'SDL_SCANCODE_COMMA')
-register('SCANCODE_PERIOD', 'SDL_SCANCODE_PERIOD')
-register('SCANCODE_SLASH', 'SDL_SCANCODE_SLASH')
-register('SCANCODE_CAPSLOCK', 'SDL_SCANCODE_CAPSLOCK')
-register('SCANCODE_F1', 'SDL_SCANCODE_F1')
-register('SCANCODE_F2', 'SDL_SCANCODE_F2')
-register('SCANCODE_F3', 'SDL_SCANCODE_F3')
-register('SCANCODE_F4', 'SDL_SCANCODE_F4')
-register('SCANCODE_F5', 'SDL_SCANCODE_F5')
-register('SCANCODE_F6', 'SDL_SCANCODE_F6')
-register('SCANCODE_F7', 'SDL_SCANCODE_F7')
-register('SCANCODE_F8', 'SDL_SCANCODE_F8')
-register('SCANCODE_F9', 'SDL_SCANCODE_F9')
-register('SCANCODE_F10', 'SDL_SCANCODE_F10')
-register('SCANCODE_F11', 'SDL_SCANCODE_F11')
-register('SCANCODE_F12', 'SDL_SCANCODE_F12')
-register('SCANCODE_PRINTSCREEN', 'SDL_SCANCODE_PRINTSCREEN')
-register('SCANCODE_SCROLLLOCK', 'SDL_SCANCODE_SCROLLLOCK')
-register('SCANCODE_PAUSE', 'SDL_SCANCODE_PAUSE')
-register('SCANCODE_INSERT', 'SDL_SCANCODE_INSERT')
-register('SCANCODE_HOME', 'SDL_SCANCODE_HOME')
-register('SCANCODE_PAGEUP', 'SDL_SCANCODE_PAGEUP')
-register('SCANCODE_DELETE', 'SDL_SCANCODE_DELETE')
-register('SCANCODE_END', 'SDL_SCANCODE_END')
-register('SCANCODE_PAGEDOWN', 'SDL_SCANCODE_PAGEDOWN')
-register('SCANCODE_RIGHT', 'SDL_SCANCODE_RIGHT')
-register('SCANCODE_LEFT', 'SDL_SCANCODE_LEFT')
-register('SCANCODE_DOWN', 'SDL_SCANCODE_DOWN')
-register('SCANCODE_UP', 'SDL_SCANCODE_UP')
-register('SCANCODE_NUMLOCKCLEAR', 'SDL_SCANCODE_NUMLOCKCLEAR')
-register('SCANCODE_KP_DIVIDE', 'SDL_SCANCODE_KP_DIVIDE')
-register('SCANCODE_KP_MULTIPLY', 'SDL_SCANCODE_KP_MULTIPLY')
-register('SCANCODE_KP_MINUS', 'SDL_SCANCODE_KP_MINUS')
-register('SCANCODE_KP_PLUS', 'SDL_SCANCODE_KP_PLUS')
-register('SCANCODE_KP_ENTER', 'SDL_SCANCODE_KP_ENTER')
-register('SCANCODE_KP_1', 'SDL_SCANCODE_KP_1')
-register('SCANCODE_KP_2', 'SDL_SCANCODE_KP_2')
-register('SCANCODE_KP_3', 'SDL_SCANCODE_KP_3')
-register('SCANCODE_KP_4', 'SDL_SCANCODE_KP_4')
-register('SCANCODE_KP_5', 'SDL_SCANCODE_KP_5')
-register('SCANCODE_KP_6', 'SDL_SCANCODE_KP_6')
-register('SCANCODE_KP_7', 'SDL_SCANCODE_KP_7')
-register('SCANCODE_KP_8', 'SDL_SCANCODE_KP_8')
-register('SCANCODE_KP_9', 'SDL_SCANCODE_KP_9')
-register('SCANCODE_KP_0', 'SDL_SCANCODE_KP_0')
-register('SCANCODE_KP_PERIOD', 'SDL_SCANCODE_KP_PERIOD')
-register('SCANCODE_NONUSBACKSLASH', 'SDL_SCANCODE_NONUSBACKSLASH')
-register('SCANCODE_APPLICATION', 'SDL_SCANCODE_APPLICATION')
-register('SCANCODE_POWER', 'SDL_SCANCODE_POWER')
-register('SCANCODE_KP_EQUALS', 'SDL_SCANCODE_KP_EQUALS')
-register('SCANCODE_F13', 'SDL_SCANCODE_F13')
-register('SCANCODE_F14', 'SDL_SCANCODE_F14')
-register('SCANCODE_F15', 'SDL_SCANCODE_F15')
-register('SCANCODE_F16', 'SDL_SCANCODE_F16')
-register('SCANCODE_F17', 'SDL_SCANCODE_F17')
-register('SCANCODE_F18', 'SDL_SCANCODE_F18')
-register('SCANCODE_F19', 'SDL_SCANCODE_F19')
-register('SCANCODE_F20', 'SDL_SCANCODE_F20')
-register('SCANCODE_F21', 'SDL_SCANCODE_F21')
-register('SCANCODE_F22', 'SDL_SCANCODE_F22')
-register('SCANCODE_F23', 'SDL_SCANCODE_F23')
-register('SCANCODE_F24', 'SDL_SCANCODE_F24')
-register('SCANCODE_EXECUTE', 'SDL_SCANCODE_EXECUTE')
-register('SCANCODE_HELP', 'SDL_SCANCODE_HELP')
-register('SCANCODE_MENU', 'SDL_SCANCODE_MENU')
-register('SCANCODE_SELECT', 'SDL_SCANCODE_SELECT')
-register('SCANCODE_STOP', 'SDL_SCANCODE_STOP')
-register('SCANCODE_AGAIN', 'SDL_SCANCODE_AGAIN')
-register('SCANCODE_UNDO', 'SDL_SCANCODE_UNDO')
-register('SCANCODE_CUT', 'SDL_SCANCODE_CUT')
-register('SCANCODE_COPY', 'SDL_SCANCODE_COPY')
-register('SCANCODE_PASTE', 'SDL_SCANCODE_PASTE')
-register('SCANCODE_FIND', 'SDL_SCANCODE_FIND')
-register('SCANCODE_MUTE', 'SDL_SCANCODE_MUTE')
-register('SCANCODE_VOLUMEUP', 'SDL_SCANCODE_VOLUMEUP')
-register('SCANCODE_VOLUMEDOWN', 'SDL_SCANCODE_VOLUMEDOWN')
-register('SCANCODE_KP_COMMA', 'SDL_SCANCODE_KP_COMMA')
-register('SCANCODE_KP_EQUALSAS400', 'SDL_SCANCODE_KP_EQUALSAS400')
-register('SCANCODE_INTERNATIONAL1', 'SDL_SCANCODE_INTERNATIONAL1')
-register('SCANCODE_INTERNATIONAL2', 'SDL_SCANCODE_INTERNATIONAL2')
-register('SCANCODE_INTERNATIONAL3', 'SDL_SCANCODE_INTERNATIONAL3')
-register('SCANCODE_INTERNATIONAL4', 'SDL_SCANCODE_INTERNATIONAL4')
-register('SCANCODE_INTERNATIONAL5', 'SDL_SCANCODE_INTERNATIONAL5')
-register('SCANCODE_INTERNATIONAL6', 'SDL_SCANCODE_INTERNATIONAL6')
-register('SCANCODE_INTERNATIONAL7', 'SDL_SCANCODE_INTERNATIONAL7')
-register('SCANCODE_INTERNATIONAL8', 'SDL_SCANCODE_INTERNATIONAL8')
-register('SCANCODE_INTERNATIONAL9', 'SDL_SCANCODE_INTERNATIONAL9')
-register('SCANCODE_LANG1', 'SDL_SCANCODE_LANG1')
-register('SCANCODE_LANG2', 'SDL_SCANCODE_LANG2')
-register('SCANCODE_LANG3', 'SDL_SCANCODE_LANG3')
-register('SCANCODE_LANG4', 'SDL_SCANCODE_LANG4')
-register('SCANCODE_LANG5', 'SDL_SCANCODE_LANG5')
-register('SCANCODE_LANG6', 'SDL_SCANCODE_LANG6')
-register('SCANCODE_LANG7', 'SDL_SCANCODE_LANG7')
-register('SCANCODE_LANG8', 'SDL_SCANCODE_LANG8')
-register('SCANCODE_LANG9', 'SDL_SCANCODE_LANG9')
-register('SCANCODE_ALTERASE', 'SDL_SCANCODE_ALTERASE')
-register('SCANCODE_SYSREQ', 'SDL_SCANCODE_SYSREQ')
-register('SCANCODE_CANCEL', 'SDL_SCANCODE_CANCEL')
-register('SCANCODE_CLEAR', 'SDL_SCANCODE_CLEAR')
-register('SCANCODE_PRIOR', 'SDL_SCANCODE_PRIOR')
-register('SCANCODE_RETURN2', 'SDL_SCANCODE_RETURN2')
-register('SCANCODE_SEPARATOR', 'SDL_SCANCODE_SEPARATOR')
-register('SCANCODE_OUT', 'SDL_SCANCODE_OUT')
-register('SCANCODE_OPER', 'SDL_SCANCODE_OPER')
-register('SCANCODE_CLEARAGAIN', 'SDL_SCANCODE_CLEARAGAIN')
-register('SCANCODE_CRSEL', 'SDL_SCANCODE_CRSEL')
-register('SCANCODE_EXSEL', 'SDL_SCANCODE_EXSEL')
-register('SCANCODE_KP_00', 'SDL_SCANCODE_KP_00')
-register('SCANCODE_KP_000', 'SDL_SCANCODE_KP_000')
-register('SCANCODE_THOUSANDSSEPARATOR', 'SDL_SCANCODE_THOUSANDSSEPARATOR')
-register('SCANCODE_DECIMALSEPARATOR', 'SDL_SCANCODE_DECIMALSEPARATOR')
-register('SCANCODE_CURRENCYUNIT', 'SDL_SCANCODE_CURRENCYUNIT')
-register('SCANCODE_CURRENCYSUBUNIT', 'SDL_SCANCODE_CURRENCYSUBUNIT')
-register('SCANCODE_KP_LEFTPAREN', 'SDL_SCANCODE_KP_LEFTPAREN')
-register('SCANCODE_KP_RIGHTPAREN', 'SDL_SCANCODE_KP_RIGHTPAREN')
-register('SCANCODE_KP_LEFTBRACE', 'SDL_SCANCODE_KP_LEFTBRACE')
-register('SCANCODE_KP_RIGHTBRACE', 'SDL_SCANCODE_KP_RIGHTBRACE')
-register('SCANCODE_KP_TAB', 'SDL_SCANCODE_KP_TAB')
-register('SCANCODE_KP_BACKSPACE', 'SDL_SCANCODE_KP_BACKSPACE')
-register('SCANCODE_KP_A', 'SDL_SCANCODE_KP_A')
-register('SCANCODE_KP_B', 'SDL_SCANCODE_KP_B')
-register('SCANCODE_KP_C', 'SDL_SCANCODE_KP_C')
-register('SCANCODE_KP_D', 'SDL_SCANCODE_KP_D')
-register('SCANCODE_KP_E', 'SDL_SCANCODE_KP_E')
-register('SCANCODE_KP_F', 'SDL_SCANCODE_KP_F')
-register('SCANCODE_KP_XOR', 'SDL_SCANCODE_KP_XOR')
-register('SCANCODE_KP_POWER', 'SDL_SCANCODE_KP_POWER')
-register('SCANCODE_KP_PERCENT', 'SDL_SCANCODE_KP_PERCENT')
-register('SCANCODE_KP_LESS', 'SDL_SCANCODE_KP_LESS')
-register('SCANCODE_KP_GREATER', 'SDL_SCANCODE_KP_GREATER')
-register('SCANCODE_KP_AMPERSAND', 'SDL_SCANCODE_KP_AMPERSAND')
-register('SCANCODE_KP_DBLAMPERSAND', 'SDL_SCANCODE_KP_DBLAMPERSAND')
-register('SCANCODE_KP_VERTICALBAR', 'SDL_SCANCODE_KP_VERTICALBAR')
-register('SCANCODE_KP_DBLVERTICALBAR', 'SDL_SCANCODE_KP_DBLVERTICALBAR')
-register('SCANCODE_KP_COLON', 'SDL_SCANCODE_KP_COLON')
-register('SCANCODE_KP_HASH', 'SDL_SCANCODE_KP_HASH')
-register('SCANCODE_KP_SPACE', 'SDL_SCANCODE_KP_SPACE')
-register('SCANCODE_KP_AT', 'SDL_SCANCODE_KP_AT')
-register('SCANCODE_KP_EXCLAM', 'SDL_SCANCODE_KP_EXCLAM')
-register('SCANCODE_KP_MEMSTORE', 'SDL_SCANCODE_KP_MEMSTORE')
-register('SCANCODE_KP_MEMRECALL', 'SDL_SCANCODE_KP_MEMRECALL')
-register('SCANCODE_KP_MEMCLEAR', 'SDL_SCANCODE_KP_MEMCLEAR')
-register('SCANCODE_KP_MEMADD', 'SDL_SCANCODE_KP_MEMADD')
-register('SCANCODE_KP_MEMSUBTRACT', 'SDL_SCANCODE_KP_MEMSUBTRACT')
-register('SCANCODE_KP_MEMMULTIPLY', 'SDL_SCANCODE_KP_MEMMULTIPLY')
-register('SCANCODE_KP_MEMDIVIDE', 'SDL_SCANCODE_KP_MEMDIVIDE')
-register('SCANCODE_KP_PLUSMINUS', 'SDL_SCANCODE_KP_PLUSMINUS')
-register('SCANCODE_KP_CLEAR', 'SDL_SCANCODE_KP_CLEAR')
-register('SCANCODE_KP_CLEARENTRY', 'SDL_SCANCODE_KP_CLEARENTRY')
-register('SCANCODE_KP_BINARY', 'SDL_SCANCODE_KP_BINARY')
-register('SCANCODE_KP_OCTAL', 'SDL_SCANCODE_KP_OCTAL')
-register('SCANCODE_KP_DECIMAL', 'SDL_SCANCODE_KP_DECIMAL')
-register('SCANCODE_KP_HEXADECIMAL', 'SDL_SCANCODE_KP_HEXADECIMAL')
-register('SCANCODE_LCTRL', 'SDL_SCANCODE_LCTRL')
-register('SCANCODE_LSHIFT', 'SDL_SCANCODE_LSHIFT')
-register('SCANCODE_LALT', 'SDL_SCANCODE_LALT')
-register('SCANCODE_LGUI', 'SDL_SCANCODE_LGUI')
-register('SCANCODE_RCTRL', 'SDL_SCANCODE_RCTRL')
-register('SCANCODE_RSHIFT', 'SDL_SCANCODE_RSHIFT')
-register('SCANCODE_RALT', 'SDL_SCANCODE_RALT')
-register('SCANCODE_RGUI', 'SDL_SCANCODE_RGUI')
-register('SCANCODE_MODE', 'SDL_SCANCODE_MODE')
-register('SCANCODE_AUDIONEXT', 'SDL_SCANCODE_AUDIONEXT')
-register('SCANCODE_AUDIOPREV', 'SDL_SCANCODE_AUDIOPREV')
-register('SCANCODE_AUDIOSTOP', 'SDL_SCANCODE_AUDIOSTOP')
-register('SCANCODE_AUDIOPLAY', 'SDL_SCANCODE_AUDIOPLAY')
-register('SCANCODE_AUDIOMUTE', 'SDL_SCANCODE_AUDIOMUTE')
-register('SCANCODE_MEDIASELECT', 'SDL_SCANCODE_MEDIASELECT')
-register('SCANCODE_WWW', 'SDL_SCANCODE_WWW')
-register('SCANCODE_MAIL', 'SDL_SCANCODE_MAIL')
-register('SCANCODE_CALCULATOR', 'SDL_SCANCODE_CALCULATOR')
-register('SCANCODE_COMPUTER', 'SDL_SCANCODE_COMPUTER')
-register('SCANCODE_AC_SEARCH', 'SDL_SCANCODE_AC_SEARCH')
-register('SCANCODE_AC_HOME', 'SDL_SCANCODE_AC_HOME')
-register('SCANCODE_AC_BACK', 'SDL_SCANCODE_AC_BACK')
-register('SCANCODE_AC_FORWARD', 'SDL_SCANCODE_AC_FORWARD')
-register('SCANCODE_AC_STOP', 'SDL_SCANCODE_AC_STOP')
-register('SCANCODE_AC_REFRESH', 'SDL_SCANCODE_AC_REFRESH')
-register('SCANCODE_AC_BOOKMARKS', 'SDL_SCANCODE_AC_BOOKMARKS')
-register('SCANCODE_BRIGHTNESSDOWN', 'SDL_SCANCODE_BRIGHTNESSDOWN')
-register('SCANCODE_BRIGHTNESSUP', 'SDL_SCANCODE_BRIGHTNESSUP')
-register('SCANCODE_DISPLAYSWITCH', 'SDL_SCANCODE_DISPLAYSWITCH')
-register('SCANCODE_KBDILLUMTOGGLE', 'SDL_SCANCODE_KBDILLUMTOGGLE')
-register('SCANCODE_KBDILLUMDOWN', 'SDL_SCANCODE_KBDILLUMDOWN')
-register('SCANCODE_KBDILLUMUP', 'SDL_SCANCODE_KBDILLUMUP')
-register('SCANCODE_EJECT', 'SDL_SCANCODE_EJECT')
-register('SCANCODE_SLEEP', 'SDL_SCANCODE_SLEEP')
-register('SCANCODE_APP1', 'SDL_SCANCODE_APP1')
-register('SCANCODE_APP2', 'SDL_SCANCODE_APP2')
-register('NUM_SCANCODES', 'SDL_NUM_SCANCODES')
-register('SCANCODE_CAPSLOCK', 'SDL_SCANCODE_CAPSLOCK')
-register('SCANCODE_F1', 'SDL_SCANCODE_F1')
-register('SCANCODE_F2', 'SDL_SCANCODE_F2')
-register('SCANCODE_F3', 'SDL_SCANCODE_F3')
-register('SCANCODE_F4', 'SDL_SCANCODE_F4')
-register('SCANCODE_F5', 'SDL_SCANCODE_F5')
-register('SCANCODE_F6', 'SDL_SCANCODE_F6')
-register('SCANCODE_F7', 'SDL_SCANCODE_F7')
-register('SCANCODE_F8', 'SDL_SCANCODE_F8')
-register('SCANCODE_F9', 'SDL_SCANCODE_F9')
-register('SCANCODE_F10', 'SDL_SCANCODE_F10')
-register('SCANCODE_F11', 'SDL_SCANCODE_F11')
-register('SCANCODE_F12', 'SDL_SCANCODE_F12')
-register('SCANCODE_PRINTSCREEN', 'SDL_SCANCODE_PRINTSCREEN')
-register('SCANCODE_SCROLLLOCK', 'SDL_SCANCODE_SCROLLLOCK')
-register('SCANCODE_PAUSE', 'SDL_SCANCODE_PAUSE')
-register('SCANCODE_INSERT', 'SDL_SCANCODE_INSERT')
-register('SCANCODE_HOME', 'SDL_SCANCODE_HOME')
-register('SCANCODE_PAGEUP', 'SDL_SCANCODE_PAGEUP')
-register('SCANCODE_END', 'SDL_SCANCODE_END')
-register('SCANCODE_PAGEDOWN', 'SDL_SCANCODE_PAGEDOWN')
-register('SCANCODE_RIGHT', 'SDL_SCANCODE_RIGHT')
-register('SCANCODE_LEFT', 'SDL_SCANCODE_LEFT')
-register('SCANCODE_DOWN', 'SDL_SCANCODE_DOWN')
-register('SCANCODE_UP', 'SDL_SCANCODE_UP')
-register('SCANCODE_NUMLOCKCLEAR', 'SDL_SCANCODE_NUMLOCKCLEAR')
-register('SCANCODE_KP_DIVIDE', 'SDL_SCANCODE_KP_DIVIDE')
-register('SCANCODE_KP_MULTIPLY', 'SDL_SCANCODE_KP_MULTIPLY')
-register('SCANCODE_KP_MINUS', 'SDL_SCANCODE_KP_MINUS')
-register('SCANCODE_KP_PLUS', 'SDL_SCANCODE_KP_PLUS')
-register('SCANCODE_KP_ENTER', 'SDL_SCANCODE_KP_ENTER')
-register('SCANCODE_KP_1', 'SDL_SCANCODE_KP_1')
-register('SCANCODE_KP_2', 'SDL_SCANCODE_KP_2')
-register('SCANCODE_KP_3', 'SDL_SCANCODE_KP_3')
-register('SCANCODE_KP_4', 'SDL_SCANCODE_KP_4')
-register('SCANCODE_KP_5', 'SDL_SCANCODE_KP_5')
-register('SCANCODE_KP_6', 'SDL_SCANCODE_KP_6')
-register('SCANCODE_KP_7', 'SDL_SCANCODE_KP_7')
-register('SCANCODE_KP_8', 'SDL_SCANCODE_KP_8')
-register('SCANCODE_KP_9', 'SDL_SCANCODE_KP_9')
-register('SCANCODE_KP_0', 'SDL_SCANCODE_KP_0')
-register('SCANCODE_KP_PERIOD', 'SDL_SCANCODE_KP_PERIOD')
-register('SCANCODE_APPLICATION', 'SDL_SCANCODE_APPLICATION')
-register('SCANCODE_POWER', 'SDL_SCANCODE_POWER')
-register('SCANCODE_KP_EQUALS', 'SDL_SCANCODE_KP_EQUALS')
-register('SCANCODE_F13', 'SDL_SCANCODE_F13')
-register('SCANCODE_F14', 'SDL_SCANCODE_F14')
-register('SCANCODE_F15', 'SDL_SCANCODE_F15')
-register('SCANCODE_F16', 'SDL_SCANCODE_F16')
-register('SCANCODE_F17', 'SDL_SCANCODE_F17')
-register('SCANCODE_F18', 'SDL_SCANCODE_F18')
-register('SCANCODE_F19', 'SDL_SCANCODE_F19')
-register('SCANCODE_F20', 'SDL_SCANCODE_F20')
-register('SCANCODE_F21', 'SDL_SCANCODE_F21')
-register('SCANCODE_F22', 'SDL_SCANCODE_F22')
-register('SCANCODE_F23', 'SDL_SCANCODE_F23')
-register('SCANCODE_F24', 'SDL_SCANCODE_F24')
-register('SCANCODE_EXECUTE', 'SDL_SCANCODE_EXECUTE')
-register('SCANCODE_HELP', 'SDL_SCANCODE_HELP')
-register('SCANCODE_MENU', 'SDL_SCANCODE_MENU')
-register('SCANCODE_SELECT', 'SDL_SCANCODE_SELECT')
-register('SCANCODE_STOP', 'SDL_SCANCODE_STOP')
-register('SCANCODE_AGAIN', 'SDL_SCANCODE_AGAIN')
-register('SCANCODE_UNDO', 'SDL_SCANCODE_UNDO')
-register('SCANCODE_CUT', 'SDL_SCANCODE_CUT')
-register('SCANCODE_COPY', 'SDL_SCANCODE_COPY')
-register('SCANCODE_PASTE', 'SDL_SCANCODE_PASTE')
-register('SCANCODE_FIND', 'SDL_SCANCODE_FIND')
-register('SCANCODE_MUTE', 'SDL_SCANCODE_MUTE')
-register('SCANCODE_VOLUMEUP', 'SDL_SCANCODE_VOLUMEUP')
-register('SCANCODE_VOLUMEDOWN', 'SDL_SCANCODE_VOLUMEDOWN')
-register('SCANCODE_KP_COMMA', 'SDL_SCANCODE_KP_COMMA')
-register('SCANCODE_KP_EQUALSAS400', 'SDL_SCANCODE_KP_EQUALSAS400')
-register('SCANCODE_ALTERASE', 'SDL_SCANCODE_ALTERASE')
-register('SCANCODE_SYSREQ', 'SDL_SCANCODE_SYSREQ')
-register('SCANCODE_CANCEL', 'SDL_SCANCODE_CANCEL')
-register('SCANCODE_CLEAR', 'SDL_SCANCODE_CLEAR')
-register('SCANCODE_PRIOR', 'SDL_SCANCODE_PRIOR')
-register('SCANCODE_RETURN2', 'SDL_SCANCODE_RETURN2')
-register('SCANCODE_SEPARATOR', 'SDL_SCANCODE_SEPARATOR')
-register('SCANCODE_OUT', 'SDL_SCANCODE_OUT')
-register('SCANCODE_OPER', 'SDL_SCANCODE_OPER')
-register('SCANCODE_CLEARAGAIN', 'SDL_SCANCODE_CLEARAGAIN')
-register('SCANCODE_CRSEL', 'SDL_SCANCODE_CRSEL')
-register('SCANCODE_EXSEL', 'SDL_SCANCODE_EXSEL')
-register('SCANCODE_KP_00', 'SDL_SCANCODE_KP_00')
-register('SCANCODE_KP_000', 'SDL_SCANCODE_KP_000')
-register('SCANCODE_THOUSANDSSEPARATOR', 'SDL_SCANCODE_THOUSANDSSEPARATOR')
-register('SCANCODE_DECIMALSEPARATOR', 'SDL_SCANCODE_DECIMALSEPARATOR')
-register('SCANCODE_CURRENCYUNIT', 'SDL_SCANCODE_CURRENCYUNIT')
-register('SCANCODE_CURRENCYSUBUNIT', 'SDL_SCANCODE_CURRENCYSUBUNIT')
-register('SCANCODE_KP_LEFTPAREN', 'SDL_SCANCODE_KP_LEFTPAREN')
-register('SCANCODE_KP_RIGHTPAREN', 'SDL_SCANCODE_KP_RIGHTPAREN')
-register('SCANCODE_KP_LEFTBRACE', 'SDL_SCANCODE_KP_LEFTBRACE')
-register('SCANCODE_KP_RIGHTBRACE', 'SDL_SCANCODE_KP_RIGHTBRACE')
-register('SCANCODE_KP_TAB', 'SDL_SCANCODE_KP_TAB')
-register('SCANCODE_KP_BACKSPACE', 'SDL_SCANCODE_KP_BACKSPACE')
-register('SCANCODE_KP_A', 'SDL_SCANCODE_KP_A')
-register('SCANCODE_KP_B', 'SDL_SCANCODE_KP_B')
-register('SCANCODE_KP_C', 'SDL_SCANCODE_KP_C')
-register('SCANCODE_KP_D', 'SDL_SCANCODE_KP_D')
-register('SCANCODE_KP_E', 'SDL_SCANCODE_KP_E')
-register('SCANCODE_KP_F', 'SDL_SCANCODE_KP_F')
-register('SCANCODE_KP_XOR', 'SDL_SCANCODE_KP_XOR')
-register('SCANCODE_KP_POWER', 'SDL_SCANCODE_KP_POWER')
-register('SCANCODE_KP_PERCENT', 'SDL_SCANCODE_KP_PERCENT')
-register('SCANCODE_KP_LESS', 'SDL_SCANCODE_KP_LESS')
-register('SCANCODE_KP_GREATER', 'SDL_SCANCODE_KP_GREATER')
-register('SCANCODE_KP_AMPERSAND', 'SDL_SCANCODE_KP_AMPERSAND')
-register('SCANCODE_KP_DBLAMPERSAND', 'SDL_SCANCODE_KP_DBLAMPERSAND')
-register('SCANCODE_KP_VERTICALBAR', 'SDL_SCANCODE_KP_VERTICALBAR')
-register('SCANCODE_KP_DBLVERTICALBAR', 'SDL_SCANCODE_KP_DBLVERTICALBAR')
-register('SCANCODE_KP_COLON', 'SDL_SCANCODE_KP_COLON')
-register('SCANCODE_KP_HASH', 'SDL_SCANCODE_KP_HASH')
-register('SCANCODE_KP_SPACE', 'SDL_SCANCODE_KP_SPACE')
-register('SCANCODE_KP_AT', 'SDL_SCANCODE_KP_AT')
-register('SCANCODE_KP_EXCLAM', 'SDL_SCANCODE_KP_EXCLAM')
-register('SCANCODE_KP_MEMSTORE', 'SDL_SCANCODE_KP_MEMSTORE')
-register('SCANCODE_KP_MEMRECALL', 'SDL_SCANCODE_KP_MEMRECALL')
-register('SCANCODE_KP_MEMCLEAR', 'SDL_SCANCODE_KP_MEMCLEAR')
-register('SCANCODE_KP_MEMADD', 'SDL_SCANCODE_KP_MEMADD')
-register('SCANCODE_KP_MEMSUBTRACT', 'SDL_SCANCODE_KP_MEMSUBTRACT')
-register('SCANCODE_KP_MEMMULTIPLY', 'SDL_SCANCODE_KP_MEMMULTIPLY')
-register('SCANCODE_KP_MEMDIVIDE', 'SDL_SCANCODE_KP_MEMDIVIDE')
-register('SCANCODE_KP_PLUSMINUS', 'SDL_SCANCODE_KP_PLUSMINUS')
-register('SCANCODE_KP_CLEAR', 'SDL_SCANCODE_KP_CLEAR')
-register('SCANCODE_KP_CLEARENTRY', 'SDL_SCANCODE_KP_CLEARENTRY')
-register('SCANCODE_KP_BINARY', 'SDL_SCANCODE_KP_BINARY')
-register('SCANCODE_KP_OCTAL', 'SDL_SCANCODE_KP_OCTAL')
-register('SCANCODE_KP_DECIMAL', 'SDL_SCANCODE_KP_DECIMAL')
-register('SCANCODE_KP_HEXADECIMAL', 'SDL_SCANCODE_KP_HEXADECIMAL')
-register('SCANCODE_LCTRL', 'SDL_SCANCODE_LCTRL')
-register('SCANCODE_LSHIFT', 'SDL_SCANCODE_LSHIFT')
-register('SCANCODE_LALT', 'SDL_SCANCODE_LALT')
-register('SCANCODE_LGUI', 'SDL_SCANCODE_LGUI')
-register('SCANCODE_RCTRL', 'SDL_SCANCODE_RCTRL')
-register('SCANCODE_RSHIFT', 'SDL_SCANCODE_RSHIFT')
-register('SCANCODE_RALT', 'SDL_SCANCODE_RALT')
-register('SCANCODE_RGUI', 'SDL_SCANCODE_RGUI')
-register('SCANCODE_MODE', 'SDL_SCANCODE_MODE')
-register('SCANCODE_AUDIONEXT', 'SDL_SCANCODE_AUDIONEXT')
-register('SCANCODE_AUDIOPREV', 'SDL_SCANCODE_AUDIOPREV')
-register('SCANCODE_AUDIOSTOP', 'SDL_SCANCODE_AUDIOSTOP')
-register('SCANCODE_AUDIOPLAY', 'SDL_SCANCODE_AUDIOPLAY')
-register('SCANCODE_AUDIOMUTE', 'SDL_SCANCODE_AUDIOMUTE')
-register('SCANCODE_MEDIASELECT', 'SDL_SCANCODE_MEDIASELECT')
-register('SCANCODE_WWW', 'SDL_SCANCODE_WWW')
-register('SCANCODE_MAIL', 'SDL_SCANCODE_MAIL')
-register('SCANCODE_CALCULATOR', 'SDL_SCANCODE_CALCULATOR')
-register('SCANCODE_COMPUTER', 'SDL_SCANCODE_COMPUTER')
-register('SCANCODE_AC_SEARCH', 'SDL_SCANCODE_AC_SEARCH')
-register('SCANCODE_AC_HOME', 'SDL_SCANCODE_AC_HOME')
-register('SCANCODE_AC_BACK', 'SDL_SCANCODE_AC_BACK')
-register('SCANCODE_AC_FORWARD', 'SDL_SCANCODE_AC_FORWARD')
-register('SCANCODE_AC_STOP', 'SDL_SCANCODE_AC_STOP')
-register('SCANCODE_AC_REFRESH', 'SDL_SCANCODE_AC_REFRESH')
-register('SCANCODE_AC_BOOKMARKS', 'SDL_SCANCODE_AC_BOOKMARKS')
-register('SCANCODE_BRIGHTNESSDOWN', 'SDL_SCANCODE_BRIGHTNESSDOWN')
-register('SCANCODE_BRIGHTNESSUP', 'SDL_SCANCODE_BRIGHTNESSUP')
-register('SCANCODE_DISPLAYSWITCH', 'SDL_SCANCODE_DISPLAYSWITCH')
-register('SCANCODE_KBDILLUMTOGGLE', 'SDL_SCANCODE_KBDILLUMTOGGLE')
-register('SCANCODE_KBDILLUMDOWN', 'SDL_SCANCODE_KBDILLUMDOWN')
-register('SCANCODE_KBDILLUMUP', 'SDL_SCANCODE_KBDILLUMUP')
-register('SCANCODE_EJECT', 'SDL_SCANCODE_EJECT')
-register('SCANCODE_SLEEP', 'SDL_SCANCODE_SLEEP')
-register('KMOD_NONE', 'SDL_KMOD_NONE')
-register('KMOD_LSHIFT', 'SDL_KMOD_LSHIFT')
-register('KMOD_RSHIFT', 'SDL_KMOD_RSHIFT')
-register('KMOD_LCTRL', 'SDL_KMOD_LCTRL')
-register('KMOD_RCTRL', 'SDL_KMOD_RCTRL')
-register('KMOD_LALT', 'SDL_KMOD_LALT')
-register('KMOD_RALT', 'SDL_KMOD_RALT')
-register('KMOD_LGUI', 'SDL_KMOD_LGUI')
-register('KMOD_RGUI', 'SDL_KMOD_RGUI')
-register('KMOD_NUM', 'SDL_KMOD_NUM')
-register('KMOD_CAPS', 'SDL_KMOD_CAPS')
-register('KMOD_MODE', 'SDL_KMOD_MODE')
-register('KMOD_RESERVED', 'SDL_KMOD_RESERVED')
-register('SYSTEM_CURSOR_ARROW', 'SDL_SYSTEM_CURSOR_ARROW')
-register('SYSTEM_CURSOR_IBEAM', 'SDL_SYSTEM_CURSOR_IBEAM')
-register('SYSTEM_CURSOR_WAIT', 'SDL_SYSTEM_CURSOR_WAIT')
-register('SYSTEM_CURSOR_CROSSHAIR', 'SDL_SYSTEM_CURSOR_CROSSHAIR')
-register('SYSTEM_CURSOR_WAITARROW', 'SDL_SYSTEM_CURSOR_WAITARROW')
-register('SYSTEM_CURSOR_SIZENWSE', 'SDL_SYSTEM_CURSOR_SIZENWSE')
-register('SYSTEM_CURSOR_SIZENESW', 'SDL_SYSTEM_CURSOR_SIZENESW')
-register('SYSTEM_CURSOR_SIZEWE', 'SDL_SYSTEM_CURSOR_SIZEWE')
-register('SYSTEM_CURSOR_SIZENS', 'SDL_SYSTEM_CURSOR_SIZENS')
-register('SYSTEM_CURSOR_SIZEALL', 'SDL_SYSTEM_CURSOR_SIZEALL')
-register('SYSTEM_CURSOR_NO', 'SDL_SYSTEM_CURSOR_NO')
-register('SYSTEM_CURSOR_HAND', 'SDL_SYSTEM_CURSOR_HAND')
-register('NUM_SYSTEM_CURSORS', 'SDL_NUM_SYSTEM_CURSORS')
-register('CONTROLLER_BINDTYPE_NONE', 'SDL_CONTROLLER_BINDTYPE_NONE')
-register('CONTROLLER_BINDTYPE_BUTTON', 'SDL_CONTROLLER_BINDTYPE_BUTTON')
-register('CONTROLLER_BINDTYPE_AXIS', 'SDL_CONTROLLER_BINDTYPE_AXIS')
-register('CONTROLLER_BINDTYPE_HAT', 'SDL_CONTROLLER_BINDTYPE_HAT')
-register('CONTROLLER_AXIS_INVALID', 'SDL_CONTROLLER_AXIS_INVALID')
-register('CONTROLLER_AXIS_LEFTX', 'SDL_CONTROLLER_AXIS_LEFTX')
-register('CONTROLLER_AXIS_LEFTY', 'SDL_CONTROLLER_AXIS_LEFTY')
-register('CONTROLLER_AXIS_RIGHTX', 'SDL_CONTROLLER_AXIS_RIGHTX')
-register('CONTROLLER_AXIS_RIGHTY', 'SDL_CONTROLLER_AXIS_RIGHTY')
-register('CONTROLLER_AXIS_TRIGGERLEFT', 'SDL_CONTROLLER_AXIS_TRIGGERLEFT')
-register('CONTROLLER_AXIS_TRIGGERRIGHT', 'SDL_CONTROLLER_AXIS_TRIGGERRIGHT')
-register('CONTROLLER_AXIS_MAX', 'SDL_CONTROLLER_AXIS_MAX')
-register('CONTROLLER_BUTTON_INVALID', 'SDL_CONTROLLER_BUTTON_INVALID')
-register('CONTROLLER_BUTTON_A', 'SDL_CONTROLLER_BUTTON_A')
-register('CONTROLLER_BUTTON_B', 'SDL_CONTROLLER_BUTTON_B')
-register('CONTROLLER_BUTTON_X', 'SDL_CONTROLLER_BUTTON_X')
-register('CONTROLLER_BUTTON_Y', 'SDL_CONTROLLER_BUTTON_Y')
-register('CONTROLLER_BUTTON_BACK', 'SDL_CONTROLLER_BUTTON_BACK')
-register('CONTROLLER_BUTTON_GUIDE', 'SDL_CONTROLLER_BUTTON_GUIDE')
-register('CONTROLLER_BUTTON_START', 'SDL_CONTROLLER_BUTTON_START')
-register('CONTROLLER_BUTTON_LEFTSTICK', 'SDL_CONTROLLER_BUTTON_LEFTSTICK')
-register('CONTROLLER_BUTTON_RIGHTSTICK', 'SDL_CONTROLLER_BUTTON_RIGHTSTICK')
-register('CONTROLLER_BUTTON_LEFTSHOULDER', 'SDL_CONTROLLER_BUTTON_LEFTSHOULDER')
-register('CONTROLLER_BUTTON_RIGHTSHOULDER', 'SDL_CONTROLLER_BUTTON_RIGHTSHOULDER')
-register('CONTROLLER_BUTTON_DPAD_UP', 'SDL_CONTROLLER_BUTTON_DPAD_UP')
-register('CONTROLLER_BUTTON_DPAD_DOWN', 'SDL_CONTROLLER_BUTTON_DPAD_DOWN')
-register('CONTROLLER_BUTTON_DPAD_LEFT', 'SDL_CONTROLLER_BUTTON_DPAD_LEFT')
-register('CONTROLLER_BUTTON_DPAD_RIGHT', 'SDL_CONTROLLER_BUTTON_DPAD_RIGHT')
-register('CONTROLLER_BUTTON_MAX', 'SDL_CONTROLLER_BUTTON_MAX')
-register('FIRSTEVENT', 'SDL_FIRSTEVENT')
-register('QUIT', 'SDL_QUIT')
-register('APP_TERMINATING', 'SDL_APP_TERMINATING')
-register('APP_LOWMEMORY', 'SDL_APP_LOWMEMORY')
-register('APP_WILLENTERBACKGROUND', 'SDL_APP_WILLENTERBACKGROUND')
-register('APP_DIDENTERBACKGROUND', 'SDL_APP_DIDENTERBACKGROUND')
-register('APP_WILLENTERFOREGROUND', 'SDL_APP_WILLENTERFOREGROUND')
-register('APP_DIDENTERFOREGROUND', 'SDL_APP_DIDENTERFOREGROUND')
-register('WINDOWEVENT', 'SDL_WINDOWEVENT')
-register('SYSWMEVENT', 'SDL_SYSWMEVENT')
-register('KEYDOWN', 'SDL_KEYDOWN')
-register('KEYUP', 'SDL_KEYUP')
-register('TEXTEDITING', 'SDL_TEXTEDITING')
-register('TEXTINPUT', 'SDL_TEXTINPUT')
-register('MOUSEMOTION', 'SDL_MOUSEMOTION')
-register('MOUSEBUTTONDOWN', 'SDL_MOUSEBUTTONDOWN')
-register('MOUSEBUTTONUP', 'SDL_MOUSEBUTTONUP')
-register('MOUSEWHEEL', 'SDL_MOUSEWHEEL')
-register('JOYAXISMOTION', 'SDL_JOYAXISMOTION')
-register('JOYBALLMOTION', 'SDL_JOYBALLMOTION')
-register('JOYHATMOTION', 'SDL_JOYHATMOTION')
-register('JOYBUTTONDOWN', 'SDL_JOYBUTTONDOWN')
-register('JOYBUTTONUP', 'SDL_JOYBUTTONUP')
-register('JOYDEVICEADDED', 'SDL_JOYDEVICEADDED')
-register('JOYDEVICEREMOVED', 'SDL_JOYDEVICEREMOVED')
-register('CONTROLLERAXISMOTION', 'SDL_CONTROLLERAXISMOTION')
-register('CONTROLLERBUTTONDOWN', 'SDL_CONTROLLERBUTTONDOWN')
-register('CONTROLLERBUTTONUP', 'SDL_CONTROLLERBUTTONUP')
-register('CONTROLLERDEVICEADDED', 'SDL_CONTROLLERDEVICEADDED')
-register('CONTROLLERDEVICEREMOVED', 'SDL_CONTROLLERDEVICEREMOVED')
-register('CONTROLLERDEVICEREMAPPED', 'SDL_CONTROLLERDEVICEREMAPPED')
-register('FINGERDOWN', 'SDL_FINGERDOWN')
-register('FINGERUP', 'SDL_FINGERUP')
-register('FINGERMOTION', 'SDL_FINGERMOTION')
-register('DOLLARGESTURE', 'SDL_DOLLARGESTURE')
-register('DOLLARRECORD', 'SDL_DOLLARRECORD')
-register('MULTIGESTURE', 'SDL_MULTIGESTURE')
-register('CLIPBOARDUPDATE', 'SDL_CLIPBOARDUPDATE')
-register('DROPFILE', 'SDL_DROPFILE')
-register('USEREVENT', 'SDL_USEREVENT')
-register('LASTEVENT', 'SDL_LASTEVENT')
-register('ADDEVENT', 'SDL_ADDEVENT')
-register('PEEKEVENT', 'SDL_PEEKEVENT')
-register('GETEVENT', 'SDL_GETEVENT')
-register('HINT_DEFAULT', 'SDL_HINT_DEFAULT')
-register('HINT_NORMAL', 'SDL_HINT_NORMAL')
-register('HINT_OVERRIDE', 'SDL_HINT_OVERRIDE')
-register('LOG_CATEGORY_APPLICATION', 'SDL_LOG_CATEGORY_APPLICATION')
-register('LOG_CATEGORY_ERROR', 'SDL_LOG_CATEGORY_ERROR')
-register('LOG_CATEGORY_ASSERT', 'SDL_LOG_CATEGORY_ASSERT')
-register('LOG_CATEGORY_SYSTEM', 'SDL_LOG_CATEGORY_SYSTEM')
-register('LOG_CATEGORY_AUDIO', 'SDL_LOG_CATEGORY_AUDIO')
-register('LOG_CATEGORY_VIDEO', 'SDL_LOG_CATEGORY_VIDEO')
-register('LOG_CATEGORY_RENDER', 'SDL_LOG_CATEGORY_RENDER')
-register('LOG_CATEGORY_INPUT', 'SDL_LOG_CATEGORY_INPUT')
-register('LOG_CATEGORY_TEST', 'SDL_LOG_CATEGORY_TEST')
-register('LOG_CATEGORY_RESERVED1', 'SDL_LOG_CATEGORY_RESERVED1')
-register('LOG_CATEGORY_RESERVED2', 'SDL_LOG_CATEGORY_RESERVED2')
-register('LOG_CATEGORY_RESERVED3', 'SDL_LOG_CATEGORY_RESERVED3')
-register('LOG_CATEGORY_RESERVED4', 'SDL_LOG_CATEGORY_RESERVED4')
-register('LOG_CATEGORY_RESERVED5', 'SDL_LOG_CATEGORY_RESERVED5')
-register('LOG_CATEGORY_RESERVED6', 'SDL_LOG_CATEGORY_RESERVED6')
-register('LOG_CATEGORY_RESERVED7', 'SDL_LOG_CATEGORY_RESERVED7')
-register('LOG_CATEGORY_RESERVED8', 'SDL_LOG_CATEGORY_RESERVED8')
-register('LOG_CATEGORY_RESERVED9', 'SDL_LOG_CATEGORY_RESERVED9')
-register('LOG_CATEGORY_RESERVED10', 'SDL_LOG_CATEGORY_RESERVED10')
-register('LOG_CATEGORY_CUSTOM', 'SDL_LOG_CATEGORY_CUSTOM')
-register('LOG_PRIORITY_VERBOSE', 'SDL_LOG_PRIORITY_VERBOSE')
-register('LOG_PRIORITY_DEBUG', 'SDL_LOG_PRIORITY_DEBUG')
-register('LOG_PRIORITY_INFO', 'SDL_LOG_PRIORITY_INFO')
-register('LOG_PRIORITY_WARN', 'SDL_LOG_PRIORITY_WARN')
-register('LOG_PRIORITY_ERROR', 'SDL_LOG_PRIORITY_ERROR')
-register('LOG_PRIORITY_CRITICAL', 'SDL_LOG_PRIORITY_CRITICAL')
-register('NUM_LOG_PRIORITIES', 'SDL_NUM_LOG_PRIORITIES')
-register('MESSAGEBOX_ERROR', 'SDL_MESSAGEBOX_ERROR')
-register('MESSAGEBOX_WARNING', 'SDL_MESSAGEBOX_WARNING')
-register('MESSAGEBOX_INFORMATION', 'SDL_MESSAGEBOX_INFORMATION')
-register('MESSAGEBOX_BUTTON_RETURNKEY_DEFAULT', 'SDL_MESSAGEBOX_BUTTON_RETURNKEY_DEFAULT')
-register('MESSAGEBOX_BUTTON_ESCAPEKEY_DEFAULT', 'SDL_MESSAGEBOX_BUTTON_ESCAPEKEY_DEFAULT')
-register('MESSAGEBOX_COLOR_BACKGROUND', 'SDL_MESSAGEBOX_COLOR_BACKGROUND')
-register('MESSAGEBOX_COLOR_TEXT', 'SDL_MESSAGEBOX_COLOR_TEXT')
-register('MESSAGEBOX_COLOR_BUTTON_BORDER', 'SDL_MESSAGEBOX_COLOR_BUTTON_BORDER')
-register('MESSAGEBOX_COLOR_BUTTON_BACKGROUND', 'SDL_MESSAGEBOX_COLOR_BUTTON_BACKGROUND')
-register('MESSAGEBOX_COLOR_BUTTON_SELECTED', 'SDL_MESSAGEBOX_COLOR_BUTTON_SELECTED')
-register('MESSAGEBOX_COLOR_MAX', 'SDL_MESSAGEBOX_COLOR_MAX')
-register('MESSAGEBOX_COLOR_MAX', 'SDL_MESSAGEBOX_COLOR_MAX')
-register('POWERSTATE_UNKNOWN', 'SDL_POWERSTATE_UNKNOWN')
-register('POWERSTATE_ON_BATTERY', 'SDL_POWERSTATE_ON_BATTERY')
-register('POWERSTATE_NO_BATTERY', 'SDL_POWERSTATE_NO_BATTERY')
-register('POWERSTATE_CHARGING', 'SDL_POWERSTATE_CHARGING')
-register('POWERSTATE_CHARGED', 'SDL_POWERSTATE_CHARGED')
-register('RENDERER_SOFTWARE', 'SDL_RENDERER_SOFTWARE')
-register('RENDERER_ACCELERATED', 'SDL_RENDERER_ACCELERATED')
-register('RENDERER_PRESENTVSYNC', 'SDL_RENDERER_PRESENTVSYNC')
-register('RENDERER_TARGETTEXTURE', 'SDL_RENDERER_TARGETTEXTURE')
-register('TEXTUREACCESS_STATIC', 'SDL_TEXTUREACCESS_STATIC')
-register('TEXTUREACCESS_STREAMING', 'SDL_TEXTUREACCESS_STREAMING')
-register('TEXTUREACCESS_TARGET', 'SDL_TEXTUREACCESS_TARGET')
-register('TEXTUREMODULATE_NONE', 'SDL_TEXTUREMODULATE_NONE')
-register('TEXTUREMODULATE_COLOR', 'SDL_TEXTUREMODULATE_COLOR')
-register('TEXTUREMODULATE_ALPHA', 'SDL_TEXTUREMODULATE_ALPHA')
-register('FLIP_NONE', 'SDL_FLIP_NONE')
-register('FLIP_HORIZONTAL', 'SDL_FLIP_HORIZONTAL')
-register('FLIP_VERTICAL', 'SDL_FLIP_VERTICAL')
-register('INIT_TIMER', 'SDL_INIT_TIMER')
-register('INIT_AUDIO', 'SDL_INIT_AUDIO')
-register('INIT_VIDEO', 'SDL_INIT_VIDEO')
-register('INIT_JOYSTICK', 'SDL_INIT_JOYSTICK')
-register('INIT_HAPTIC', 'SDL_INIT_HAPTIC')
-register('INIT_GAMECONTROLLER', 'SDL_INIT_GAMECONTROLLER')
-register('INIT_EVENTS', 'SDL_INIT_EVENTS')
-register('INIT_NOPARACHUTE', 'SDL_INIT_NOPARACHUTE')
-register('INIT_EVERYTHING', 'SDL_INIT_EVERYTHING')
-register('INIT_TIMER', 'SDL_INIT_TIMER')
-register('INIT_AUDIO', 'SDL_INIT_AUDIO')
-register('INIT_VIDEO', 'SDL_INIT_VIDEO')
-register('INIT_EVENTS', 'SDL_INIT_EVENTS')
-register('INIT_JOYSTICK', 'SDL_INIT_JOYSTICK')
-register('INIT_HAPTIC', 'SDL_INIT_HAPTIC')
-register('INIT_GAMECONTROLLER', 'SDL_INIT_GAMECONTROLLER')
-register('AUDIO_MASK_BITSIZE', 'SDL_AUDIO_MASK_BITSIZE')
-register('AUDIO_MASK_DATATYPE', 'SDL_AUDIO_MASK_DATATYPE')
-register('AUDIO_MASK_ENDIAN', 'SDL_AUDIO_MASK_ENDIAN')
-register('AUDIO_MASK_SIGNED', 'SDL_AUDIO_MASK_SIGNED')
-register('AUDIO_U8', 'SDL_AUDIO_U8')
-register('AUDIO_S8', 'SDL_AUDIO_S8')
-register('AUDIO_U16LSB', 'SDL_AUDIO_U16LSB')
-register('AUDIO_S16LSB', 'SDL_AUDIO_S16LSB')
-register('AUDIO_U16MSB', 'SDL_AUDIO_U16MSB')
-register('AUDIO_S16MSB', 'SDL_AUDIO_S16MSB')
-register('AUDIO_U16', 'SDL_AUDIO_U16')
-register('AUDIO_U16LSB', 'SDL_AUDIO_U16LSB')
-register('AUDIO_S16', 'SDL_AUDIO_S16')
-register('AUDIO_S16LSB', 'SDL_AUDIO_S16LSB')
-register('AUDIO_S32LSB', 'SDL_AUDIO_S32LSB')
-register('AUDIO_S32MSB', 'SDL_AUDIO_S32MSB')
-register('AUDIO_S32', 'SDL_AUDIO_S32')
-register('AUDIO_S32LSB', 'SDL_AUDIO_S32LSB')
-register('AUDIO_F32LSB', 'SDL_AUDIO_F32LSB')
-register('AUDIO_F32MSB', 'SDL_AUDIO_F32MSB')
-register('AUDIO_F32', 'SDL_AUDIO_F32')
-register('AUDIO_F32LSB', 'SDL_AUDIO_F32LSB')
-register('AUDIO_ALLOW_FREQUENCY_CHANGE', 'SDL_AUDIO_ALLOW_FREQUENCY_CHANGE')
-register('AUDIO_ALLOW_FORMAT_CHANGE', 'SDL_AUDIO_ALLOW_FORMAT_CHANGE')
-register('AUDIO_ALLOW_CHANNELS_CHANGE', 'SDL_AUDIO_ALLOW_CHANNELS_CHANGE')
-register('AUDIO_ALLOW_ANY_CHANGE', 'SDL_AUDIO_ALLOW_ANY_CHANGE')
-register('AUDIO_ALLOW_FREQUENCY_CHANGE', 'SDL_AUDIO_ALLOW_FREQUENCY_CHANGE')
-register('AUDIO_ALLOW_FORMAT_CHANGE', 'SDL_AUDIO_ALLOW_FORMAT_CHANGE')
-register('AUDIO_ALLOW_CHANNELS_CHANGE', 'SDL_AUDIO_ALLOW_CHANNELS_CHANGE')
-register('MIX_MAXVOLUME', 'SDL_MIX_MAXVOLUME')
-register('RELEASED', 'SDL_RELEASED')
-register('PRESSED', 'SDL_PRESSED')
-register('QUERY', 'SDL_QUERY')
-register('IGNORE', 'SDL_IGNORE')
-register('DISABLE', 'SDL_DISABLE')
-register('ENABLE', 'SDL_ENABLE')
-register('HAPTIC_CONSTANT', 'SDL_HAPTIC_CONSTANT')
-register('HAPTIC_SINE', 'SDL_HAPTIC_SINE')
-register('HAPTIC_LEFTRIGHT', 'SDL_HAPTIC_LEFTRIGHT')
-register('HAPTIC_TRIANGLE', 'SDL_HAPTIC_TRIANGLE')
-register('HAPTIC_SAWTOOTHUP', 'SDL_HAPTIC_SAWTOOTHUP')
-register('HAPTIC_SAWTOOTHDOWN', 'SDL_HAPTIC_SAWTOOTHDOWN')
-register('HAPTIC_RAMP', 'SDL_HAPTIC_RAMP')
-register('HAPTIC_SPRING', 'SDL_HAPTIC_SPRING')
-register('HAPTIC_DAMPER', 'SDL_HAPTIC_DAMPER')
-register('HAPTIC_INERTIA', 'SDL_HAPTIC_INERTIA')
-register('HAPTIC_FRICTION', 'SDL_HAPTIC_FRICTION')
-register('HAPTIC_CUSTOM', 'SDL_HAPTIC_CUSTOM')
-register('HAPTIC_GAIN', 'SDL_HAPTIC_GAIN')
-register('HAPTIC_AUTOCENTER', 'SDL_HAPTIC_AUTOCENTER')
-register('HAPTIC_STATUS', 'SDL_HAPTIC_STATUS')
-register('HAPTIC_PAUSE', 'SDL_HAPTIC_PAUSE')
-register('HAPTIC_POLAR', 'SDL_HAPTIC_POLAR')
-register('HAPTIC_CARTESIAN', 'SDL_HAPTIC_CARTESIAN')
-register('HAPTIC_SPHERICAL', 'SDL_HAPTIC_SPHERICAL')
-register('HAPTIC_INFINITY', 'SDL_HAPTIC_INFINITY')
-register('HAT_CENTERED', 'SDL_HAT_CENTERED')
-register('HAT_UP', 'SDL_HAT_UP')
-register('HAT_RIGHT', 'SDL_HAT_RIGHT')
-register('HAT_DOWN', 'SDL_HAT_DOWN')
-register('HAT_LEFT', 'SDL_HAT_LEFT')
-register('HAT_RIGHTUP', 'SDL_HAT_RIGHTUP')
-register('HAT_RIGHT', 'SDL_HAT_RIGHT')
-register('HAT_UP', 'SDL_HAT_UP')
-register('HAT_RIGHTDOWN', 'SDL_HAT_RIGHTDOWN')
-register('HAT_RIGHT', 'SDL_HAT_RIGHT')
-register('HAT_DOWN', 'SDL_HAT_DOWN')
-register('HAT_LEFTUP', 'SDL_HAT_LEFTUP')
-register('HAT_LEFT', 'SDL_HAT_LEFT')
-register('HAT_UP', 'SDL_HAT_UP')
-register('HAT_LEFTDOWN', 'SDL_HAT_LEFTDOWN')
-register('HAT_LEFT', 'SDL_HAT_LEFT')
-register('HAT_DOWN', 'SDL_HAT_DOWN')
-register('SCANCODE_MASK', 'SDL_SCANCODE_MASK')
-register('KMOD_CTRL', 'SDL_KMOD_CTRL')
-register('KMOD_LCTRL', 'SDL_KMOD_LCTRL')
-register('KMOD_RCTRL', 'SDL_KMOD_RCTRL')
-register('KMOD_SHIFT', 'SDL_KMOD_SHIFT')
-register('KMOD_LSHIFT', 'SDL_KMOD_LSHIFT')
-register('KMOD_RSHIFT', 'SDL_KMOD_RSHIFT')
-register('KMOD_ALT', 'SDL_KMOD_ALT')
-register('KMOD_LALT', 'SDL_KMOD_LALT')
-register('KMOD_RALT', 'SDL_KMOD_RALT')
-register('KMOD_GUI', 'SDL_KMOD_GUI')
-register('KMOD_LGUI', 'SDL_KMOD_LGUI')
-register('KMOD_RGUI', 'SDL_KMOD_RGUI')
-register('BUTTON_LEFT', 'SDL_BUTTON_LEFT')
-register('BUTTON_MIDDLE', 'SDL_BUTTON_MIDDLE')
-register('BUTTON_RIGHT', 'SDL_BUTTON_RIGHT')
-register('BUTTON_X1', 'SDL_BUTTON_X1')
-register('BUTTON_X2', 'SDL_BUTTON_X2')
-register('BUTTON_LMASK', 'SDL_BUTTON_LMASK')
-register('BUTTON_LEFT-1', 'SDL_BUTTON_LEFT-1')
-register('BUTTON_MMASK', 'SDL_BUTTON_MMASK')
-register('BUTTON_MIDDLE-1', 'SDL_BUTTON_MIDDLE-1')
-register('BUTTON_RMASK', 'SDL_BUTTON_RMASK')
-register('BUTTON_RIGHT-1', 'SDL_BUTTON_RIGHT-1')
-register('BUTTON_X1MASK', 'SDL_BUTTON_X1MASK')
-register('BUTTON_X1-1', 'SDL_BUTTON_X1-1')
-register('BUTTON_X2MASK', 'SDL_BUTTON_X2MASK')
-register('BUTTON_X2-1', 'SDL_BUTTON_X2-1')
-register('MUTEX_TIMEDOUT', 'SDL_MUTEX_TIMEDOUT')
-register('MUTEX_MAXWAIT', 'SDL_MUTEX_MAXWAIT')
-register('ALPHA_OPAQUE', 'SDL_ALPHA_OPAQUE')
-register('ALPHA_TRANSPARENT', 'SDL_ALPHA_TRANSPARENT')
-register('RWOPS_UNKNOWN', 'SDL_RWOPS_UNKNOWN')
-register('RWOPS_WINFILE', 'SDL_RWOPS_WINFILE')
-register('RWOPS_STDFILE', 'SDL_RWOPS_STDFILE')
-register('RWOPS_JNIFILE', 'SDL_RWOPS_JNIFILE')
-register('RWOPS_MEMORY', 'SDL_RWOPS_MEMORY')
-register('RWOPS_MEMORY_RO', 'SDL_RWOPS_MEMORY_RO')
-register('NONSHAPEABLE_WINDOW', 'SDL_NONSHAPEABLE_WINDOW')
-register('INVALID_SHAPE_ARGUMENT', 'SDL_INVALID_SHAPE_ARGUMENT')
-register('WINDOW_LACKS_SHAPE', 'SDL_WINDOW_LACKS_SHAPE')
-register('SWSURFACE', 'SDL_SWSURFACE')
-register('PREALLOC', 'SDL_PREALLOC')
-register('RLEACCEL', 'SDL_RLEACCEL')
-register('DONTFREE', 'SDL_DONTFREE')
-register('WINDOWPOS_CENTERED_MASK', 'SDL_WINDOWPOS_CENTERED_MASK')
-register('WINDOWPOS_CENTERED', 'SDL_WINDOWPOS_CENTERED')
-
-registerdefines(sdl)
-
-return sdl
diff --git a/src/lib/luigi/backend/ffisdl/spritebatch.lua b/src/lib/luigi/backend/ffisdl/spritebatch.lua
deleted file mode 100644
index 3adb571..0000000
--- a/src/lib/luigi/backend/ffisdl/spritebatch.lua
+++ /dev/null
@@ -1,79 +0,0 @@
-local REL = (...):gsub('[^.]*$', '')
-
-local sdl = require(REL .. 'sdl')
-
-local SpriteBatch = setmetatable({}, { __call = function (self, ...)
-    local object = setmetatable({}, { __index = self })
-    return object, self.constructor(object, ...)
-end })
-
---[[
-spriteBatch = SpriteBatch( image, size )
-
-Arguments
-
-Image image
-    The Image to use for the sprites.
-number size (1000)
-    The max number of sprites.
-
-Returns
-
-SpriteBatch spriteBatch
-    The new SpriteBatch.
---]]
-function SpriteBatch:constructor (image)
-    self.image = image
-    self.sprites = {}
-end
-
-function SpriteBatch:clear ()
-    self.sprites = {}
-end
-
---[[
-id = SpriteBatch:add( quad, x, y, r, sx, sy )
-
-Arguments
-
-Quad quad
-    The Quad to add.
-number x
-    The position to draw the object (x-axis).
-number y
-    The position to draw the object (y-axis).
-number r (0)
-    Orientation (radians). (not implemented)
-number sx (1)
-    Scale factor (x-axis).
-number sy (sx)
-    Scale factor (y-axis).
-
-Returns
-
-number id
-    An identifier for the added sprite.
---]]
-function SpriteBatch:add (quad, x, y, r, sx, sy)
-    local sprites = self.sprites
-
-    sprites[#sprites + 1] = { quad = quad, x = x, y = y,
-        sx = sx or 1, sy = sy or 1 }
-end
-
-function SpriteBatch:draw ()
-    local image = self.image
-    local renderer = image.sdlRenderer
-    local texture = image.sdlTexture
-
-    for _, sprite in ipairs(self.sprites) do
-        local quad = sprite.quad
-        local w = math.ceil(quad[3] * sprite.sx)
-        local h = math.ceil(quad[4] * sprite.sy)
-        local src = sdl.Rect(quad)
-        local dst = sdl.Rect(sprite.x, sprite.y, w, h)
-        sdl.renderCopy(renderer, texture, src, dst)
-    end
-end
-
-return SpriteBatch
diff --git a/src/lib/luigi/backend/ffisdl/text.lua b/src/lib/luigi/backend/ffisdl/text.lua
deleted file mode 100644
index ba5b3ac..0000000
--- a/src/lib/luigi/backend/ffisdl/text.lua
+++ /dev/null
@@ -1,104 +0,0 @@
-local ROOT = (...):gsub('[^.]*.[^.]*.[^.]*$', '')
-local REL = (...):gsub('[^.]*$', '')
-
-local ffi = require 'ffi'
-local sdl = require(REL .. 'sdl')
-local Font = require(REL .. 'font')
-local ttf = Font.SDL2_ttf
-
-local Multiline = require(ROOT .. 'multiline')
-
-local Text = setmetatable({}, { __call = function (self, ...)
-    local object = setmetatable({}, { __index = self })
-    return object, self.constructor(object, ...)
-end })
-
-local function renderSingle (self, font, text, color)
-    local alphaMod = color and color[4]
-    color = sdl.Color(color or 0)
-    local surface = ffi.gc(
-        ttf.TTF_RenderUTF8_Blended(font.sdlFont, text, color),
-        sdl.freeSurface)
-    self.sdlSurface = surface
-    self.sdlTexture = ffi.gc(
-        sdl.createTextureFromSurface(self.sdlRenderer, surface),
-        sdl.destroyTexture)
-    if alphaMod then
-        sdl.setTextureAlphaMod(self.sdlTexture, alphaMod)
-    end
-    self.width, self.height = surface.w, surface.h
-end
-
-local function renderMulti (self, font, text, color, align, limit)
-    local alphaMod = color and color[4]
-    local lines = Multiline.wrap(font, text, limit)
-    local lineHeight = font:getLineHeight()
-    local height = #lines * lineHeight
-    color = sdl.Color(color or 0)
-
-    -- mask values from SDL_ttf.c
-    -- TODO: something with sdl.BYTEORDER == sdl.BIG_ENDIAN ?
-    local r, g, b, a = 0x00FF0000, 0x0000FF00, 0x000000FF, 0xFF000000
-
-    local surface = ffi.gc(
-        sdl.createRGBSurface(sdl.SWSURFACE, limit, height, 32, r, g, b, a),
-        sdl.freeSurface)
-    self.sdlSurface = surface
-
-    for index, line in ipairs(lines) do
-        local text = table.concat(line)
-        local lineSurface = ffi.gc(
-            ttf.TTF_RenderUTF8_Blended(font.sdlFont, text, color),
-            sdl.freeSurface)
-        if lineSurface ~= nil then
-            sdl.setSurfaceBlendMode(lineSurface, sdl.BLENDMODE_NONE)
-
-            local w, h = lineSurface.w, lineSurface.h
-            local top = (index - 1) * lineHeight
-
-            if align == 'left' then
-                sdl.blitSurface(lineSurface, nil, surface,
-                    sdl.Rect(0, top, w, h))
-            elseif align == 'right' then
-                sdl.blitSurface(lineSurface, nil, surface,
-                    sdl.Rect(limit - line.width, top, w, h))
-            elseif align == 'center' then
-                sdl.blitSurface(lineSurface, nil, surface,
-                    sdl.Rect((limit - line.width) / 2, top, w, h))
-            end
-        end
-    end
-
-    self.sdlTexture = ffi.gc(
-        sdl.createTextureFromSurface(self.sdlRenderer, surface),
-        sdl.destroyTexture)
-
-    if alphaMod then
-        sdl.setTextureAlphaMod(self.sdlTexture, alphaMod)
-    end
-
-    self.width, self.height = limit, height
-end
-
-function Text:constructor (renderer, font, text, color, align, limit)
-    self.width, self.height = 0, 0
-    if not text or text == '' then return end
-
-    self.sdlRenderer = renderer
-
-    if limit then
-        renderMulti(self, font, text, color, align, limit)
-    else
-        renderSingle(self, font, text, color)
-    end
-end
-
-function Text:getWidth ()
-    return self.width
-end
-
-function Text:getHeight ()
-    return self.height
-end
-
-return Text
diff --git a/src/lib/luigi/backend/love.lua b/src/lib/luigi/backend/love.lua
deleted file mode 100644
index 8c44a9e..0000000
--- a/src/lib/luigi/backend/love.lua
+++ /dev/null
@@ -1,177 +0,0 @@
-local ROOT = (...):gsub('[^.]*.[^.]*$', '')
-
-local Base = require(ROOT .. 'base')
-local Hooker = require(ROOT .. 'hooker')
-
-local Backend = {}
-
-Backend.isMac = function ()
-    return love.system.getOS() == 'OS X'
-end
-
-Backend.run = function () end
-
-Backend.Cursor = love.mouse.newCursor
-
-Backend.Font = require(ROOT .. 'backend.love.font')
-
-Backend.Text = require(ROOT .. 'backend.love.text')
-
-Backend.Image = love.graphics.newImage
-
-Backend.Quad = love.graphics.newQuad
-
-Backend.SpriteBatch = love.graphics.newSpriteBatch
-
--- love.graphics.draw( drawable, x, y, r, sx, sy, ox, oy, kx, ky )
-Backend.draw = function (drawable, ...)
-    if drawable.typeOf and drawable:typeOf 'Drawable' then
-        return love.graphics.draw(drawable, ...)
-    end
-    return drawable:draw(...)
-end
-
-Backend.drawRectangle = love.graphics.rectangle
-
-Backend.print = love.graphics.print
-
-Backend.getClipboardText = love.system.getClipboardText
-
-Backend.setClipboardText = love.system.setClipboardText
-
-Backend.getMousePosition = love.mouse.getPosition
-
-Backend.setMousePosition = love.mouse.setPosition
-
-Backend.getSystemCursor = love.mouse.getSystemCursor
-
-Backend.getWindowSize = function ()
-    return love.graphics.getWidth(), love.graphics.getHeight()
-end
-
-Backend.getTime = love.timer.getTime
-
-Backend.isKeyDown = love.keyboard.isDown
-
-Backend.isMouseDown = love.mouse.isDown
-
-Backend.pop = love.graphics.pop
-
-local push = love.graphics.push
-
-Backend.push = function ()
-     return push 'all'
-end
-
-Backend.quit = function ()
-     love.event.quit()
-end
-
-if _G.love._version_major >= 11 then
-    Backend.setColor = function(r, g, b, a)
-        if type(r) == "table" then
-            r, g, b, a = r[1], r[2], r[3], r[4]
-        end
-        if a == nil then
-            a = 255
-        end
-        love.graphics.setColor(r / 255, g / 255, b / 255, a / 255)
-    end
-else
-    Backend.setColor = love.graphics.setColor
-end
-
-Backend.setCursor = love.mouse.setCursor
-
-Backend.setFont = function (font)
-    return love.graphics.setFont(font.loveFont)
-end
-
-Backend.setScissor = love.graphics.setScissor
-
-Backend.getScissor = love.graphics.getScissor
-
-Backend.intersectScissor = love.graphics.intersectScissor
-
-function Backend.hide (layout)
-    for _, item in ipairs(layout.hooks) do
-        Hooker.unhook(item)
-    end
-    layout.hooks = {}
-end
-
-local function hook (layout, key, method, hookLast)
-    layout.hooks[#layout.hooks + 1] = Hooker.hook(love, key, method, hookLast)
-end
-
-local getMouseButtonId, isMouseDown
-
-if love._version_major == 0 and love._version_minor < 10 then
-    getMouseButtonId = function (value)
-        return value == 'l' and 'left'
-            or value == 'r' and 'right'
-            or value == 'm' and 'middle'
-            or value == 'x1' and 4
-            or value == 'x2' and 5
-            or value
-    end
-    isMouseDown = function ()
-        return love.mouse.isDown('l', 'r', 'm')
-    end
-else
-    getMouseButtonId = function (value)
-        return value == 1 and 'left'
-            or value == 2 and 'right'
-            or value == 3 and 'middle'
-            or value
-    end
-    isMouseDown = function ()
-        return love.mouse.isDown(1, 2, 3)
-    end
-end
-
-function Backend.show (layout)
-
-    local input = layout.input
-
-    hook(layout, 'draw', function ()
-        input:handleDisplay(layout)
-    end, true)
-    hook(layout, 'resize', function (width, height)
-        return input:handleReshape(layout, width, height)
-    end)
-    hook(layout, 'mousepressed', function (x, y, button)
-        if button == 'wu' or button == 'wd' then
-            return input:handleWheelMove(layout, 0, button == 'wu' and 1 or -1)
-        end
-        return input:handlePressStart(layout, getMouseButtonId(button), x, y)
-    end)
-    hook(layout, 'mousereleased', function (x, y, button)
-        return input:handlePressEnd(layout, getMouseButtonId(button), x, y)
-    end)
-    hook(layout, 'mousemoved', function (x, y, dx, dy)
-        if isMouseDown() then
-            return input:handlePressedMove(layout, x, y)
-        else
-            return input:handleMove(layout, x, y)
-        end
-    end)
-    hook(layout, 'keypressed', function (key, sc, isRepeat)
-        if key == ' ' then key = 'space' end
-        return input:handleKeyPress(layout, key, sc, Backend.getMousePosition())
-    end)
-    hook(layout, 'keyreleased', function (key, sc)
-        if key == ' ' then key = 'space' end
-        return input:handleKeyRelease(layout, key, sc, Backend.getMousePosition())
-    end)
-    hook(layout, 'textinput', function (text)
-        return input:handleTextInput(layout, text, Backend.getMousePosition())
-    end)
-    if (love._version_major == 0 and love._version_minor > 9) or love._version_major >= 11 then
-        hook(layout, 'wheelmoved', function (x, y)
-            return input:handleWheelMove(layout, x, y)
-        end)
-    end
-end
-
-return Backend
diff --git a/src/lib/luigi/backend/love/font.lua b/src/lib/luigi/backend/love/font.lua
deleted file mode 100644
index 37f8562..0000000
--- a/src/lib/luigi/backend/love/font.lua
+++ /dev/null
@@ -1,53 +0,0 @@
-local Font = setmetatable({}, { __call = function (self, ...)
-    local object = setmetatable({}, { __index = self })
-    return object, self.constructor(object, ...)
-end })
-
-local fontCache = {}
-
-function Font:constructor (path, size, color)
-    if not size then
-        size = 12
-    end
-    if not color then
-        color = { 0, 0, 0 }
-    end
-    local key = (path or '') .. '_' .. size
-
-    if not fontCache[key] then
-        if path then
-            fontCache[key] = love.graphics.newFont(path, size)
-        else
-            fontCache[key] = love.graphics.newFont(size)
-        end
-    end
-
-    self.loveFont = fontCache[key]
-    self.color = color
-end
-
-function Font:setAlignment (align)
-    self.align = align
-end
-
-function Font:setWidth (width)
-    self.width = width
-end
-
-function Font:getLineHeight ()
-    return self.loveFont:getHeight()
-end
-
-function Font:getAscender ()
-    return self.loveFont:getAscent()
-end
-
-function Font:getDescender ()
-    return self.loveFont:getDescent()
-end
-
-function Font:getAdvance (text)
-    return (self.loveFont:getWidth(text))
-end
-
-return Font
diff --git a/src/lib/luigi/backend/love/text.lua b/src/lib/luigi/backend/love/text.lua
deleted file mode 100644
index 86b9a6c..0000000
--- a/src/lib/luigi/backend/love/text.lua
+++ /dev/null
@@ -1,75 +0,0 @@
-local ROOT = (...):gsub('[^.]*.[^.]*.[^.]*$', '')
-local REL = (...):gsub('[^.]*$', '')
-
-local Multiline = require(ROOT .. 'multiline')
-
-local Text = setmetatable({}, { __call = function (self, ...)
-    local object = setmetatable({}, { __index = self })
-    return object, self.constructor(object, ...)
-end })
-
-local function renderSingle (self, x, y, font, text, color)
-    love.graphics.push('all')
-    love.graphics.setColor(color or { 0, 0, 0 })
-    love.graphics.setFont(font.loveFont)
-    love.graphics.print(text, math.floor(x), math.floor(y))
-    love.graphics.pop()
-
-    self.height = font:getLineHeight()
-    self.width = font:getAdvance(text)
-end
-
-local function renderMulti (self, x, y, font, text, color, align, limit)
-    local lines = Multiline.wrap(font, text, limit)
-    local lineHeight = font:getLineHeight()
-    local height = #lines * lineHeight
-
-    love.graphics.push('all')
-    love.graphics.setColor(color or { 0, 0, 0 })
-    love.graphics.setFont(font.loveFont)
-
-    for index, line in ipairs(lines) do
-        local text = table.concat(line)
-        local top = (index - 1) * lineHeight
-        local w = line.width
-
-        if align == 'left' then
-            love.graphics.print(text,
-                math.floor(x), math.floor(top + y))
-        elseif align == 'right' then
-            love.graphics.print(text,
-                math.floor(limit - w + x), math.floor(top + y))
-        elseif align == 'center' then
-            love.graphics.print(text,
-                math.floor((limit - w) / 2 + x), math.floor(top + y))
-        end
-    end
-
-    love.graphics.pop()
-
-    self.height = height
-    self.width = limit
-end
-
-function Text:constructor (font, text, color, align, limit)
-    if limit then
-        function self:draw (x, y)
-            return renderMulti(self, x, y, font, text, color, align, limit)
-        end
-    else
-        function self:draw (x, y)
-            return renderSingle(self, x, y, font, text, color)
-        end
-    end
-    self:draw(-1000000, -1000000)
-end
-
-function Text:getWidth ()
-    return self.width
-end
-
-function Text:getHeight ()
-    return self.height
-end
-
-return Text
diff --git a/src/lib/luigi/base.lua b/src/lib/luigi/base.lua
deleted file mode 100644
index 8663cb1..0000000
--- a/src/lib/luigi/base.lua
+++ /dev/null
@@ -1,13 +0,0 @@
-return {
-    extend = function (self, subtype)
-        return setmetatable(subtype or {}, {
-            __index = self,
-            __call = function (self, ...)
-                local instance = setmetatable({}, { __index = self })
-                return instance, instance:constructor(...)
-            end
-        })
-    end,
-    constructor = function () end,
-}
-
diff --git a/src/lib/luigi/engine/alpha.lua b/src/lib/luigi/engine/alpha.lua
deleted file mode 100644
index df565a5..0000000
--- a/src/lib/luigi/engine/alpha.lua
+++ /dev/null
@@ -1,251 +0,0 @@
-local RESOURCE = (...):gsub('%.', '/') .. '/'
-
-return function (config)
-    config = config or {}
-    local resources = assert(config.resources, 'missing config.resources')
-    local backColor = config.backColor or { 240, 240, 240 }
-    local lineColor = config.lineColor or { 220, 220, 220 }
-    local textColor = config.textColor or { 0, 0, 0 }
-    local highlight = config.highlight or { 0x19, 0xAE, 0xFF }
-
-    local button_pressed = resources .. 'button_pressed.png'
-    local button_focused = resources .. 'button_focused.png'
-    local button_hovered = resources .. 'button_hovered.png'
-    local button = resources .. 'button.png'
-
-    local check_checked_pressed = resources .. 'check_checked_pressed.png'
-    local check_unchecked_pressed = resources .. 'check_unchecked_pressed.png'
-    local check_checked_focused = resources .. 'check_checked_focused.png'
-    local check_unchecked_focused = resources .. 'check_unchecked_focused.png'
-    local check_checked = resources .. 'check_checked.png'
-    local check_unchecked = resources .. 'check_unchecked.png'
-
-    local radio_checked_pressed = resources .. 'radio_checked_pressed.png'
-    local radio_unchecked_pressed = resources .. 'radio_unchecked_pressed.png'
-    local radio_checked_focused = resources .. 'radio_checked_focused.png'
-    local radio_unchecked_focused = resources .. 'radio_unchecked_focused.png'
-    local radio_checked = resources .. 'radio_checked.png'
-    local radio_unchecked = resources .. 'radio_unchecked.png'
-
-    local triangle_left = resources .. 'triangle_left.png'
-    local triangle_up = resources .. 'triangle_up.png'
-    local triangle_right = resources .. 'triangle_right.png'
-    local triangle_down = resources .. 'triangle_down.png'
-
-    local text_focused = resources .. 'text_focused.png'
-    local text = resources .. 'text.png'
-
-    local function getButtonSlices (self)
-        return self.pressed.left and button_pressed
-            or self.focused and button_focused
-            or self.hovered and button_hovered
-            or button
-    end
-
-    local function getCheckIcon (self)
-        if self.pressed.left then
-            return self.value and check_checked_pressed
-                or check_unchecked_pressed
-        end
-        if self.focused then
-            return self.value and check_checked_focused
-                or check_unchecked_focused
-        end
-        return self.value and check_checked or check_unchecked
-    end
-
-    local function getControlHeight (self)
-        return self.flow == 'x' and self._defaultDimension
-    end
-
-    local function getControlWidth (self)
-        return self.flow ~= 'x' and self._defaultDimension
-    end
-
-    local function getMenuItemBackground (self)
-        return self.active and highlight
-    end
-
-    local function getRadioIcon (self)
-        if self.pressed.left then
-            return self.value and radio_checked_pressed
-                or radio_unchecked_pressed
-        end
-        if self.focused then
-            return self.value and radio_checked_focused
-                or radio_unchecked_focused
-        end
-        return self.value and radio_checked or radio_unchecked
-    end
-
-    local function getSashBackground (self)
-        return self.hovered and highlight or lineColor
-    end
-
-    local function getSashHeight (self)
-        return self.parent and self.parent.flow ~= 'x' and 4
-    end
-
-    local function getSashWidth (self)
-        return self.parent and self.parent.flow == 'x' and 4
-    end
-
-    local function getSliderThumbWidth (self)
-        return self.parent.flow == 'x' and 32 or false
-    end
-
-    local function getSliderThumbHeight (self)
-        return self.parent.flow ~= 'x' and 32 or false
-    end
-
-    local function getStepperBeforeIcon (self)
-        return self.parent.flow == 'x' and triangle_left or triangle_up
-    end
-
-    local function getStepperAfterIcon (self)
-        return self.parent.flow == 'x' and triangle_right or triangle_down
-    end
-
-    local function getTextSlices (self)
-        return self.focused and text_focused or text
-    end
-
-    return {
-
-        -- generic types for widgets to inherit
-
-        Control = {
-            flow = 'x',
-            height = getControlHeight,
-            width = getControlWidth,
-            color = textColor,
-            align = 'center middle',
-            margin = 2,
-            color = textColor,
-            solid = true,
-            _defaultDimension = 36,
-        },
-
-        Line = {
-            margin = 0,
-            padding = 4,
-            align = 'left middle',
-            _defaultDimension = 24,
-        },
-
-        -- widget types
-
-        button = {
-            type = { 'Control' },
-            padding = 6,
-            slices = getButtonSlices,
-            focusable = true,
-        },
-        check = {
-            type = { 'Line', 'Control' },
-            focusable = true,
-            icon = getCheckIcon,
-        },
-        label = {
-            type = { 'Line', 'Control' },
-        },
-        menu = {
-            flow = 'x',
-            height = 24,
-            background = backColor,
-            color = textColor,
-        },
-        ['menu.expander'] = {
-            icon = resources .. 'triangle_right.png',
-        },
-        ['menu.item'] = {
-            padding = 4,
-            height = 24,
-            align = 'left middle',
-            background = getMenuItemBackground,
-        },
-        panel = {
-            padding = 2,
-            background = backColor,
-            color = textColor,
-            solid = true,
-        },
-        progress = {
-            type = { 'Control' },
-            slices = resources .. 'button_pressed.png',
-        },
-        ['progress.bar'] = {
-            slices = resources .. 'progress.png',
-            minwidth = 12,
-            minheight = 22,
-        },
-        radio = {
-            type = { 'Line', 'Control' },
-            focusable = true,
-            icon = getRadioIcon,
-        },
-        sash = {
-            background = getSashBackground,
-            height = getSashHeight,
-            width = getSashWidth,
-        },
-        slider = {
-            type = { 'Control' },
-            slices = resources .. 'button_pressed.png',
-        },
-        ['slider.thumb'] = {
-            type = { 'button' },
-            align = 'middle center',
-            margin = 0,
-            width = getSliderThumbWidth,
-            height = getSliderThumbHeight,
-        },
-        status = {
-            type = { 'Line', 'Control' },
-            background = backColor,
-            color = textColor,
-        },
-        stepper = {
-            type = { 'Control' },
-            slices = resources .. 'button_pressed.png',
-        },
-        ['stepper.after'] = {
-            type = { 'button' },
-            icon = getStepperAfterIcon,
-            margin = 0,
-            minwidth = 32,
-            minheight = 32,
-        },
-        ['stepper.before'] = {
-            type = { 'button' },
-            icon = getStepperBeforeIcon,
-            margin = 0,
-            minwidth = 32,
-            minheight = 32,
-        },
-        ['stepper.item'] = {
-            align = 'center middle',
-            color = textColor,
-        },
-        ['stepper.view'] = {
-            margin = 4,
-        },
-        submenu = {
-            padding = 10,
-            margin = -10,
-            slices = resources .. 'submenu.png',
-            color = textColor,
-            solid = true,
-        },
-        text = {
-            type = { 'Control' },
-            align = 'left middle',
-            slices = getTextSlices,
-            padding = 6,
-            focusable = true,
-            cursor = 'ibeam',
-            highlight = highlight,
-        },
-    }
-
-end
diff --git a/src/lib/luigi/event.lua b/src/lib/luigi/event.lua
deleted file mode 100644
index 95af72e..0000000
--- a/src/lib/luigi/event.lua
+++ /dev/null
@@ -1,69 +0,0 @@
---[[--
-Event class.
-
-@classmod Event
---]]--
-
-local ROOT = (...):gsub('[^.]*$', '')
-
-local Base = require(ROOT .. 'base')
-local Hooker = require(ROOT .. 'hooker')
-
-local Event = Base:extend({ name = 'Event' })
-
-function Event:emit (target, data, defaultAction)
-    local callbacks = self.registry[target]
-    local result = callbacks and callbacks(data or {})
-    if result ~= nil then return result end
-    if defaultAction then defaultAction() end
-end
-
-function Event:bind (target, callback)
-    local registry = self.registry
-    return Hooker.hook(registry, target, callback)
-end
-
---[[--
-Event names.
---]]--
-Event.names = {
-    'Reshape', -- A widget is being reshaped.
-    'PreDisplay', -- A widget is about to be drawn.
-    'Display', -- A widget was drawn.
-    'KeyPress', -- A keyboard key was pressed.
-    'KeyRelease', -- A keyboard key was released.
-    'TextInput', -- Text was entered.
-    'Move', -- The cursor moved, and no button was pressed.
-    'Focus', -- A widget received focus.
-    'Blur', -- A widget lost focus.
-    'Enter', -- The cursor entered a widget, and no button was pressed.
-    'Leave', -- The cursor left a widget, and no button was pressed.
-    'PressEnter', -- The cursor entered a widget, and a button was pressed.
-    'PressLeave', -- The cursor left a widget, and a button was pressed.
-    'PressStart', -- A pointer button or keyboard shortcut was pressed.
-    'PressEnd', -- A pointer button or keyboard shortcut was released.
-    'PressDrag', -- A pressed cursor moved; targets originating widget.
-    'PressMove', -- A pressed cursor moved; targets widget at cursor position.
-    'Press', -- A pointer button was pressed and released on the same widget.
-    'Change', -- A widget's value changed.
-    'WheelMove', -- The scroll wheel on the mouse moved.
-    'Show', -- A layout is shown.
-    'Hide', -- A layout is hidden.
-}
-
-local weakKeyMeta = { __mode = 'k' }
-
-for i, name in ipairs(Event.names) do
-    Event[name] = Event:extend({
-        name = name,
-        registry = setmetatable({}, weakKeyMeta),
-    })
-end
-
-function Event.injectBinders (t)
-    for i, name in ipairs(Event.names) do
-        t['on' .. name] = function (...) return Event[name]:bind(...) end
-    end
-end
-
-return Event
diff --git a/src/lib/luigi/hooker.lua b/src/lib/luigi/hooker.lua
deleted file mode 100644
index 44d3312..0000000
--- a/src/lib/luigi/hooker.lua
+++ /dev/null
@@ -1,91 +0,0 @@
-local Hooker = {}
-
-local wrapped = setmetatable({}, { __mode = 'k' })
-
-local hooks = setmetatable({}, { __mode = 'k' })
-
-local function unhook (item)
-    if item.prev then
-        item.prev.next = item.next
-    end
-
-    if item.next then
-        item.next.prev = item.prev
-    end
-
-    if hooks[item.host][item.key] == item then
-        hooks[item.host][item.key] = item.next
-    end
-end
-
-local function hook (host, key, func, atEnd)
-    if not func then
-        return
-    end
-
-    if not hooks[host] then
-        hooks[host] = {}
-    end
-
-    local current = hooks[host][key]
-    local item = {
-        next = not atEnd and current or nil,
-        unhook = unhook,
-        host = host,
-        key = key,
-        func = func,
-    }
-
-    if atEnd then
-        if current then
-            while current.next do
-                current = current.next
-            end
-            current.next = item
-            item.prev = current
-        else
-            hooks[host][key] = item
-        end
-        return item
-    end
-
-    if current then
-        current.prev = item
-    end
-
-    hooks[host][key] = item
-
-    return item
-end
-
-function Hooker.unhook (item)
-    return unhook(item)
-end
-
-function Hooker.hook (host, key, func, atEnd)
-    if not wrapped[host] then
-        wrapped[host] = {}
-    end
-
-    if not wrapped[host][key] then
-        wrapped[host][key] = true
-
-        hook(host, key, host[key])
-
-        host[key] = function (...)
-            local item = hooks[host][key]
-
-            while item do
-                local result = item.func(...)
-                if result ~= nil then
-                    return result
-                end
-                item = item.next
-            end -- while
-        end -- function
-    end -- if
-
-    return hook(host, key, func, atEnd)
-end
-
-return Hooker
diff --git a/src/lib/luigi/input.lua b/src/lib/luigi/input.lua
deleted file mode 100644
index 981c44e..0000000
--- a/src/lib/luigi/input.lua
+++ /dev/null
@@ -1,232 +0,0 @@
-local ROOT = (...):gsub('[^.]*$', '')
-
-local Backend = require(ROOT .. 'backend')
-local Base = require(ROOT .. 'base')
-local Event = require(ROOT .. 'event')
-local Shortcut = require(ROOT .. 'shortcut')
-
-local Input = Base:extend()
-
-local weakValueMeta = { __mode = 'v' }
-
-function Input:constructor ()
-    self.pressedWidgets = setmetatable({}, weakValueMeta)
-    self.passedWidgets = setmetatable({}, weakValueMeta)
-end
-
-function Input:handleDisplay (layout)
-    local root = layout.root
-    if root then root:paint() end
-    Event.Display:emit(layout)
-end
-
-function Input:handleKeyPress (layout, key, sc, x, y)
-    local widget = layout.focusedWidget or layout.root
-    local result = widget:bubbleEvent('KeyPress', {
-        key = key,
-        scanCode = sc,
-        modifierFlags = Shortcut.getModifierFlags(),
-        x = x, y = y
-    })
-    if result ~= nil then return result end
-    if layout.root.modal then return false end
-end
-
-function Input:handleKeyRelease (layout, key, sc, x, y)
-    local widget = layout.focusedWidget or layout.root
-    local result = widget:bubbleEvent('KeyRelease', {
-        key = key,
-        scanCode = sc,
-        modifierFlags = Shortcut.getModifierFlags(),
-        x = x, y = y
-    })
-    if result ~= nil then return result end
-    if layout.root.modal then return false end
-end
-
-function Input:handleTextInput (layout, text, x, y)
-    local widget = layout.focusedWidget or layout.root
-    local result = widget:bubbleEvent('TextInput', {
-        text = text,
-        x = x, y = y
-    })
-    if result ~= nil then return result end
-    if layout.root.modal then return false end
-end
-
-local function checkHit (widget, layout)
-    local root = layout.root
-    return widget and widget.solid or root.modal, widget or root
-end
-
-function Input:handleMove (layout, x, y)
-    local hit, widget = checkHit(layout:getWidgetAt(x, y), layout)
-    local previousWidget = self.previousMoveWidget
-    if widget ~= previousWidget then
-        if previousWidget then
-            for ancestor in previousWidget:eachAncestor(true) do
-                ancestor.hovered = nil
-            end
-        end
-        for ancestor in widget:eachAncestor(true) do
-            ancestor.hovered = true
-        end
-    end
-    widget:bubbleEvent('Move', {
-        hit = hit,
-        oldTarget = previousWidget,
-        x = x, y = y
-    })
-    if widget ~= previousWidget then
-        if previousWidget then
-            previousWidget:bubbleEvent('Leave', {
-                hit = hit,
-                newTarget = widget,
-                x = x, y = y
-            })
-        end
-        widget:bubbleEvent('Enter', {
-            hit = hit,
-            oldTarget = previousWidget,
-            x = x, y = y
-        })
-        if widget.cursor then
-            Backend.setCursor(Backend.getSystemCursor(widget.cursor))
-        else
-            Backend.setCursor()
-        end
-        self.previousMoveWidget = widget
-    end
-    return hit
-end
-
-function Input:handlePressedMove (layout, x, y)
-    local hit, widget = checkHit(layout:getWidgetAt(x, y), layout)
-    for _, button in ipairs { 'left', 'middle', 'right' } do
-        local originWidget = self.pressedWidgets[button]
-        if originWidget then
-            local passedWidget = self.passedWidgets[button]
-            originWidget:bubbleEvent('PressDrag', {
-                hit = hit,
-                newTarget = widget,
-                button = button,
-                x = x, y = y
-            })
-            if (widget == passedWidget) then
-                widget:bubbleEvent('PressMove', {
-                    hit = hit,
-                    origin = originWidget,
-                    button = button,
-                    x = x, y = y
-                })
-            else
-                originWidget.pressed[button] = (widget == originWidget) or nil
-                if passedWidget then
-                    passedWidget:bubbleEvent('PressLeave', {
-                        hit = hit,
-                        newTarget = widget,
-                        origin = originWidget,
-                        button = button,
-                        x = x, y = y
-                    })
-                end
-                widget:bubbleEvent('PressEnter', {
-                    hit = hit,
-                    oldTarget = passedWidget,
-                    origin = originWidget,
-                    button = button,
-                    x = x, y = y
-                })
-                self.passedWidgets[button] = widget
-            end
-        end -- if originWidget
-    end -- mouse buttons
-    return hit
-end
-
-function Input:handlePressStart (layout, button, x, y, widget, shortcut)
-    local hit, widget = checkHit(widget or layout:getWidgetAt(x, y), layout)
-    -- if hit then
-        self.pressedWidgets[button] = widget
-        self.passedWidgets[button] = widget
-        widget.pressed[button] = true
-        if button == 'left' then
-            widget:focus()
-        end
-    -- end
-    widget:bubbleEvent('PressStart', {
-        hit = hit,
-        button = button,
-        shortcut = shortcut,
-        x = x, y = y
-    })
-    return hit
-end
-
-function Input:handlePressEnd (layout, button, x, y, widget, shortcut)
-    local originWidget = widget or self.pressedWidgets[button]
-    if not originWidget then return end
-    local hit, widget = checkHit(widget or layout:getWidgetAt(x, y), layout)
-    local wasPressed = originWidget.pressed[button]
-    if hit then
-        originWidget.pressed[button] = nil
-    end
-    widget:bubbleEvent('PressEnd', {
-        hit = hit,
-        origin = originWidget,
-        shortcut = shortcut,
-        button = button,
-        x = x, y = y
-    })
-    if (widget == originWidget and wasPressed) then
-        widget:bubbleEvent('Press', {
-            hit = hit,
-            button = button,
-            shortcut = shortcut,
-            x = x, y = y
-        })
-    end
-    if hit then
-        self.pressedWidgets[button] = nil
-        self.passedWidgets[button] = nil
-    end
-    return hit
-end
-
-function Input:handleReshape (layout, width, height)
-    local root = layout.root
-
-    root:reshape()
-
-    if root.type ~= 'window' then -- FIXME: move stuff below to a Widget method
-        if not root.width then
-            root.dimensions.width = width
-        end
-        if not root.height then
-            root.dimensions.height = height
-        end
-    end
-
-    Event.Reshape:emit(layout, {
-        target = layout,
-        width = width,
-        height = height
-    })
-end
-
-function Input:handleWheelMove (layout, scrollX, scrollY)
-    local x, y = Backend.getMousePosition()
-    local hit, widget = checkHit(layout:getWidgetAt(x, y), layout)
-
-    widget:bubbleEvent('WheelMove', {
-        hit = hit,
-        x = x, y = y,
-        scrollX = scrollX, scrollY = scrollY
-    })
-
-    return hit
-end
-
-Input.default = Input()
-
-return Input
diff --git a/src/lib/luigi/launch.lua b/src/lib/luigi/launch.lua
deleted file mode 100644
index 29259fa..0000000
--- a/src/lib/luigi/launch.lua
+++ /dev/null
@@ -1,54 +0,0 @@
---[[--
-Launcher for the LuaJIT backend.
-
-Looks for main.lua. Launch it like this:
-
-    luajit myapp/lib/luigi/launch.lua
-
-If luigi isn't inside the project directory, pass
-the path containing main.lua as the second argument.
-The path must end with a directory separator.
-
-    luajit /opt/luigi/launch.lua ./myapp/
-
-If the app prefixes luigi modules with something
-other then 'luigi', pass that prefix as the third
-argument.
-
-    luajit /opt/luigi/launch.lua ./myapp/ lib.luigi
-
---]]--
-local packagePath = package.path
-local libRoot = arg[0]:gsub('[^/\\]*%.lua$', '')
-local appRoot, modPath = ...
-
-local function run (appRoot, modPath)
-    package.path = packagePath .. ';' .. appRoot .. '?.lua'
-    rawset(_G, 'LUIGI_APP_ROOT', appRoot)
-    require 'main'
-    require (modPath .. '.backend').run()
-end
-
--- expect to find main.lua in appRoot if specified
-if appRoot then
-    return run(appRoot, modPath or 'luigi')
-end
-
--- try to find main.lua in a parent of this library, recursively.
-local lastLibRoot = libRoot
-repeat
-    if io.open(libRoot .. 'main.lua') then
-        return run(libRoot, modPath)
-    end
-    lastLibRoot = libRoot
-    libRoot = libRoot:gsub('([^/\\]*).$', function (m)
-        modPath = modPath and (m .. '.' .. modPath) or m
-        return ''
-    end)
-until libRoot == lastLibRoot
-
-error 'main.lua not found'
-
-
-
-
diff --git a/src/lib/luigi/layout.lua b/src/lib/luigi/layout.lua
deleted file mode 100644
index 322218c..0000000
--- a/src/lib/luigi/layout.lua
+++ /dev/null
@@ -1,444 +0,0 @@
---[[--
-A Layout contains a tree of widgets with a single `root` widget.
-
-Layouts will resize to fit the window unless a `top` or `left`
-property is found in the root widget.
-
-Layouts are drawn in the order that they were shown, so the
-most recently shown layout shown will always appear on top.
-
-Other events are sent to layouts in the opposite direction,
-and are trapped by the first layout that can handle the event
-(for example, the topmost layer that is focused or hovered).
-
-@classmod Layout
---]]--
-
-local ROOT = (...):gsub('[^.]*$', '')
-
-local Backend = require(ROOT .. 'backend')
-local Base = require(ROOT .. 'base')
-local Event = require(ROOT .. 'event')
-local Widget = require(ROOT .. 'widget')
-local Input = require(ROOT .. 'input')
-local Style = require(ROOT .. 'style')
-
-local Layout = Base:extend()
-
-Layout.isLayout = true
-
---[[--
-Layout constructor.
-
-@function Luigi.Layout
-
-@tparam table data
-A tree of widget data.
-
-@treturn Layout
-A Layout instance.
---]]--
-function Layout:constructor (data, master)
-    data = data or {}
-
-    if master then
-        self:setMaster(master)
-    else
-        self:setTheme(require(ROOT .. 'theme.light'))
-        self:setStyle()
-    end
-
-    self:addDefaultHandlers()
-
-    self.hooks = {}
-    self.isShown = false
-    self.root = data
-
-    Widget(self, data)
-
-    self.isReady = true
-end
-
---[[--
-Create a detached widget.
-
-Internal function used to create widgets that are associated with
-a layout, but "detached" from it.
-
-Used by context menus, which use their "owner" widget's layout
-for theme and style information but appear in a separate layout.
-
-@tparam table data
-A tree of widget data.
-
-@treturn Widget
-A widget instance.
---]]--
-function Layout:createWidget (data)
-    return Widget(self, data)
-end
-
-local function clearWidget (widget)
-    widget.textData = nil
-    widget.fontData = nil
-    widget.position = {}
-    widget.dimensions = {}
-    widget.type = widget.type
-    for _, child in ipairs(widget) do
-        clearWidget(child)
-    end
-    local items = widget.items
-    if items then
-        for _, item in ipairs(items) do
-            clearWidget(item)
-        end
-    end
-end
-
-local function reset (self)
-    if not self.root then return end
-    clearWidget(self.root)
-end
-
---[[--
-Set the master layout for this layout.
-
-This layout's theme and style will be set the same as the master layout, and
-widgets added to this layout will be indexed and keyboard-accelerated by the
-master layout instead of this layout.
-
-@tparam Layout layout
-Master layout
-
-@treturn Layout Self
---]]--
-function Layout:setMaster (layout)
-    self.master = layout
-
-    reset(self)
-    return self
-end
-
---[[--
-Set the style from a definition table or function.
-
-@tparam table|function rules
-Style definition.
-
-@treturn Layout Self
---]]--
-function Layout:setStyle (rules)
-    if type(rules) == 'function' then
-        rules = rules()
-    end
-    self.style = Style(rules or {}, { 'style' })
-
-    reset(self)
-    return self
-end
-
---[[--
-Set the theme from a definition table or function.
-
-@tparam table|function rules
-Theme definition.
---]]--
-function Layout:setTheme (rules)
-    if type(rules) == 'function' then
-        rules = rules()
-    end
-    self.theme = Style(rules or {}, { 'type' })
-    reset(self)
-    return self
-end
-
---[[--
-Get the style from master layout or this layout.
-
-@treturn table
-Style table.
---]]--
-function Layout:getStyle ()
-    return self.master and self.master:getStyle() or self.style
-end
-
---[[--
-Get the theme from master layout or this layout.
-
-@treturn table
-Theme table.
---]]--
-function Layout:getTheme ()
-    return self.master and self.master:getTheme() or self.theme
-end
-
---[[--
-Show the layout.
-
-Hooks all appropriate Love events and callbacks.
-
-@treturn Layout
-Return this layout for chaining.
---]]--
-function Layout:show ()
-    if self.isShown then
-        Backend.hide(self)
-        self.isShown = nil
-    end
-
-    self.isShown = true
-
-    if not self.input then
-        self.input = Input.default -- Input(self)
-    end
-
-    Backend.show(self)
-    self.root:reshape()
-
-    Event.Show:emit(self, self)
-    return self
-end
-
---[[--
-Hide the layout.
-
-Unhooks Love events and callbacks.
-
-@treturn Layout
-Return this layout for chaining.
---]]--
-function Layout:hide ()
-    if not self.isShown then
-        return
-    end
-    self.isShown = nil
-    Backend.hide(self)
-
-    Event.Hide:emit(self, self)
-    return self
-end
-
---[[--
-Focus next focusable widget.
-
-Traverses widgets using Widget:getNextNeighbor until a focusable widget is
-found, and focuses that widget.
-
-@treturn Widget
-The widget that was focused, or nil
---]]--
-function Layout:focusNextWidget ()
-    local widget = self.focusedWidget or self.root
-    local nextWidget = widget:getNextNeighbor()
-
-    while nextWidget ~= widget do
-        if nextWidget:focus() then return nextWidget end
-        nextWidget = nextWidget:getNextNeighbor()
-    end
-end
-
---[[--
-Focus previous focusable widget.
-
-Traverses widgets using Widget:getPreviousNeighbor until a focusable widget is
-found, and focuses that widget.
-
-@treturn Widget
-The widget that was focused, or nil
---]]--
-function Layout:focusPreviousWidget ()
-    local widget = self.focusedWidget or self.root
-    local previousWidget = widget:getPreviousNeighbor()
-
-    while previousWidget ~= widget do
-        if previousWidget:focus() then return previousWidget end
-        previousWidget = previousWidget:getPreviousNeighbor()
-    end
-end
-
---[[--
-Get the innermost widget at given coordinates.
-
-@tparam number x
-Number of pixels from window's left edge.
-
-@tparam number y
-Number of pixels from window's top edge.
-
-@tparam[opt] Widget root
-Widget to search within, defaults to layout root.
---]]--
-function Layout:getWidgetAt (x, y, root)
-    if not root then
-        root = self.root
-    end
-    -- Loop through in reverse, because siblings defined later in the tree
-    -- will overdraw earlier siblings.
-    for i = #root, 1, -1 do
-        local child = root[i]
-        if child:isAt(x, y) then
-            local inner = self:getWidgetAt(x, y, child)
-            if inner then return inner end
-        end
-    end
-
-    if root:isAt(x, y) then return root end
-end
-
---[[--
-Place a layout near a point or rectangle.
-
-@tparam number left
-Number of pixels from window's left edge.
-
-@tparam number top
-Number of pixels from window's top edge.
-
-@tparam[opt] number width
-Width of the rectangle to place layout outside of, defaults to 0.
-
-@tparam[opt] number height
-Height of the rectangle to place layout outside of, defaults to 0.
-
-@treturn Layout
-Return this layout for chaining.
---]]--
-function Layout:placeNear (left, top, width, height)
-    width, height = width or 0, height or 0
-    local root = self.root
-    -- place to the left if there's no room to the right
-    local layoutWidth = root:getWidth()
-    local windowWidth, windowHeight = Backend.getWindowSize()
-    if left + width + layoutWidth > windowWidth then
-        left = left - layoutWidth - width
-    else
-        left = left + width
-    end
-    -- place above if there's no room below
-    local layoutHeight = root:getHeight()
-    if top + height + layoutHeight > windowHeight then
-        top = top - layoutHeight - height
-    else
-        top = top + height
-    end
-    root.left = left
-    root.top = top
-end
-
-
--- Add handlers for keyboard shortcuts, tab focus, and mouse wheel scroll
-function Layout:addDefaultHandlers ()
-    self.shortcuts = {}
-
-    for i = 0, 15 do
-        self.shortcuts[i] = {}
-    end
-
-    self.behavior = {}
-
-    local function createBehavior (name, hooks)
-        self.behavior[name] = hooks
-        function hooks.destroy ()
-            for _, hook in ipairs(hooks) do
-                hook:unhook()
-            end
-            self.behavior[name] = nil
-        end
-    end
-
-    createBehavior('context', {
-        self:onPressStart(function (event)
-            -- show context menu on right click
-            if event.button ~= 'right' then return end
-            local menu = event.target.context
-            if not menu then return end
-            menu:bubbleEvent('PressStart', event)
-            -- make sure it fits in the window
-            -- TODO: open in a new borderless window under SDL?
-            menu.menuLayout:placeNear(event.x - 1, event.y - 1, 2, 2)
-            return false
-        end)
-    })
-
-    createBehavior('shortcut', {
-        self:onKeyPress(function (event)
-            local entry = self.shortcuts[event.modifierFlags]
-            local widget = entry and entry[event.key]
-            if not widget then return end
-            widget.hovered = true
-            self.input:handlePressStart(self, 'left', event.x, event.y,
-                widget, widget.shortcut)
-            return false
-        end),
-
-        self:onKeyRelease(function (event)
-            local entry = self.shortcuts[event.modifierFlags]
-            local widget = entry and entry[event.key]
-            if not widget then return end
-            widget.hovered = false
-            self.input:handlePressEnd(self, 'left', event.x, event.y,
-                widget, widget.shortcut)
-            return false
-        end)
-    })
-
-    createBehavior('navigate', {
-        self:onKeyPress(function (event)
-            -- tab/shift-tab cycles focused widget
-            if event.key == 'tab' then
-                if Backend.isKeyDown('lshift', 'rshift') then
-                    self:focusPreviousWidget()
-                else
-                    self:focusNextWidget()
-                end
-                return false
-            end
-
-            -- space/enter presses focused widget
-            local widget = self.focusedWidget
-            if widget and event.key == 'space' or event.key == ' '
-            or event.key == 'return' then
-                self.input:handlePressStart(self, 'left', event.x, event.y,
-                    widget, event.key)
-                return false
-            end
-        end),
-
-        self:onKeyRelease(function (event)
-            -- space / enter presses focused widget
-            local widget = self.focusedWidget
-            if widget and event.key == 'space' or event.key == ' '
-            or event.key == 'return' then
-                self.input:handlePressEnd(self, 'left', event.x, event.y,
-                    widget, event.key)
-                return false
-            end
-        end)
-    })
-
-    createBehavior('scroll', {
-        self:onWheelMove(function (event)
-            if not event.hit then return end
-            local amount = event.scrollY ~= 0 and event.scrollY or event.scrollX
-            for widget in event.target:eachAncestor(true) do
-                if widget:scrollBy(amount) then return false end
-            end -- ancestor loop
-            return false
-        end) -- wheel move
-    })
-
-    createBehavior('status', {
-        self:onEnter(function (event)
-            local statusWidget = (self.master or self).statusWidget
-            if not statusWidget then return end
-
-            statusWidget.text = event.target.status
-            return false
-        end)
-    })
-
-end
-
-Event.injectBinders(Layout)
-
-return Layout
diff --git a/src/lib/luigi/mosaic.lua b/src/lib/luigi/mosaic.lua
deleted file mode 100644
index f01e688..0000000
--- a/src/lib/luigi/mosaic.lua
+++ /dev/null
@@ -1,110 +0,0 @@
---[[--
-Mosiac, drawable class for 9-slice images.
-
-@classmod Mosiac
---]]--
-local ROOT = (...):gsub('[^.]*$', '')
-
-local Backend = require(ROOT .. 'backend')
-local Base = require(ROOT .. 'base')
-
-local Mosaic = Base:extend()
-
-local imageCache = {}
-local sliceCache = {}
-
-local function loadImage (path)
-    if not imageCache[path] then
-        imageCache[path] = Backend.Image(path)
-    end
-
-    return imageCache[path]
-end
-
-function Mosaic.fromWidget (widget)
-    local mosaic = widget.mosaic
-    if mosaic and mosaic.slicePath == widget.slices then
-        return mosaic
-    end
-    if widget.slices then
-        widget.mosaic = Mosaic(widget.slices)
-        return widget.mosaic
-    end
-end
-
-function Mosaic:constructor (path)
-    local slices = self:loadSlices(path)
-    self.batch = Backend.SpriteBatch(slices.image)
-    self.slices = slices
-    self.slicePath = path
-end
-
-function Mosaic:setRectangle (x, y, w, h)
-    if self.x == x and self.y == y and self.width == w and self.height == h then
-        self.needsRefresh = false
-        return
-    end
-    self.needsRefresh = true
-    self.x, self.y, self.width, self.height = x, y, w, h
-end
-
-function Mosaic:loadSlices (path)
-    local slices = sliceCache[path]
-
-    if not slices then
-        slices = {}
-        sliceCache[path] = slices
-        local image = loadImage(path)
-        local iw, ih = image:getWidth(), image:getHeight()
-        local w, h = math.floor(iw / 3), math.floor(ih / 3)
-        local Quad = Backend.Quad
-
-        slices.image = image
-        slices.width = w
-        slices.height = h
-
-        slices.topLeft = Quad(0, 0, w, h, iw, ih)
-        slices.topCenter = Quad(w, 0, w, h, iw, ih)
-        slices.topRight = Quad(iw - w, 0, w, h, iw, ih)
-        slices.middleLeft = Quad(0, h, w, h, iw, ih)
-        slices.middleCenter = Quad(w, h, w, h, iw, ih)
-        slices.middleRight = Quad(iw - w, h, w, h, iw, ih)
-        slices.bottomLeft = Quad(0, ih - h, w, h, iw, ih)
-        slices.bottomCenter = Quad(w, ih - h, w, h, iw, ih)
-        slices.bottomRight = Quad(iw - w, ih - h, w, h, iw, ih)
-    end
-
-    return slices
-end
-
-function Mosaic:draw ()
-    local batch = self.batch
-
-    if not self.needsRefresh then
-        Backend.draw(batch)
-        return
-    end
-    self.needsRefresh = false
-
-    local x, y, w, h = self.x, self.y, self.width, self.height
-    local slices = self.slices
-    local sw, sh = slices.width, slices.height
-    local xs = (w - sw * 2) / sw -- x scale
-    local ys = (h - sh * 2) / sh -- y scale
-
-    batch:clear()
-
-    batch:add(slices.middleCenter, x + sw, y + sh, 0, xs, ys)
-    batch:add(slices.topCenter, x + sw, y, 0, xs, 1)
-    batch:add(slices.bottomCenter, x + sw, y + h - sh, 0, xs, 1)
-    batch:add(slices.middleLeft, x, y + sh, 0, 1, ys)
-    batch:add(slices.middleRight, x + w - sw, y + sh, 0, 1, ys)
-    batch:add(slices.topLeft, x, y)
-    batch:add(slices.topRight, x + w - sw, y)
-    batch:add(slices.bottomLeft, x, y + h - sh)
-    batch:add(slices.bottomRight, x + w - sw, y + h - sh)
-
-    Backend.draw(batch)
-end
-
-return Mosaic
diff --git a/src/lib/luigi/multiline.lua b/src/lib/luigi/multiline.lua
deleted file mode 100644
index 9340b76..0000000
--- a/src/lib/luigi/multiline.lua
+++ /dev/null
@@ -1,57 +0,0 @@
-local Multiline = {}
-
-function Multiline.wrap (font, text, limit)
-    local lines = {{ width = 0 }}
-    local advance = 0
-    local lastSpaceAdvance = 0
-
-    local function append (word, space)
-        local wordAdvance = font:getAdvance(word)
-        local spaceAdvance = font:getAdvance(space)
-        local words = lines[#lines]
-        if advance + wordAdvance > limit then
-            words.width = (words.width or 0) - lastSpaceAdvance
-            advance = wordAdvance + spaceAdvance
-            lines[#lines + 1] = { width = advance, word, space }
-        else
-            advance = advance + wordAdvance + spaceAdvance
-            words.width = advance
-            words[#words + 1] = word
-            words[#words + 1] = space
-        end
-        lastSpaceAdvance = spaceAdvance
-    end
-
-    local function appendFrag (frag, isFirst)
-        if isFirst then
-            append(frag, '')
-        else
-            local wordAdvance = font:getAdvance(frag)
-            lines[#lines + 1] = { width = wordAdvance, frag }
-            advance = wordAdvance
-        end
-    end
-
-    local leadSpace = text:match '^ +'
-
-    if leadSpace then
-        append('', leadSpace)
-    end
-
-    for word, space in text:gmatch '([^ ]+)( *)' do
-        if word:match '\n' then
-            local isFirst = true
-            for frag in (word .. '\n'):gmatch '([^\n]*)\n' do
-                appendFrag(frag, isFirst)
-                isFirst = false
-            end
-            append('', space)
-        else
-            append(word, space)
-        end
-    end
-
-    return lines
-end
-
-return Multiline
diff --git a/src/lib/luigi/painter.lua b/src/lib/luigi/painter.lua
deleted file mode 100644
index c6281de..0000000
--- a/src/lib/luigi/painter.lua
+++ /dev/null
@@ -1,237 +0,0 @@
-local ROOT = (...):gsub('[^.]*$', '')
-
-local Backend = require(ROOT .. 'backend')
-local Base = require(ROOT .. 'base')
-local Event = require(ROOT .. 'event')
-local Mosaic = require(ROOT .. 'mosaic')
-local Text = Backend.Text
-
-local Painter = Base:extend()
-
-local imageCache = {}
--- local sliceCache = {}
-
-function Painter:constructor (widget)
-    self.widget = widget
-end
-
-function Painter:loadImage (path)
-    if not imageCache[path] then
-        imageCache[path] = Backend.Image(path)
-    end
-
-    return imageCache[path]
-end
-
-function Painter:paintSlices ()
-    local widget = self.widget
-    local mosaic = Mosaic.fromWidget(widget)
-    if not mosaic then return end
-    local x, y, w, h = widget:getRectangle(true)
-    mosaic:setRectangle(x, y, w, h)
-    mosaic:draw()
-end
-
-function Painter:paintBackground ()
-    local widget = self.widget
-    if not widget.background then return end
-    local x, y, w, h = widget:getRectangle(true)
-
-    Backend.push()
-    Backend.setColor(widget.background)
-    Backend.drawRectangle('fill', x, y, w, h)
-    Backend.pop()
-end
-
-function Painter:paintOutline ()
-    local widget = self.widget
-    if not widget.outline then return end
-    local x, y, w, h = widget:getRectangle(true)
-
-    Backend.push()
-    Backend.setColor(widget.outline)
-    Backend.drawRectangle('line', x + 0.5, y + 0.5, w, h)
-    Backend.pop()
-end
-
--- returns icon coordinates and rectangle with remaining space
-function Painter:positionIcon (x1, y1, x2, y2)
-    local widget = self.widget
-    if not widget.icon then
-        return nil, nil, x1, y1, x2, y2
-    end
-
-    local icon = self:loadImage(widget.icon)
-    local iconWidth, iconHeight = icon:getWidth(), icon:getHeight()
-    local align = widget.align or ''
-    local padding = widget.padding or 0
-    local x, y
-
-    -- horizontal alignment
-    if align:find('right') then
-        x = x2 - iconWidth
-        x2 = x2 - iconWidth - padding
-    elseif align:find('center') then
-        x = x1 + (x2 - x1) / 2 - iconWidth / 2
-    else -- if align:find('left') then
-        x = x1
-        x1 = x1 + iconWidth + padding
-    end
-
-    -- vertical alignment
-    if align:find('bottom') then
-        y = y2 - iconHeight
-    elseif align:find('middle') then
-        y = y1 + (y2 - y1) / 2 - iconHeight / 2
-    else -- if align:find('top') then
-        y = y1
-    end
-
-    return x, y, x1, y1, x2, y2
-end
-
--- returns text coordinates
-function Painter:positionText (x1, y1, x2, y2)
-    local widget = self.widget
-    if not widget.text or x1 >= x2 then
-        return nil, nil, x1, y1, x2, y2
-    end
-
-    local font = widget:getFont()
-    local align = widget.align or ''
-    local horizontal = 'left'
-
-    -- horizontal alignment
-    if align:find 'right' then
-        horizontal = 'right'
-    elseif align:find 'center' then
-        horizontal = 'center'
-    elseif align:find 'justify' then
-        horizontal = 'justify'
-    end
-
-    if not widget.textData then
-        local limit = widget.wrap and x2 - x1 or nil
-        widget.textData = Text(
-            font, widget.text, widget.color, horizontal, limit)
-    end
-
-    local textHeight = widget.textData:getHeight()
-    local y
-
-    -- vertical alignment
-    if align:find('bottom') then
-        y = y2 - textHeight
-    elseif align:find('middle') then
-        y = y2 - (y2 - y1) / 2 - textHeight / 2
-    else -- if align:find('top') then
-        y = y1
-    end
-
-    return font, x1, y
-end
-
-function Painter:paintIconAndText ()
-    local widget = self.widget
-    if not (widget.icon or widget.text) then return end
-    local x, y, w, h = widget:getRectangle(true, true)
-    if w < 1 or h < 1 then return end
-
-    -- calculate position for icon and text based on alignment and padding
-    local iconX, iconY, x1, y1, x2, y2 = self:positionIcon(x, y, x + w, y + h)
-    local font, textX, textY = self:positionText(x1, y1, x2, y2)
-
-    local icon = widget.icon and self:loadImage(widget.icon)
-    local text = widget.text
-    local align = widget.align or ''
-    local padding = widget.padding or 0
-
-    -- if aligned center, icon displays above the text
-    -- reposition icon and text for proper vertical alignment
-    if icon and text and align:find('center') then
-        local iconHeight = icon:getHeight()
-
-        if align:find 'middle' then
-            local textHeight = widget.textData:getHeight()
-            local contentHeight = textHeight + padding + iconHeight
-            local offset = (h - contentHeight) / 2
-            iconY = y + offset
-            textY = y + offset + padding + iconHeight
-        elseif align:find 'top' then
-            iconY = y
-            textY = y + padding + iconHeight
-        else -- if align:find 'bottom'
-            local textHeight = widget.textData:getHeight()
-            textY = y + h - textHeight
-            iconY = textY - padding - iconHeight
-        end
-    end
-
-    -- horizontal alignment for non-wrapped text
-    -- TODO: handle this in Backend.Text
-    if text and not widget.wrap then
-        if align:find 'right' then
-            textX = textX + (w - widget.textData:getWidth())
-        elseif align:find 'center' then
-            textX = textX + (w - widget.textData:getWidth()) / 2
-        end
-    end
-
-    Backend.push()
-
-    Backend.intersectScissor(x, y, w, h)
-
-    -- draw the icon
-    if icon then
-        iconX, iconY = math.floor(iconX), math.floor(iconY)
-        Backend.draw(icon, iconX, iconY)
-    end
-
-    -- draw the text
-    if text and textX and textY and w > 1 then
-        widget.innerHeight = textY - y + widget.textData:getHeight()
-        widget.innerWidth = textX - x + widget.textData:getWidth()
-        textX = math.floor(textX - (widget.scrollX or 0))
-        textY = math.floor(textY - (widget.scrollY or 0))
-        Backend.draw(widget.textData, textX, textY)
-    end
-
-    Backend.pop()
-end
-
-function Painter:paintChildren ()
-    for i, child in ipairs(self.widget) do
-        child:paint()
-    end
-end
-
-function Painter:paint ()
-    local widget = self.widget
-    local x, y, w, h = widget:getRectangle()
-
-    -- if the drawable area has no width or height, don't paint
-    if w < 1 or h < 1 then return end
-
-    Event.PreDisplay:emit(widget, { target = widget }, function()
-
-        Backend.push()
-
-        if widget.parent then
-            Backend.intersectScissor(x, y, w, h)
-        else
-            Backend.setScissor()
-        end
-
-        self:paintBackground()
-        self:paintOutline()
-        self:paintSlices()
-        self:paintIconAndText()
-        self:paintChildren()
-
-        Backend.pop()
-
-    end)
-    Event.Display:emit(widget, { target = widget })
-end
-
-return Painter
diff --git a/src/lib/luigi/shortcut.lua b/src/lib/luigi/shortcut.lua
deleted file mode 100644
index 6fa8b32..0000000
--- a/src/lib/luigi/shortcut.lua
+++ /dev/null
@@ -1,99 +0,0 @@
---[[--
-Keyboard shortcut module.
---]]--
-
-local ROOT = (...):gsub('[^.]*$', '')
-
-local Backend = require(ROOT .. 'backend')
-
-local Shortcut = {}
-
-local isMac = Backend.isMac()
-
-local ALT = 1
-local CTRL = 2
-local SHIFT = 4
-local GUI = 8
-
-function Shortcut.appliesToPlatform (value)
-    if isMac and value:match '%f[%a]win%-'
-    or not isMac and value:match '%f[%a]mac%-' then
-        return false
-    end
-    return true
-end
-
-function Shortcut.expandAliases (value)
-    return value
-        :gsub('%f[%a]cmd%-', 'mac-gui-')
-        :gsub('%f[%a]command%-', 'mac-gui-')
-        :gsub('%f[%a]option%-', 'mac-alt-')
-end
-
-function Shortcut.parseKeyCombo (value)
-    -- expand command- and option- aliases
-    value = Shortcut.expandAliases(value)
-
-    -- exit early if shortcut is for different platform
-    if not Shortcut.appliesToPlatform(value) then return end
-
-    -- expand c- special modifier
-    if isMac then
-        value = value:gsub('%f[%a]c%-', 'gui-')
-    else
-        value = value:gsub('%f[%a]c%-', 'ctrl-')
-    end
-
-    -- extract main key
-    local mainKey = value:match '[^%-]*%-?$'
-
-    -- extract modifiers
-    local alt = value:match '%f[%a]alt%-' and ALT or 0
-    local ctrl = value:match '%f[%a]ctrl%-' and CTRL or 0
-    local shift = value:match '%f[%a]shift%-' and SHIFT or 0
-    local gui = value:match '%f[%a]gui%-' and GUI or 0
-
-    return mainKey, alt + ctrl + shift + gui
-end
-
-function Shortcut.getModifierFlags ()
-    local alt = Backend.isKeyDown('lalt', 'ralt') and ALT or 0
-    local ctrl = Backend.isKeyDown('lctrl', 'rctrl') and CTRL or 0
-    local shift = Backend.isKeyDown('lshift', 'rshift') and SHIFT or 0
-    local gui = Backend.isKeyDown('lgui', 'rgui') and GUI or 0
-    return alt + ctrl + shift + gui
-end
-
-function Shortcut.stringify (shortcut)
-    if type(shortcut) ~= 'table' then
-        shortcut = { shortcut }
-    end
-    for _, value in ipairs(shortcut) do
-        value = Shortcut.expandAliases(value)
-        if Shortcut.appliesToPlatform(value) then
-            if isMac then
-                value = value
-                    :gsub('%f[%a]c%-', 'cmd-')
-                    :gsub('%f[%a]gui%-', 'cmd-')
-                    :gsub('%f[%a]alt%-', 'option-')
-                    -- Have Love backend default to DejaVuSans
-                    -- so we can use these instead of the above
-                    --[[
-                    :gsub('%f[%a]c%-', '⌘')
-                    :gsub('%f[%a]gui%-', '⌘')
-                    :gsub('%f[%a]alt%-', '⌥')
-                    :gsub('%f[%a]shift%-', '⇧')
-                    ]]
-            else
-                value = value
-                    :gsub('%f[%a]c%-', 'ctrl-')
-                    :gsub('%f[%a]gui%-', 'windows-')
-            end
-            value = value:gsub('%f[%a]win%-', ''):gsub('%f[%a]mac%-', '')
-            value = value:gsub('%f[%w].', string.upper)
-            return value
-        end
-    end
-end
-
-return Shortcut
diff --git a/src/lib/luigi/style.lua b/src/lib/luigi/style.lua
deleted file mode 100644
index 65caa07..0000000
--- a/src/lib/luigi/style.lua
+++ /dev/null
@@ -1,40 +0,0 @@
-local ROOT = (...):gsub('[^.]*$', '')
-
-local Base = require(ROOT .. 'base')
-
-local Style = Base:extend()
-
-function Style:constructor (rules, lookupNames)
-    self.rules = rules
-    self.lookupNames = lookupNames
-end
-
-function Style:getProperty (object, property, original)
-    local value = rawget(object, property)
-    if value ~= nil then return value end
-
-    local rules = self.rules
-    original = original or object
-
-    for _, lookupName in ipairs(self.lookupNames) do
-        local lookup = rawget(object, lookupName)
-            or object.attributes and rawget(object.attributes, lookupName)
-        if lookup then
-            if type(lookup) ~= 'table' then
-                lookup = { lookup }
-            end
-            for _, lookupValue in ipairs(lookup) do
-                local rule = rules[lookupValue]
-                if rule then
-                    local value = self:getProperty(rule, property, original)
-                    if type(value) == 'function' then
-                        value = value(original)
-                    end
-                    if value ~= nil then return value end
-                end
-            end -- lookup values
-        end -- if lookup
-    end -- lookup names
-end
-
-return Style
diff --git a/src/lib/luigi/theme/dark.lua b/src/lib/luigi/theme/dark.lua
deleted file mode 100644
index 3ea40d9..0000000
--- a/src/lib/luigi/theme/dark.lua
+++ /dev/null
@@ -1,12 +0,0 @@
-local RESOURCE = (...):gsub('%.', '/') .. '/'
-local ROOT = (...):gsub('[^.]*.[^.]*$', '')
-
-return function (config)
-    config = config or {}
-    config.resources = config.resources or RESOURCE
-    config.backColor = config.backColor or { 40, 40, 40 }
-    config.lineColor = config.lineColor or { 60, 60, 60 }
-    config.textColor = config.textColor or { 240, 240, 240 }
-    config.highlight = config.highlight or { 0x00, 0x5c, 0x94 }
-    return require(ROOT .. 'engine.alpha')(config)
-end
diff --git a/src/lib/luigi/theme/dark/button.png b/src/lib/luigi/theme/dark/button.png
deleted file mode 100644
index 79674d4..0000000
Binary files a/src/lib/luigi/theme/dark/button.png and /dev/null differ
diff --git a/src/lib/luigi/theme/dark/button_focused.png b/src/lib/luigi/theme/dark/button_focused.png
deleted file mode 100644
index fbf3b2f..0000000
Binary files a/src/lib/luigi/theme/dark/button_focused.png and /dev/null differ
diff --git a/src/lib/luigi/theme/dark/button_hovered.png b/src/lib/luigi/theme/dark/button_hovered.png
deleted file mode 100644
index 3d4a85c..0000000
Binary files a/src/lib/luigi/theme/dark/button_hovered.png and /dev/null differ
diff --git a/src/lib/luigi/theme/dark/button_pressed.png b/src/lib/luigi/theme/dark/button_pressed.png
deleted file mode 100644
index 15df992..0000000
Binary files a/src/lib/luigi/theme/dark/button_pressed.png and /dev/null differ
diff --git a/src/lib/luigi/theme/dark/check_checked.png b/src/lib/luigi/theme/dark/check_checked.png
deleted file mode 100644
index bb8ca09..0000000
Binary files a/src/lib/luigi/theme/dark/check_checked.png and /dev/null differ
diff --git a/src/lib/luigi/theme/dark/check_checked_focused.png b/src/lib/luigi/theme/dark/check_checked_focused.png
deleted file mode 100644
index 987659a..0000000
Binary files a/src/lib/luigi/theme/dark/check_checked_focused.png and /dev/null differ
diff --git a/src/lib/luigi/theme/dark/check_checked_pressed.png b/src/lib/luigi/theme/dark/check_checked_pressed.png
deleted file mode 100644
index b99de82..0000000
Binary files a/src/lib/luigi/theme/dark/check_checked_pressed.png and /dev/null differ
diff --git a/src/lib/luigi/theme/dark/check_unchecked.png b/src/lib/luigi/theme/dark/check_unchecked.png
deleted file mode 100644
index a71bb54..0000000
Binary files a/src/lib/luigi/theme/dark/check_unchecked.png and /dev/null differ
diff --git a/src/lib/luigi/theme/dark/check_unchecked_focused.png b/src/lib/luigi/theme/dark/check_unchecked_focused.png
deleted file mode 100644
index 6e7a77a..0000000
Binary files a/src/lib/luigi/theme/dark/check_unchecked_focused.png and /dev/null differ
diff --git a/src/lib/luigi/theme/dark/check_unchecked_pressed.png b/src/lib/luigi/theme/dark/check_unchecked_pressed.png
deleted file mode 100644
index c453ff5..0000000
Binary files a/src/lib/luigi/theme/dark/check_unchecked_pressed.png and /dev/null differ
diff --git a/src/lib/luigi/theme/dark/progress.png b/src/lib/luigi/theme/dark/progress.png
deleted file mode 100644
index 082c868..0000000
Binary files a/src/lib/luigi/theme/dark/progress.png and /dev/null differ
diff --git a/src/lib/luigi/theme/dark/radio_checked.png b/src/lib/luigi/theme/dark/radio_checked.png
deleted file mode 100644
index 2bda46b..0000000
Binary files a/src/lib/luigi/theme/dark/radio_checked.png and /dev/null differ
diff --git a/src/lib/luigi/theme/dark/radio_checked_focused.png b/src/lib/luigi/theme/dark/radio_checked_focused.png
deleted file mode 100644
index 45d42aa..0000000
Binary files a/src/lib/luigi/theme/dark/radio_checked_focused.png and /dev/null differ
diff --git a/src/lib/luigi/theme/dark/radio_checked_pressed.png b/src/lib/luigi/theme/dark/radio_checked_pressed.png
deleted file mode 100644
index c80426c..0000000
Binary files a/src/lib/luigi/theme/dark/radio_checked_pressed.png and /dev/null differ
diff --git a/src/lib/luigi/theme/dark/radio_unchecked.png b/src/lib/luigi/theme/dark/radio_unchecked.png
deleted file mode 100644
index 72f2bfe..0000000
Binary files a/src/lib/luigi/theme/dark/radio_unchecked.png and /dev/null differ
diff --git a/src/lib/luigi/theme/dark/radio_unchecked_focused.png b/src/lib/luigi/theme/dark/radio_unchecked_focused.png
deleted file mode 100644
index 08ef37f..0000000
Binary files a/src/lib/luigi/theme/dark/radio_unchecked_focused.png and /dev/null differ
diff --git a/src/lib/luigi/theme/dark/radio_unchecked_pressed.png b/src/lib/luigi/theme/dark/radio_unchecked_pressed.png
deleted file mode 100644
index 60511f8..0000000
Binary files a/src/lib/luigi/theme/dark/radio_unchecked_pressed.png and /dev/null differ
diff --git a/src/lib/luigi/theme/dark/submenu.png b/src/lib/luigi/theme/dark/submenu.png
deleted file mode 100644
index 585b632..0000000
Binary files a/src/lib/luigi/theme/dark/submenu.png and /dev/null differ
diff --git a/src/lib/luigi/theme/dark/text.png b/src/lib/luigi/theme/dark/text.png
deleted file mode 100644
index 15df992..0000000
Binary files a/src/lib/luigi/theme/dark/text.png and /dev/null differ
diff --git a/src/lib/luigi/theme/dark/text_focused.png b/src/lib/luigi/theme/dark/text_focused.png
deleted file mode 100644
index d85bc4c..0000000
Binary files a/src/lib/luigi/theme/dark/text_focused.png and /dev/null differ
diff --git a/src/lib/luigi/theme/dark/triangle_down.png b/src/lib/luigi/theme/dark/triangle_down.png
deleted file mode 100644
index 6180e28..0000000
Binary files a/src/lib/luigi/theme/dark/triangle_down.png and /dev/null differ
diff --git a/src/lib/luigi/theme/dark/triangle_left.png b/src/lib/luigi/theme/dark/triangle_left.png
deleted file mode 100644
index f4e4f7f..0000000
Binary files a/src/lib/luigi/theme/dark/triangle_left.png and /dev/null differ
diff --git a/src/lib/luigi/theme/dark/triangle_right.png b/src/lib/luigi/theme/dark/triangle_right.png
deleted file mode 100644
index 6b67254..0000000
Binary files a/src/lib/luigi/theme/dark/triangle_right.png and /dev/null differ
diff --git a/src/lib/luigi/theme/dark/triangle_up.png b/src/lib/luigi/theme/dark/triangle_up.png
deleted file mode 100644
index 8b20960..0000000
Binary files a/src/lib/luigi/theme/dark/triangle_up.png and /dev/null differ
diff --git a/src/lib/luigi/theme/light-big.lua b/src/lib/luigi/theme/light-big.lua
deleted file mode 100644
index 7f84fac..0000000
--- a/src/lib/luigi/theme/light-big.lua
+++ /dev/null
@@ -1,13 +0,0 @@
-local RESOURCE = (...):gsub('%.', '/') .. '/'
-local ROOT = (...):gsub('[^.]*.[^.]*$', '')
-
-return function (config)
-    local theme = require(ROOT .. 'theme.light')()
-    theme.Control._defaultDimension = 44
-    theme.Line._defaultDimension = 32
-    theme.menu.height = 32
-    theme['menu.item'].height = 32
-    theme['menu.item'].padding = 8
-    theme.panel.padding = 8
-    return theme
-end
diff --git a/src/lib/luigi/theme/light.lua b/src/lib/luigi/theme/light.lua
deleted file mode 100644
index d285caf..0000000
--- a/src/lib/luigi/theme/light.lua
+++ /dev/null
@@ -1,12 +0,0 @@
-local RESOURCE = (...):gsub('%.', '/') .. '/'
-local ROOT = (...):gsub('[^.]*.[^.]*$', '')
-
-return function (config)
-    config = config or {}
-    config.resources = config.resources or RESOURCE
-    config.backColor = config.backColor or { 240, 240, 240 }
-    config.lineColor = config.lineColor or { 220, 220, 220 }
-    config.textColor = config.textColor or { 0, 0, 0 }
-    config.highlight = config.highlight or { 0x19, 0xAE, 0xFF }
-    return require(ROOT .. 'engine.alpha')(config)
-end
diff --git a/src/lib/luigi/theme/light/button.png b/src/lib/luigi/theme/light/button.png
deleted file mode 100644
index cafb4cf..0000000
Binary files a/src/lib/luigi/theme/light/button.png and /dev/null differ
diff --git a/src/lib/luigi/theme/light/button_disabled.png b/src/lib/luigi/theme/light/button_disabled.png
deleted file mode 100644
index 962ef06..0000000
Binary files a/src/lib/luigi/theme/light/button_disabled.png and /dev/null differ
diff --git a/src/lib/luigi/theme/light/button_focused.png b/src/lib/luigi/theme/light/button_focused.png
deleted file mode 100644
index 4339ce1..0000000
Binary files a/src/lib/luigi/theme/light/button_focused.png and /dev/null differ
diff --git a/src/lib/luigi/theme/light/button_hovered.png b/src/lib/luigi/theme/light/button_hovered.png
deleted file mode 100644
index b13fb2d..0000000
Binary files a/src/lib/luigi/theme/light/button_hovered.png and /dev/null differ
diff --git a/src/lib/luigi/theme/light/button_pressed.png b/src/lib/luigi/theme/light/button_pressed.png
deleted file mode 100644
index d80b08f..0000000
Binary files a/src/lib/luigi/theme/light/button_pressed.png and /dev/null differ
diff --git a/src/lib/luigi/theme/light/check_checked.png b/src/lib/luigi/theme/light/check_checked.png
deleted file mode 100644
index b43de3e..0000000
Binary files a/src/lib/luigi/theme/light/check_checked.png and /dev/null differ
diff --git a/src/lib/luigi/theme/light/check_checked_focused.png b/src/lib/luigi/theme/light/check_checked_focused.png
deleted file mode 100644
index 4bebade..0000000
Binary files a/src/lib/luigi/theme/light/check_checked_focused.png and /dev/null differ
diff --git a/src/lib/luigi/theme/light/check_checked_pressed.png b/src/lib/luigi/theme/light/check_checked_pressed.png
deleted file mode 100644
index 3ee0391..0000000
Binary files a/src/lib/luigi/theme/light/check_checked_pressed.png and /dev/null differ
diff --git a/src/lib/luigi/theme/light/check_unchecked.png b/src/lib/luigi/theme/light/check_unchecked.png
deleted file mode 100644
index fb0f904..0000000
Binary files a/src/lib/luigi/theme/light/check_unchecked.png and /dev/null differ
diff --git a/src/lib/luigi/theme/light/check_unchecked_focused.png b/src/lib/luigi/theme/light/check_unchecked_focused.png
deleted file mode 100644
index 98ceede..0000000
Binary files a/src/lib/luigi/theme/light/check_unchecked_focused.png and /dev/null differ
diff --git a/src/lib/luigi/theme/light/check_unchecked_pressed.png b/src/lib/luigi/theme/light/check_unchecked_pressed.png
deleted file mode 100644
index 999b3c7..0000000
Binary files a/src/lib/luigi/theme/light/check_unchecked_pressed.png and /dev/null differ
diff --git a/src/lib/luigi/theme/light/light_theme.svgz b/src/lib/luigi/theme/light/light_theme.svgz
deleted file mode 100644
index 6d5591a..0000000
Binary files a/src/lib/luigi/theme/light/light_theme.svgz and /dev/null differ
diff --git a/src/lib/luigi/theme/light/progress.png b/src/lib/luigi/theme/light/progress.png
deleted file mode 100644
index 0f02229..0000000
Binary files a/src/lib/luigi/theme/light/progress.png and /dev/null differ
diff --git a/src/lib/luigi/theme/light/radio_checked.png b/src/lib/luigi/theme/light/radio_checked.png
deleted file mode 100644
index c453a05..0000000
Binary files a/src/lib/luigi/theme/light/radio_checked.png and /dev/null differ
diff --git a/src/lib/luigi/theme/light/radio_checked_focused.png b/src/lib/luigi/theme/light/radio_checked_focused.png
deleted file mode 100644
index 4c166f8..0000000
Binary files a/src/lib/luigi/theme/light/radio_checked_focused.png and /dev/null differ
diff --git a/src/lib/luigi/theme/light/radio_checked_pressed.png b/src/lib/luigi/theme/light/radio_checked_pressed.png
deleted file mode 100644
index 7742011..0000000
Binary files a/src/lib/luigi/theme/light/radio_checked_pressed.png and /dev/null differ
diff --git a/src/lib/luigi/theme/light/radio_unchecked.png b/src/lib/luigi/theme/light/radio_unchecked.png
deleted file mode 100644
index d10a56a..0000000
Binary files a/src/lib/luigi/theme/light/radio_unchecked.png and /dev/null differ
diff --git a/src/lib/luigi/theme/light/radio_unchecked_focused.png b/src/lib/luigi/theme/light/radio_unchecked_focused.png
deleted file mode 100644
index 3b670e6..0000000
Binary files a/src/lib/luigi/theme/light/radio_unchecked_focused.png and /dev/null differ
diff --git a/src/lib/luigi/theme/light/radio_unchecked_pressed.png b/src/lib/luigi/theme/light/radio_unchecked_pressed.png
deleted file mode 100644
index 983a78f..0000000
Binary files a/src/lib/luigi/theme/light/radio_unchecked_pressed.png and /dev/null differ
diff --git a/src/lib/luigi/theme/light/submenu.png b/src/lib/luigi/theme/light/submenu.png
deleted file mode 100644
index 7f37f94..0000000
Binary files a/src/lib/luigi/theme/light/submenu.png and /dev/null differ
diff --git a/src/lib/luigi/theme/light/text.png b/src/lib/luigi/theme/light/text.png
deleted file mode 100644
index d137fcd..0000000
Binary files a/src/lib/luigi/theme/light/text.png and /dev/null differ
diff --git a/src/lib/luigi/theme/light/text_focused.png b/src/lib/luigi/theme/light/text_focused.png
deleted file mode 100644
index 87ff79b..0000000
Binary files a/src/lib/luigi/theme/light/text_focused.png and /dev/null differ
diff --git a/src/lib/luigi/theme/light/triangle_down.png b/src/lib/luigi/theme/light/triangle_down.png
deleted file mode 100644
index 87c28c7..0000000
Binary files a/src/lib/luigi/theme/light/triangle_down.png and /dev/null differ
diff --git a/src/lib/luigi/theme/light/triangle_left.png b/src/lib/luigi/theme/light/triangle_left.png
deleted file mode 100644
index c5659ff..0000000
Binary files a/src/lib/luigi/theme/light/triangle_left.png and /dev/null differ
diff --git a/src/lib/luigi/theme/light/triangle_right.png b/src/lib/luigi/theme/light/triangle_right.png
deleted file mode 100644
index 71cad44..0000000
Binary files a/src/lib/luigi/theme/light/triangle_right.png and /dev/null differ
diff --git a/src/lib/luigi/theme/light/triangle_up.png b/src/lib/luigi/theme/light/triangle_up.png
deleted file mode 100644
index 193963e..0000000
Binary files a/src/lib/luigi/theme/light/triangle_up.png and /dev/null differ
diff --git a/src/lib/luigi/utf8.lua b/src/lib/luigi/utf8.lua
deleted file mode 100644
index 66e878f..0000000
--- a/src/lib/luigi/utf8.lua
+++ /dev/null
@@ -1,339 +0,0 @@
--- modified for partial compatibility with Lua 5.3
-
---utf8 module (Cosmin Apreutesei, public domain).
---byte indices are i's, char (codepoint) indices are ci's.
---invalid characters are counted as 1-byte chars so they don't get lost. validate/sanitize beforehand as needed.
-
-local utf8 = {}
-
---byte index of the next char after the char at byte index i, followed by a valid flag for the char at byte index i.
---nil if not found. invalid characters are iterated as 1-byte chars.
-function utf8.next_raw(s, i)
-	if not i then
-		if #s == 0 then return nil end
-		return 1, true --fake flag (doesn't matter since this flag is not to be taken as full validation)
-	end
-	if i > #s then return end
-	local c = s:byte(i)
-	if c >= 0x00 and c <= 0x7F then
-		i = i + 1
-	elseif c >= 0xC2 and c <= 0xDF then
-		i = i + 2
-	elseif c >= 0xE0 and c <= 0xEF then
-		i = i + 3
-	elseif c >= 0xF0 and c <= 0xF4 then
-		i = i + 4
-	else --invalid
-		return i + 1, false
-	end
-	if i > #s then return end
-	return i, true
-end
-
---next() is the generic iterator and can be replaced for different semantics. next_raw() must preserve its semantics.
-utf8.next = utf8.next_raw
-
---iterate chars, returning the byte index where each char starts
-function utf8.byte_indices(s, previ)
-	return utf8.next, s, previ
-end
-
---number of chars in string
-function utf8.len(s)
-	local len = 0
-	for _ in utf8.byte_indices(s) do
-		len = len + 1
-	end
-	return len
-end
-
---byte index given char index. nil if the index is outside the string.
-function utf8.byte_index(s, target_ci)
-	if target_ci < 1 then return end
-	local ci = 0
-	for i in utf8.byte_indices(s) do
-		ci = ci + 1
-		if ci == target_ci then
-			return i
-		end
-	end
-	assert(target_ci > ci, 'invalid index')
-	return #s + 1
-end
-
---char index given byte index. nil if the index is outside the string.
-function utf8.char_index(s, target_i)
-	if target_i < 1 or target_i > #s + 1 then return end
-	local ci = 0
-	for i in utf8.byte_indices(s) do
-		ci = ci + 1
-		if i == target_i then
-			return ci
-		end
-	end
-	return ci + 1
-	-- error'invalid index'
-end
-
---byte index of the prev. char before the char at byte index i, which defaults to #s + 1.
---nil if the index is outside the 2..#s+1 range.
---NOTE: unlike next(), this is a O(N) operation!
-function utf8.prev(s, nexti)
-	nexti = nexti or #s + 1
-	if nexti <= 1 or nexti > #s + 1 then return end
-	local lasti, lastvalid = utf8.next(s)
-	for i, valid in utf8.byte_indices(s) do
-		if i == nexti then
-			return lasti, lastvalid
-		end
-		lasti, lastvalid = i, valid
-	end
-	if nexti == #s + 1 then
-		return lasti, lastvalid
-	end
-	error'invalid index'
-end
-
---iterate chars in reverse order, returning the byte index where each char starts.
-function utf8.byte_indices_reverse(s, nexti)
-	if #s < 200 then
-		--using prev() is a O(N^2/2) operation, ok for small strings (200 chars need 40,000 iterations)
-		return utf8.prev, s, nexti
-	else
-		--store byte indices in a table and iterate them in reverse.
-		--this is 40x slower than byte_indices() but still fast at 2mil chars/second (but eats RAM and makes garbage).
-		local t = {}
-		for i in utf8.byte_indices(s) do
-			if nexti and i >= nexti then break end
-			table.insert(t, i)
-		end
-		local i = #t + 1
-		return function()
-			i = i - 1
-			return t[i]
-		end
-	end
-end
-
---sub based on char indices, which, unlike with standard string.sub(), can't be negative.
---start_ci can be 1..inf and end_ci can be 0..inf. end_ci can be nil meaning last char.
---if start_ci is out of range or end_ci < start_ci, the empty string is returned.
---if end_ci is out of range, it is considered to be the last position in the string.
-function utf8.sub(s, start_ci, end_ci)
-	--assert for positive indices because we might implement negative indices in the future.
-	assert(start_ci >= 1)
-	assert(not end_ci or end_ci >= 0)
-	local ci = 0
-	local start_i, end_i
-	for i in utf8.byte_indices(s) do
-		ci = ci + 1
-		if ci == start_ci then
-			start_i = i
-		end
-		if ci == end_ci then
-			end_i = i
-		end
-	end
-	if not start_i then
-		assert(start_ci > ci, 'invalid index')
-		return ''
-	end
-	if end_ci and not end_i then
-		if end_ci < start_ci then
-			return ''
-		end
-		assert(end_ci > ci, 'invalid index')
-	end
-	return s:sub(start_i, end_i)
-end
-
---check if a string contains a substring at byte index i without making garbage.
---nil if the index is out of range. true if searching for the empty string.
-function utf8.contains(s, i, sub)
-	if i < 1 or i > #s then return nil end
-	for si = 1, #sub do
-		if s:byte(i + si - 1) ~= sub:byte(si) then
-			return false
-		end
-	end
-	return true
-end
-
---count the number of occurences of a substring in a string. the substring cannot be the empty string.
-function utf8.count(s, sub)
-	assert(#sub > 0)
-	local count = 0
-	local i = 1
-	while i do
-		if utf8.contains(s, i, sub) then
-			count = count + 1
-			i = i + #sub
-			if i > #s then break end
-		else
-			i = utf8.next(s, i)
-		end
-	end
-	return count
-end
-
---utf8 validation and sanitization
-
---check if there's a valid utf8 codepoint at byte index i. valid ranges for each utf8 byte are:
--- byte  1          2           3          4
---------------------------------------------
--- 00 - 7F
--- C2 - DF    80 - BF
--- E0         A0 - BF     80 - BF
--- E1 - EC    80 - BF     80 - BF
--- ED         80 - 9F     80 - BF
--- EE - EF    80 - BF     80 - BF
--- F0         90 - BF     80 - BF    80 - BF
--- F1 - F3    80 - BF     80 - BF    80 - BF
--- F4         80 - 8F     80 - BF    80 - BF
-function utf8.isvalid(s, i)
-	local c = s:byte(i)
-	if not c then
-		return false
-	elseif c >= 0x00 and c <= 0x7F then
-		return true
-	elseif c >= 0xC2 and c <= 0xDF then
-		local c2 = s:byte(i + 1)
-		return c2 and c2 >= 0x80 and c2 <= 0xBF
-	elseif c >= 0xE0 and c <= 0xEF then
-		local c2 = s:byte(i + 1)
-		local c3 = s:byte(i + 2)
-		if c == 0xE0 then
-			return c2 and c3 and
-				c2 >= 0xA0 and c2 <= 0xBF and
-				c3 >= 0x80 and c3 <= 0xBF
-		elseif c >= 0xE1 and c <= 0xEC then
-			return c2 and c3 and
-				c2 >= 0x80 and c2 <= 0xBF and
-				c3 >= 0x80 and c3 <= 0xBF
-		elseif c == 0xED then
-			return c2 and c3 and
-				c2 >= 0x80 and c2 <= 0x9F and
-				c3 >= 0x80 and c3 <= 0xBF
-		elseif c >= 0xEE and c <= 0xEF then
-			if c == 0xEF and c2 == 0xBF and (c3 == 0xBE or c3 == 0xBF) then
-				return false --uFFFE and uFFFF non-characters
-			end
-			return c2 and c3 and
-				c2 >= 0x80 and c2 <= 0xBF and
-				c3 >= 0x80 and c3 <= 0xBF
-		end
-	elseif c >= 0xF0 and c <= 0xF4 then
-		local c2 = s:byte(i + 1)
-		local c3 = s:byte(i + 2)
-		local c4 = s:byte(i + 3)
-		if c == 0xF0 then
-			return c2 and c3 and c4 and
-				c2 >= 0x90 and c2 <= 0xBF and
-				c3 >= 0x80 and c3 <= 0xBF and
-				c4 >= 0x80 and c4 <= 0xBF
-		elseif c >= 0xF1 and c <= 0xF3 then
-			return c2 and c3 and c4 and
-				c2 >= 0x80 and c2 <= 0xBF and
-				c3 >= 0x80 and c3 <= 0xBF and
-				c4 >= 0x80 and c4 <= 0xBF
-		elseif c == 0xF4 then
-			return c2 and c3 and c4 and
-				c2 >= 0x80 and c2 <= 0x8F and
-				c3 >= 0x80 and c3 <= 0xBF and
-				c4 >= 0x80 and c4 <= 0xBF
-		end
-	end
-	return false
-end
-
---byte index of the next valid utf8 char after the char at byte index i.
---nil if indices go out of range. invalid characters are skipped.
-function utf8.next_valid(s, i)
-	local valid
-	i, valid = utf8.next_raw(s, i)
-	while i and (not valid or not utf8.isvalid(s, i)) do
-		i, valid = utf8.next(s, i)
-	end
-	return i
-end
-
---iterate valid chars, returning the byte index where each char starts
-function utf8.valid_byte_indices(s)
-	return utf8.next_valid, s
-end
-
---assert that a string only contains valid utf8 characters
-function utf8.validate(s)
-	for i, valid in utf8.byte_indices(s) do
-		if not valid or not utf8.isvalid(s, i) then
-			error(string.format('invalid utf8 char at #%d', i))
-		end
-	end
-end
-
-local function table_lookup(s, i, j, t)
-	return t[s:sub(i, j)]
-end
-
---replace characters in string based on a function f(s, i, j, ...) -> replacement_string | nil
-function utf8.replace(s, f, ...)
-	if type(f) == 'table' then
-		return utf8.replace(s, table_lookup, f)
-	end
-	if s == '' then
-		return s
-	end
-	local t = {}
-	local lasti = 1
-	for i in utf8.byte_indices(s) do
-		local nexti = utf8.next(s, i) or #s + 1
-		local repl = f(s, i, nexti - 1, ...)
-		if repl then
-			table.insert(t, s:sub(lasti, i - 1))
-			table.insert(t, repl)
-			lasti = nexti
-		end
-	end
-	table.insert(t, s:sub(lasti))
-	return table.concat(t)
-end
-
-local function replace_invalid(s, i, j, repl_char)
-	if not utf8.isvalid(s, i) then
-		return repl_char
-	end
-end
-
---replace invalid utf8 chars with a replacement char
-function utf8.sanitize(s, repl_char)
-	repl_char = repl_char or '�' --\uFFFD
-	return utf8.replace(s, replace_invalid, repl_char)
-end
-
--- Returns the position (in bytes) where the encoding of the n-th character
--- of s (counting from position i) starts.
-function utf8.offset(s, n, i)
-
-	-- The default for i is 1 when n is non-negative and #s + 1 otherwise
-	if not i then
-		i = n < 0 and #s + 1 or 1
-	end
-
-    local ci = utf8.char_index(s, i)
-
-	-- As a special case, when n is 0 the function returns the start of
-	-- the encoding of the character that contains the i-th byte of s.
-	if n == 0 then
-		return ci
-	end
-
-	if n > 0 then
-    	n = n - 1
-	end
-
-	return utf8.byte_index(s, ci + n)
-end
-
-utf8.codes = utf8.byte_indices
-
-return utf8
diff --git a/src/lib/luigi/widget.lua b/src/lib/luigi/widget.lua
deleted file mode 100644
index 1d8474f..0000000
--- a/src/lib/luigi/widget.lua
+++ /dev/null
@@ -1,830 +0,0 @@
---[[--
-Widget class.
-
-@classmod Widget
---]]--
-
-local STRICT = false
-local ROOT = (...):gsub('[^.]*$', '')
-
-local Backend = require(ROOT .. 'backend')
-local Event = require(ROOT .. 'event')
-local Attribute = require(ROOT .. 'attribute')
-local Painter = require(ROOT .. 'painter')
-local Font = Backend.Font
-
-local Widget = {}
-
-Event.injectBinders(Widget)
-
---[[--
-API Properties
-
-These properties may be useful when creating user interfaces,
-and are a formal part of the API.
-
-@section api
---]]--
-
---[[--
-Whether this widget has keyboard focus.
-
-Can be used by styles and themes. This value is automatically set by
-the `Input` class, and should generally be treated as read-only.
---]]--
-Widget.focused = false
-
---[[--
-Whether the pointer is within this widget.
-
-Can be used by styles and themes. This value is automatically set by
-the `Input` class, and should generally be treated as read-only.
---]]--
-Widget.hovered = false
-
---[[--
-Table of mouse buttons pressed on this widget and not yet released,
-keyed by mouse button name with booleans as values.
-
-Can be used by styles and themes. Values are automatically set by
-the `Input` class, and should generally be treated as read-only.
---]]--
-Widget.pressed = nil
-
---[[--
-Internal Properties
-
-These properties are used internally, but are not likely to be useful
-when creating user interfaces; they are not a formal part of the API
-and may change at any time.
-
-@section internal
---]]--
-
---[[--
-Identifies this object as a widget.
-
-Can be used to determine whether an unknown object is a widget.
---]]--
-Widget.isWidget = true
-
---[[--
-Whether the widget is currently being reshaped.
-
-Used internally by `reshape` to prevent stack overflows when handling
-`Reshape` events.
---]]--
-Widget.isReshaping = false
-
---[[--
-Whether this widget has a type.
-
-Used by the @{attribute.type|type} attribute to determine whether to
-run the type initializer when the widget's type is set. After a type
-initializer has run, `hasType` becomes `true` and no other type
-initializers should run on the widget.
---]]--
-Widget.hasType = false
-
---[[--
-The `Font` object associated with the widget.
---]]--
-Widget.fontData = nil
-
---[[--
-The `Text` object associated with the widget.
---]]--
-Widget.textData = nil
-
-
---[[--
-@section end
---]]--
-
-Widget.typeDecorators = {
-    button = require(ROOT .. 'widget.button'),
-    check = require(ROOT .. 'widget.check'),
-    menu = require(ROOT .. 'widget.menu'),
-    ['menu.item'] = require(ROOT .. 'widget.menu.item'),
-    progress = require(ROOT .. 'widget.progress'),
-    radio = require(ROOT .. 'widget.radio'),
-    sash = require(ROOT .. 'widget.sash'),
-    slider = require(ROOT .. 'widget.slider'),
-    status = require(ROOT .. 'widget.status'),
-    stepper = require(ROOT .. 'widget.stepper'),
-    text = require(ROOT .. 'widget.text'),
-    window = require(ROOT .. 'widget.window'),
-}
-
---[[--
-Static Functions
-
-@section static
---]]--
-
---[[--
-Register a custom widget type.
-
-@static
-
-@tparam string name
-A unique name for this type of widget.
-
-@tparam function(Widget) decorator
-An initialization function for this type of widget.
---]]--
-function Widget.register (name, decorator)
-    Widget.typeDecorators[name] = decorator
-end
-
---[[--
-@section end
---]]--
-
--- look for properties in attributes, Widget, style, and theme
-local function metaIndex (self, property)
-    -- look in widget's own attributes
-    local A = self.attributeDescriptors[property] or Attribute[property]
-    if A then
-        local value = A.get and A.get(self, property)
-            or self.attributes[property]
-        if type(value) == 'function' then value = value(self) end
-        if value ~= nil then return value end
-    end
-
-    -- look in Widget class properties
-    local value = Widget[property]
-    if value ~= nil then return value end
-
-    -- look in style
-    local layout = self.layout
-    value = layout:getStyle():getProperty(self, property)
-    if value ~= nil then return value end
-
-    -- look in theme
-    return layout:getTheme():getProperty(self, property)
-end
-
--- setting attributes triggers special behavior
-local function metaNewIndex (self, property, value)
-    local A = self.attributeDescriptors[property] or Attribute[property]
-    if A then
-        if A.set then
-            A.set(self, value, property)
-        else
-            self.attributes[property] = value
-        end
-    else
-        if STRICT and Widget[property] == nil then
-            error(property .. ' is not a valid widget property.')
-        else
-            rawset(self, property, value)
-        end
-    end
-end
-
-local attributeNames = {}
-
-for name in pairs(Attribute) do
-    if name ~= 'type' then -- type must be handled last
-        attributeNames[#attributeNames + 1] = name
-    end
-end
-
-attributeNames[#attributeNames + 1] = 'type'
-
---[[--
-Widget pseudo-constructor.
-
-@function Luigi.Widget
-
-@within Constructor
-
-@tparam Layout layout
-The layout this widget belongs to.
-
-@tparam[opt] table data
-The data definition table for this widget.
-This table is identical to the constructed widget.
-
-@treturn Widget
-A Widget instance.
---]]--
-local function metaCall (Widget, layout, self)
-    self = self or {}
-    self.layout = layout
-    self.position = { x = nil, y = nil }
-    self.dimensions = { width = nil, height = nil }
-    self.attributes = {}
-    self.attributeDescriptors = {}
-    self.pressed = {}
-    self.painter = Painter(self)
-
-    setmetatable(self, { __index = metaIndex, __newindex = metaNewIndex })
-
-    for _, property in ipairs(attributeNames) do
-        local value = rawget(self, property)
-        rawset(self, property, nil)
-        self[property] = value
-    end
-
-    for k, v in ipairs(self) do
-        self[k] = v.isWidget and v or metaCall(Widget, self.layout, v)
-        self[k].parent = self
-    end
-
-    return self
-end
-
-function Widget:getMasterLayout ()
-    return self.layout.master or self.layout
-end
-
---[[--
-Define a custom attribute for this widget.
-
-When an attribute is defined, the current value is stored locally and
-removed from the widget's own properties and its attributes collection.
-Then, the newly-defined setter is called with the stored value.
-
-@tparam string name
-The name of the attribute.
-
-@tparam table descriptor
-A table, optionally containing `get` and `set` functions (see `Attribute`).
-
-@treturn Widget
-Return this widget for chaining.
---]]--
-function Widget:defineAttribute (name, descriptor)
-    local value = rawget(self, name)
-    if value == nil then value = self.attributes[name] end
-    self.attributeDescriptors[name] = descriptor or {}
-    rawset(self, name, nil)
-    self.attributes[name] = nil
-    self[name] = value
-    return self
-end
-
---[[--
-Fire an event on this widget and each ancestor.
-
-If any event handler returns non-nil, stop the event from propagating.
-
-@tparam string eventName
-The name of the Event.
-
-@tparam[opt] table data
-Information about the event to send to handlers.
-
-@treturn mixed
-The first value returned by an event handler.
---]]--
-function Widget:bubbleEvent (eventName, data)
-    local event = Event[eventName]
-    data = data or {}
-    data.target = self
-    for ancestor in self:eachAncestor(true) do
-        local result = event:emit(ancestor, data)
-        if result ~= nil then return result end
-    end
-    return event:emit(self.layout, data)
-end
-
---[[--
-Get widget's previous sibling.
-
-@treturn Widget|nil
-The widget's previous sibling, if any.
---]]--
-function Widget:getPreviousSibling ()
-    local parent = self.parent
-    if not parent then return end
-    for i, widget in ipairs(parent) do
-        if widget == self then return parent[i - 1] end
-    end
-end
-
---[[--
-Get widget's next sibling.
-
-@treturn Widget|nil
-The widget's next sibling, if any.
---]]--
-function Widget:getNextSibling ()
-    local parent = self.parent
-    if not parent then return end
-    for i, widget in ipairs(parent) do
-        if widget == self then return parent[i + 1] end
-    end
-end
-
---[[--
-Attempt to focus the widget.
-
-Unfocus currently focused widget, and focus this widget if it's focusable.
-
-@treturn boolean
-true if this widget was focused, else false.
---]]--
-function Widget:focus ()
-    local layout = self.layout
-
-    if layout.focusedWidget == self then
-        return true
-    end
-
-    if layout.focusedWidget then
-        layout.focusedWidget.focused = nil
-        Event.Blur:emit(self.layout, layout.focusedWidget)
-        layout.focusedWidget = nil
-    end
-
-    if self.focusable then
-        self.focused = true
-        layout.focusedWidget = self
-        Event.Focus:emit(self.layout, self)
-        return true
-    end
-
-    return false
-end
-
---[[--
-Get the next widget, depth-first.
-
-If the widget has children, returns the first child.
-Otherwise, returns the next sibling of the nearest possible ancestor.
-Cycles back around to the layout root from the last widget in the tree.
-
-@treturn Widget
-The next widget in the tree.
---]]--
-function Widget:getNextNeighbor ()
-    if #self > 0 then
-        return self[1]
-    end
-    for ancestor in self:eachAncestor(true) do
-        local nextWidget = ancestor:getNextSibling()
-        if nextWidget then return nextWidget end
-    end
-    return self.layout.root
-end
-
--- get the last child of the last child of the last child of the...
-local function getGreatestDescendant (widget)
-    while #widget > 0 do
-        widget = widget[#widget]
-    end
-    return widget
-end
-
---[[--
-Get the previous widget, depth-first.
-
-Uses the reverse of the traversal order used by `getNextNeighbor`.
-Cycles back around to the last widget in the tree from the layout root.
-
-@treturn Widget
-The previous widget in the tree.
---]]--
-function Widget:getPreviousNeighbor ()
-    local layout = self.layout
-
-    if self == layout.root then
-        return getGreatestDescendant(self)
-    end
-
-    for ancestor in self:eachAncestor(true) do
-        local previousWidget = ancestor:getPreviousSibling()
-        if previousWidget then
-            return getGreatestDescendant(previousWidget)
-        end
-        if ancestor ~= self then return ancestor end
-    end
-
-    return layout.root
-end
-
---[[--
-Add a child to this widget.
-
-@tparam Widget|table data
-A widget or definition table representing a widget.
-
-@treturn Widget
-The newly added child widget.
---]]--
-function Widget:addChild (data)
-    local layout = self.layout
-    local child = data and data.isWidget and data or Widget(layout, data or {})
-
-    self[#self + 1] = child
-    child.parent = self
-    child.layout = self.layout
-
-    return child
-end
-
-function Widget:calculateDimension (name)
-    -- If dimensions are already calculated, return them.
-    if self.dimensions[name] then
-        return self.dimensions[name]
-    end
-
-    -- Get minimum width/height from attributes.
-    local min = (name == 'width') and (self.minwidth or 0)
-        or (self.minheight or 0)
-
-    -- If width/height attribute is found (in widget, style or theme)
-    if self[name] then
-        -- and if width/height is "auto" then shrink to fit content
-        if self[name] == 'auto' then
-            self.dimensions[name] = self:calculateDimensionMinimum(name)
-            return self.dimensions[name]
-        end
-        -- else width/height should be a number; use that value,
-        -- clamped to minimum.
-        self.dimensions[name] = math.max(self[name], min)
-        return self.dimensions[name]
-    end
-
-    -- If the widget is a layout root (and has no width/height),
-    -- it's the same size as the window.
-    local parent = self.parent
-    if not parent then
-        local windowWidth, windowHeight = Backend.getWindowSize()
-        local size = name == 'width' and windowWidth or windowHeight
-        self.dimensions[name] = size
-        return self.dimensions[name]
-    end
-
-    -- Widgets expand to fit their parents when no width/height is specified.
-    local parentDimension = parent:calculateDimension(name)
-    parentDimension = parentDimension - (parent.margin or 0) * 2
-    parentDimension = parentDimension - (parent.padding or 0) * 2
-
-    -- If the dimension is in the opposite direction of the parent flow
-    -- (for example if parent.flow is 'x' and the dimension is 'height'),
-    -- then return the parent dimension.
-    local parentFlow = parent.flow or 'y'
-    if (parentFlow ~= 'x' and name == 'width')
-    or (parentFlow == 'x' and name == 'height') then
-        self.dimensions[name] = math.max(parentDimension, min)
-        return self.dimensions[name]
-    end
-
-    -- If the dimension is in the same direction as the parent flow
-    -- (for example if parent.flow is 'x' and the dimension is 'width'),
-    -- then return an equal portion of the unclaimed space in the parent.
-    local claimed = 0
-    local unsized = 1
-    for i, widget in ipairs(self.parent) do
-        if widget ~= self then
-            local value = widget[name]
-            if value == 'auto' then
-                if not widget.dimensions[name] then
-                    widget.dimensions[name] = widget:calculateDimensionMinimum(name)
-                end
-                claimed = claimed + widget.dimensions[name]
-            elseif value then
-                local min = (name == 'width') and (widget.minwidth or 0)
-                    or (widget.minheight or 0)
-                claimed = claimed + math.max(value, min)
-            else
-                unsized = unsized + 1
-            end
-        end
-    end
-    local size = (parentDimension - claimed) / unsized
-
-    size = math.max(size, min)
-    self.dimensions[name] = size
-    return size
-end
-
-function Widget:calculateRootPosition (axis)
-    local value = (axis == 'x' and self.left) or (axis ~= 'x' and self.top)
-
-    if value then
-        self.position[axis] = value
-        return value
-    end
-
-    local ww, wh = Backend.getWindowSize()
-
-    if axis == 'x' and type(self.width) == 'number' then
-        value = (ww - self.width) / 2
-    elseif axis ~= 'x' and type(self.height) == 'number' then
-        value = (wh - self.height) / 2
-    else
-        value = 0
-    end
-
-    self.position[axis] = value
-    return value
-end
-
-function Widget:calculatePosition (axis)
-    if self.position[axis] then
-        return self.position[axis]
-    end
-    local parent = self.parent
-    local scroll = 0
-    if not parent then
-        return self:calculateRootPosition(axis)
-    else
-        scroll = axis == 'x' and (parent.scrollX or 0)
-            or axis ~= 'x' and (parent.scrollY or 0)
-    end
-    local parentPos = parent:calculatePosition(axis)
-    local p = parentPos - scroll + (parent.margin or 0) + (parent.padding or 0)
-    local parentFlow = parent.flow or 'y'
-    for i, widget in ipairs(parent) do
-        if widget == self then
-            self.position[axis] = p
-            return p
-        end
-        if parentFlow == axis then
-            local dimension = (axis == 'x') and 'width' or 'height'
-            p = p + widget:calculateDimension(dimension)
-        end
-    end
-    self.position[axis] = 0
-    return 0
-end
-
-function Widget:calculateDimensionMinimum (name)
-    local dim = self[name]
-    local min = (name == 'width') and (self.minwidth or 0)
-        or (self.minheight or 0)
-
-    if type(dim) == 'number' then
-        return math.max(dim, min)
-    end
-
-    local value = 0
-
-    for _, child in ipairs(self) do
-        if (name == 'width' and self.flow == 'x')
-        or (name == 'height' and self.flow ~= 'x') then
-            value = value + child:calculateDimensionMinimum(name)
-        else
-            value = math.max(value, child:calculateDimensionMinimum(name))
-        end
-    end
-
-    if value > 0 then
-        local space = (self.margin or 0) * 2 + (self.padding or 0) * 2
-        value = value + space
-    end
-
-    return math.max(value, min)
-end
-
---[[--
-Get the widget's X coordinate.
-
-@treturn number
-The widget's X coordinate.
---]]--
-function Widget:getX ()
-    return self:calculatePosition('x')
-end
-
---[[--
-Get the widget's Y coordinate.
-
-@treturn number
-The widget's Y coordinate.
---]]--
-function Widget:getY ()
-    return self:calculatePosition('y')
-end
-
---[[--
-Get the widget's calculated width.
-
-@treturn number
-The widget's calculated width.
---]]--
-function Widget:getWidth ()
-    return self:calculateDimension('width')
-end
-
---[[--
-Get the widget's calculated height.
-
-@treturn number
-The widget's calculated height.
---]]--
-function Widget:getHeight ()
-    return self:calculateDimension('height')
-end
-
---[[--
-Get the content width.
-
-Gets the combined width of the widget's children.
-
-@treturn number
-The content width.
---]]--
-function Widget:getContentWidth ()
-    if not self.layout.isReady then return 0 end
-    local width = 0
-    if self.flow == 'x' then
-        for _, child in ipairs(self) do
-            width = width + child:getWidth()
-        end
-    else
-        for _, child in ipairs(self) do
-            width = math.max(width, child:getWidth())
-        end
-    end
-    return width
-end
-
---[[--
-Get the content height.
-
-Gets the combined height of the widget's children.
-
-@treturn number
-The content height.
---]]--
-function Widget:getContentHeight ()
-    if not self.layout.isReady then return 0 end
-    local height = 0
-    if self.flow ~= 'x' then
-        for _, child in ipairs(self) do
-            height = height + child:getHeight()
-        end
-    else
-        for _, child in ipairs(self) do
-            height = math.max(height, child:getHeight())
-        end
-    end
-    return height
-end
-
-function Widget:getFont ()
-    if not self.fontData then
-        self.fontData = Font(self.font, self.size)
-    end
-    return self.fontData
-end
-
---[[--
-Get x/y/width/height values describing a rectangle within the widget.
-
-@tparam boolean useMargin
-Whether to adjust the rectangle based on the widget's margin.
-
-@tparam boolean usePadding
-Whether to adjust the rectangle based on the widget's padding.
-
-@treturn number
-The upper left corner's X position.
-
-@treturn number
-The upper left corner's Y position.
-
-@treturn number
-The rectangle's width
-
-@treturn number
-The rectangle's height
---]]--
-function Widget:getRectangle (useMargin, usePadding)
-    local x, y = self:getX(), self:getY()
-    local w, h = self:getWidth(), self:getHeight()
-    local function shrink(amount)
-        x = x + amount
-        y = y + amount
-        w = w - amount * 2
-        h = h - amount * 2
-    end
-    if useMargin then
-        shrink(self.margin or 0)
-    end
-    if usePadding then
-        shrink(self.padding or 0)
-    end
-    return math.floor(x), math.floor(y), math.floor(w), math.floor(h)
-end
-
---[[--
-Determine whether a point is within a widget.
-
-@tparam number x
-The point's X coordinate.
-
-@tparam number y
-The point's Y coordinate.
-
-@treturn boolean
-true if the point is within the widget, else false.
---]]--
-function Widget:isAt (x, y)
-    local x1, y1, w, h = self:getRectangle()
-    local x2, y2 = x1 + w, y1 + h
-    return (x1 <= x) and (x2 >= x) and (y1 <= y) and (y2 >= y)
-end
-
---[[--
-Iterate widget's ancestors.
-
-@tparam boolean includeSelf
-Whether to include this widget as the first result.
-
-@treturn function
-Returns an iterator function that returns widgets.
-
-@usage
-for ancestor in myWidget:eachAncestor(true) do
-    print(widget.type or 'generic')
-end
---]]--
-function Widget:eachAncestor (includeSelf)
-    local instance = includeSelf and self or self.parent
-    return function()
-        local widget = instance
-        if not widget then return end
-        instance = widget.parent
-        return widget
-    end
-end
-
-function Widget:paint ()
-    return self.painter:paint()
-end
-
---[[--
-Reshape the widget.
-
-Clears calculated widget dimensions, allowing them to be recalculated, and
-fires a Reshape event (does not bubble). Called recursively for each child.
-
-When setting a widget's width or height, this function is automatically called
-on the parent widget.
---]]--
-function Widget:reshape ()
-    if self.isReshaping then return end
-    self.isReshaping = true
-
-    self:scrollBy(0, 0)
-
-    self.position = {}
-    self.dimensions = {}
-
-    self.textData = nil
-
-    Event.Reshape:emit(self, { target = self })
-    for _, child in ipairs(self) do
-        if child.reshape then
-            child:reshape()
-        end
-    end
-    local items = self.items
-    if items then
-        for _, child in ipairs(items) do
-            if child.reshape then
-                child:reshape()
-            end
-        end
-    end
-    self.isReshaping = nil
-end
-
-function Widget:scrollBy (amount)
-    if not self.scroll then return end
-    --TODO: eliminate redundancy
-    if self.flow == 'x' then
-        if not self.scrollX then self.scrollX = 0 end
-        local scrollX = self.scrollX - amount * 10
-        local inner = math.max(self:getContentWidth(), self.innerWidth or 0)
-        local maxX = inner - self:getWidth()
-            + (self.padding or 0) * 2 + (self.margin or 0) * 2
-        scrollX = math.max(math.min(scrollX, maxX), 0)
-        if scrollX ~= self.scrollX then
-            self.scrollX = scrollX
-            self:reshape()
-            return true
-        end
-    else
-        if not self.scrollY then self.scrollY = 0 end
-        local scrollY = self.scrollY - amount * 10
-        local inner = math.max(self:getContentHeight(), self.innerHeight or 0)
-        local maxY = inner - self:getHeight()
-            + (self.padding or 0) * 2 + (self.margin or 0) * 2
-        scrollY = math.max(math.min(scrollY, maxY), 0)
-        if scrollY ~= self.scrollY then
-            self.scrollY = scrollY
-            self:reshape()
-            return true
-        end
-    end
-end
-
-return setmetatable(Widget, { __call = metaCall })
diff --git a/src/lib/luigi/widget/button.lua b/src/lib/luigi/widget/button.lua
deleted file mode 100644
index db9814f..0000000
--- a/src/lib/luigi/widget/button.lua
+++ /dev/null
@@ -1,30 +0,0 @@
---[[--
-A button.
-
-Buttons have no special behavior beyond that of generic widgets,
-but themes should give buttons an appropriate appearance.
-
-@usage
--- create a layout containing only a button
-local layout = Layout {
-    type = 'button',
-    id = 'exampleButton',
-    text = 'Press me',
-    width = 100,
-    height = 32,
-}
-
--- handle Press events
-layout.exampleButton:onPress(function (event)
-    print 'You pressed the button.'
-end)
-
--- show the layout
-layout:show()
-
-@widget button
---]]--
-
-return function (self)
-
-end
diff --git a/src/lib/luigi/widget/check.lua b/src/lib/luigi/widget/check.lua
deleted file mode 100644
index ed58e99..0000000
--- a/src/lib/luigi/widget/check.lua
+++ /dev/null
@@ -1,22 +0,0 @@
---[[--
-A check box.
-
-Check boxes toggle their @{attribute.value|value} attribute between
-`true` and `false` when pressed.
-
-Changing the value of a check box causes it to change its appearance to
-indicate its value. The standard themes use the @{attribute.icon|icon}
-attribute for this purpose. If a custom icon is provided when using the
-standard themes, the widget's value should be indicated in some other way.
-
-@widget check
---]]--
-
-return function (self)
-    self:onPress(function (event)
-        if event.button ~= 'left' then return end
-        self.value = not self.value
-    end)
-
-    self.value = not not self.value
-end
diff --git a/src/lib/luigi/widget/menu.lua b/src/lib/luigi/widget/menu.lua
deleted file mode 100644
index fa8ae12..0000000
--- a/src/lib/luigi/widget/menu.lua
+++ /dev/null
@@ -1,15 +0,0 @@
---[[--
-A menu bar.
-
-@widget menu
---]]--
-
-return function (self)
-
-    for index, child in ipairs(self) do
-        child.type = child.type or 'menu.item'
-        child.parentMenu = self
-        child.rootMenu = self
-    end
-
-end
diff --git a/src/lib/luigi/widget/menu/item.lua b/src/lib/luigi/widget/menu/item.lua
deleted file mode 100644
index bc6509d..0000000
--- a/src/lib/luigi/widget/menu/item.lua
+++ /dev/null
@@ -1,243 +0,0 @@
---[[--
-A menu item.
-
-When a `menu` is created, any sub-items not having a specified type
-are automatically given a type of `'menu.item'`. These widgets should
-not be explicitly created.
-
-@widget menu.item
---]]--
-local ROOT = (...):gsub('[^.]*.[^.]*.[^.]*$', '')
-
-local Backend = require(ROOT .. 'backend')
-local Shortcut = require(ROOT .. 'shortcut')
-
-local Layout, Event
-
-local function checkMouseButton (self, event)
-    local button = event.button
-    if not button then return false end
-    if self.isContextMenu then
-        return button == 'left' or button == 'right'
-    end
-    return button == 'left'
-end
-
-local function addLayoutChildren (self)
-    local root = self.menuLayout.root
-    local textWidth = 0
-    local keyWidth = 0
-    local height = 0
-
-    while #root > 0 do rawset(root, #root, nil) end
-
-    root.height = 0
-    root.width = 0
-
-    for index, child in ipairs(self.items) do
-        child.type = child.type or 'menu.item'
-        root:addChild(child)
-        local childHeight = child:getHeight()
-        height = height + childHeight
-        if child.type == 'menu.item' then
-            local font = child:getFont()
-            local pad = child.padding or 0
-            local tw = font:getAdvance(child[2].text)
-                + pad * 2 + childHeight
-            local kw = font:getAdvance(child[3].text)
-                + pad * 2 + childHeight
-            textWidth = math.max(textWidth, tw)
-            keyWidth = math.max(keyWidth, kw)
-        end
-    end
-
-    root.height = height
-    root.width = textWidth + keyWidth + (root.padding or 0)
-
-    local isSubmenu = self.parentMenu and self.parentMenu.parentMenu
-    local w = isSubmenu and self:getWidth() or 0
-    local h = isSubmenu and 0 or self:getHeight()
-    self.menuLayout:placeNear(self:getX(), self:getY(), w, h)
-end
-
-local function show (self)
-    if not self.items or #self.items < 1 then return end
-
-    addLayoutChildren(self)
-    self.menuLayout:show()
-end
-
-local function deactivateSiblings (target)
-    local sibling = target.parent and target.parent[1]
-    local wasSiblingOpen
-
-    if not sibling then
-        return
-    end
-
-    while sibling do
-        local layout = sibling.menuLayout
-        local items = sibling.items
-
-        sibling.active = nil
-
-        if layout and layout.isShown then
-            wasSiblingOpen = true
-            layout:hide()
-        end
-
-        if items and items[1] then
-            deactivateSiblings(items[1])
-        end
-
-        sibling = sibling:getNextSibling()
-    end
-
-    return wasSiblingOpen
-end
-
-local function activate (event, ignoreIfNoneOpen)
-    -- if event.button and event.button ~= 'left' then return end
-    local target = event.target
-
-    while target.parent
-    and target.parent.type ~= 'menu' and target.parent.type ~= 'submenu' do
-        target = target.parent
-        if not target then
-            return
-        end
-    end
-
-    -- if not checkMouseButton(event) then return end
-
-    local wasSiblingOpen = deactivateSiblings(target)
-    local ignore = ignoreIfNoneOpen and not wasSiblingOpen
-
-    if not ignore then
-        show(target)
-        target.active = true
-    end
-end
-
-local function registerLayoutEvents (self)
-    local menuLayout = self.menuLayout
-
-    menuLayout:onReshape(function (event)
-        menuLayout:hide()
-        deactivateSiblings(self.rootMenu[1])
-    end)
-
-    menuLayout:onPressStart(function (event)
-        if not event.hit then
-            menuLayout:hide()
-            if self.parentMenu == self.rootMenu then
-                deactivateSiblings(self.rootMenu[1])
-            end
-        elseif checkMouseButton(self, event) then
-            activate(event)
-        end
-    end)
-
-    menuLayout:onPress(function (event)
-        -- if event.button ~= 'left' then return end
-        if not checkMouseButton(self, event) then return end
-        for widget in event.target:eachAncestor(true) do
-            if widget.type == 'menu.item' and #widget.items == 0 then
-                menuLayout:hide()
-                deactivateSiblings(self.rootMenu[1])
-            end
-        end
-    end)
-
-    menuLayout:onPressEnd(function (event)
-        -- if event.button ~= 'left' then return end
-        if not checkMouseButton(self, event) then return end
-        for widget in event.target:eachAncestor(true) do
-            if widget.type == 'menu.item' and #widget.items == 0
-            and event.target ~= event.origin then
-                widget:bubbleEvent('Press', event)
-            end
-        end
-    end)
-
-    menuLayout:onEnter(activate)
-    menuLayout:onPressEnter(activate)
-end
-
-local function initialize (self)
-    local font = self:getFont()
-    local pad = self.padding or 0
-    local isSubmenu = self.parentMenu and self.parentMenu.parentMenu
-    local text, shortcut, icon = self.text or '', self.shortcut or '', self.icon
-    local textWidth = font:getAdvance(text) + pad * 2
-
-    if isSubmenu then
-        local edgeType
-        if #self.items > 0 then
-            shortcut = ' '
-            edgeType = 'menu.expander'
-        else
-            shortcut = Shortcut.stringify(shortcut)
-        end
-        self.flow = 'x'
-        self:addChild { icon = icon, width = self.height }
-        self:addChild { text = text, width = textWidth }
-        self:addChild {
-            type = edgeType,
-            text = shortcut,
-            align = 'middle right',
-            minwidth = self.height,
-            color = function ()
-                local c = self.color or { 0, 0, 0 }
-                return { c[1], c[2], c[3], (c[4] or 256) / 2 }
-            end
-        }
-
-        self.icon = nil
-        self.text = nil
-    else
-        -- top level menu
-        self.width = textWidth + pad * 2
-        self.align = 'middle center'
-    end
-end
-
-local function extractChildren (self)
-    self.items = {}
-    for index, child in ipairs(self) do
-        self[index] = nil
-        self.items[#self.items + 1] = child
-        child.parentMenu = self
-        child.rootMenu = self.rootMenu
-        child.type = child.type or 'menu.item'
-    end
-end
-
-local function registerEvents (self)
-    self:onPressStart(activate)
-
-    self:onEnter(function (event)
-        activate(event, true)
-    end)
-
-    self:onPressEnter(function (event)
-        activate(event, true)
-    end)
-end
-
-local function createLayout (self)
-    Layout = Layout or require(ROOT .. 'layout')
-
-    self.menuLayout = Layout({ type = 'submenu' }, self.rootMenu.layout)
-end
-
-return function (self)
-    extractChildren(self)
-    initialize(self)
-    registerEvents(self)
-
-    if not self.items or #self.items < 1 then return end
-    createLayout(self)
-    registerLayoutEvents(self)
-    addLayoutChildren(self)
-end
diff --git a/src/lib/luigi/widget/progress.lua b/src/lib/luigi/widget/progress.lua
deleted file mode 100644
index e54ca75..0000000
--- a/src/lib/luigi/widget/progress.lua
+++ /dev/null
@@ -1,41 +0,0 @@
---[[--
-A progress bar.
-
-Set the widget's `value` property to a decimal value
-between 0 and 1 (inclusive) to change the width of the bar.
-
-@widget progress
---]]--
-
-return function (self)
-    self.value = self.value or 0
-
-    local pad = self:addChild {
-        width = 0,
-    }
-    local bar = self:addChild {
-        type = 'progress.bar',
-    }
-
-    self:onChange(function ()
-        self:reshape()
-    end)
-
-    self:onReshape(function ()
-        local x1, y1, w, h = self:getRectangle(true, true)
-        local x2, y2 = x1 + w, y1 + h
-        if self.flow == 'x' then
-            local min = bar.minwidth or 0
-            x1 = x1 + min
-            bar.width = self.value * (x2 - x1) + min
-            bar.height = false
-            pad.height = 0
-        else
-            local min = bar.minheight or 0
-            y1 = y1 + min
-            bar.width = false
-            bar.height = false
-            pad.height = math.ceil(h - (self.value * (y2 - y1) + min))
-        end
-    end)
-end
diff --git a/src/lib/luigi/widget/radio.lua b/src/lib/luigi/widget/radio.lua
deleted file mode 100644
index 74a9e08..0000000
--- a/src/lib/luigi/widget/radio.lua
+++ /dev/null
@@ -1,94 +0,0 @@
---[[--
-A radio widget.
-
-When pressed, a radio widget's @{attribute.value|value} changes to
-`true`, and the values of other radio widgets in the same `group`
-change to `false`.
-
-Changing the value of a radio button causes it to change its appearance to
-indicate its value. The standard themes use the @{attribute.icon|icon}
-attribute for this purpose. If a custom icon is provided when using the
-standard themes, the widget's value should be indicated in some other way.
-
-@widget radio
---]]--
-
-local groups = {}
-
-local function remove (t, value)
-    for i, v in t do
-        if v == value then return table.remove(t, i) end
-    end
-end
-
-local function setGroup (self, value)
-    -- remove the widget from the old group
-    local oldValue = self.attributes.group
-    local oldGroup = oldValue and groups[oldValue]
-    if oldGroup then
-        remove(oldGroup, self)
-        -- TODO: is it safe to remove these?
-        if #oldGroup < 1 then groups[oldValue] = nil end
-    end
-    -- add the widget to the new group, or 'defaultGroup' if no group specified
-    value = value or 'defaultGroup'
-    if not groups[value] then
-        groups[value] = {}
-    end
-    local group = groups[value]
-    group[#group + 1] = self
-    self.attributes.group = value
-    local layout = self:getMasterLayout()
-    if not layout[value] then
-        layout:createWidget { id = value, items = group }
-    end
-    self.groupWidget = layout[value]
-end
-
-return function (self)
-
---[[--
-Special Attributes
-
-@section special
---]]--
-
---[[--
-Widget group.
-
-Should contain a string identifying the widget's group.
-If not defined, defaults to the string `'default'`.
-
-When a radio widget is pressed, the values of other radio widgets
-in the same group change to `false`.
-
-@attrib group
---]]--
-    self:defineAttribute('group', { set = setGroup })
---[[--
-@section end
---]]--
-
-    -- when we bubble events, send them to the group widget
-    local bubbleEvent = self.bubbleEvent
-    function self:bubbleEvent (...)
-        local result = bubbleEvent(self, ...)
-        if result ~= nil then return result end
-        return self.groupWidget:bubbleEvent(...)
-    end
-
-    self:onPress(function (event)
-        if event.button ~= 'left' then return end
-        for _, widget in ipairs(groups[self.group]) do
-            widget.value = widget == self
-        end
-    end)
-
-    self:onChange(function (event)
-         -- change event is only sent to group widget once.
-        if not self.value then return false end
-        self.groupWidget.selected = self
-    end)
-
-    self.value = not not self.value
-end
diff --git a/src/lib/luigi/widget/sash.lua b/src/lib/luigi/widget/sash.lua
deleted file mode 100644
index b0210f2..0000000
--- a/src/lib/luigi/widget/sash.lua
+++ /dev/null
@@ -1,92 +0,0 @@
---[[--
-A sash.
-
-Dragging this widget resizes the widgets adjacent to it.
-A sash should be adjacent to a widget with a specified size
-in the same direction as the parent element's @{attribute.flow|flow}.
-
-For example, if the parent of the sash is `flow = 'x'`
-then either or both of the siblings adjacent to the sash
-should have a specified @{attribute.width|width} attribute.
-
-@usage
--- create a layout containing two widgets separated by a sash
-local layout = Layout {
-    type = 'panel', flow = 'x',
-    { text = 'This is the left side', wrap = true, width = 100 },
-    { type = 'sash' },
-    { text = 'This is the right side', wrap = true },
-}
-
--- show the layout
-layout:show()
-
-@widget sash
---]]--
-
-local function setDimension (widget, name, size)
-    if not widget.parent then
-        widget[name] = size
-        return
-    end
-    local parentDimension = widget.parent:calculateDimension(name)
-    local claimed = 0
-    for i, sibling in ipairs(widget.parent) do
-        local value = sibling[name]
-        if sibling ~= widget and value then
-            if value == 'auto' then
-                value = sibling:calculateDimensionMinimum(name)
-            end
-            claimed = claimed + value
-        end
-    end
-    if claimed + size > parentDimension then
-        size = parentDimension - claimed
-    end
-
-    local min = (name == 'width') and (widget.minwidth or 0)
-        or (widget.minheight or 0)
-
-    widget[name] = math.max(size, min)
-end
-
-
-return function (self)
-
-    self:onEnter(function (event)
-        local axis = self.parent.flow
-        if axis == 'x' then
-            self.cursor = 'sizewe'
-        else
-            self.cursor = 'sizens'
-        end
-    end)
-
-    self:onPressDrag(function (event)
-        if event.button ~= 'left' then return end
-        local axis = self.parent.flow
-        if axis == 'x' then
-            dimension = 'width'
-        else
-            axis = 'y'
-            dimension = 'height'
-        end
-        local prevSibling = self:getPreviousSibling()
-        local nextSibling = self:getNextSibling()
-        local prevSize = prevSibling and prevSibling[dimension]
-        local nextSize = nextSibling and nextSibling[dimension]
-
-        if prevSize or not nextSize then
-            setDimension(prevSibling, dimension,
-                event[axis] - prevSibling:calculatePosition(axis))
-        elseif nextSize then
-            if nextSize == 'auto' then
-                nextSize = nextSibling:calculateDimensionMinimum(dimension)
-            end
-            setDimension(nextSibling, dimension,
-                nextSibling:calculatePosition(axis) + nextSize - event[axis])
-        end
-        self.parent:reshape()
-    end)
-
-end
diff --git a/src/lib/luigi/widget/slider.lua b/src/lib/luigi/widget/slider.lua
deleted file mode 100644
index c4b68e9..0000000
--- a/src/lib/luigi/widget/slider.lua
+++ /dev/null
@@ -1,88 +0,0 @@
---[[--
-A slider.
-
-Dragging this widget changes its `value` property to a
-number between 0 and 1, inclusive.
-
-@widget slider
---]]--
-
-return function (self)
-    local function clamp (value)
-        return value < 0 and 0 or value > 1 and 1 or value
-    end
-
-    self.value = clamp(self.value or 0)
-    self.step = self.step or 0.01
-
-    local spacer = self:addChild()
-
-    local thumb = self:addChild {
-        type = 'slider.thumb',
-    }
-
-    local function unpress (event)
-        if event.button ~= 'left' then return end
-        thumb.pressed.left = nil -- don't make the thumb appear pushed in
-        return false -- don't press thumb on focused keyboard activation
-    end
-
-    thumb:onPressStart(unpress)
-    thumb:onPressEnter(unpress)
-
-    thumb:onKeyPress(function (event)
-        local key = event.key
-        if key == 'left' or key == 'down' then
-            self.value = clamp(self.value - self.step)
-        elseif key == 'right' or key == 'up' then
-            self.value = clamp(self.value + self.step)
-        end
-    end)
-
-    local function press (event)
-        if event.button ~= 'left' then return end
-        local x1, y1, w, h = self:getRectangle(true, true)
-        local x2, y2 = x1 + w, y1 + h
-        if self.flow == 'x' then
-            local halfThumb = thumb:getWidth() / 2
-            x1, x2 = x1 + halfThumb, x2 - halfThumb
-            self.value = clamp((event.x - x1) / (x2 - x1))
-        else
-            local halfThumb = thumb:getHeight() / 2
-            y1, y2 = y1 + halfThumb, y2 - halfThumb
-            self.value = 1 - clamp((event.y - y1) / (y2 - y1))
-        end
-        thumb:focus()
-    end
-
-    self:onPressStart(press)
-    self:onPressDrag(press)
-
-    self:onEnter(function (event)
-        thumb.hovered = true
-    end)
-
-    self:onLeave(function (event)
-        thumb.hovered = false
-    end)
-
-    self:onChange(function (event)
-        self:reshape()
-    end)
-
-    self:onReshape(function (event)
-        local x1, y1, w, h = self:getRectangle(true, true)
-        local x2, y2 = x1 + w, y1 + h
-        if self.flow == 'x' then
-            local halfThumb = thumb:getWidth() / 2
-            x1, x2 = x1 + halfThumb, x2 - halfThumb
-            spacer.width = self.value * (x2 - x1)
-            spacer.height = false
-        else
-            local halfThumb = thumb:getHeight() / 2
-            y1, y2 = y1 + halfThumb, y2 - halfThumb
-            spacer.width = false
-            spacer.height = (1 - self.value) * (y2 - y1)
-        end
-    end)
-end
diff --git a/src/lib/luigi/widget/status.lua b/src/lib/luigi/widget/status.lua
deleted file mode 100644
index 2094a47..0000000
--- a/src/lib/luigi/widget/status.lua
+++ /dev/null
@@ -1,26 +0,0 @@
---[[--
-A status bar.
-
-This widget will display the @{attribute.status|status} attribute of the
-hovered widget. Only one status widget should exist per layout. If multiple
-status widgets exist in the same layout, only the last one created will
-display status messages.
-
-@usage
--- create a layout containing some buttons and a status bar
-local layout = Layout {
-    { type = 'panel', flow = 'x',
-        { text = 'Do stuff', status = 'Press to do stuff' },
-        { text = 'Quit', status = 'Press to quit' },
-    },
-    { type = 'status', height = 24 },
-}
-
--- show the layout
-layout:show()
-
-@widget status
---]]--
-return function (self)
-    self.layout.statusWidget = self
-end
diff --git a/src/lib/luigi/widget/stepper.lua b/src/lib/luigi/widget/stepper.lua
deleted file mode 100644
index cdc2668..0000000
--- a/src/lib/luigi/widget/stepper.lua
+++ /dev/null
@@ -1,112 +0,0 @@
---[[--
-A stepper.
-
-This widget is composed of two buttons and a content area.
-Upon creation, this widget's children are moved into the
-`items` attribute. The items are displayed one at a time in
-the content area. Pressing the buttons cycles through the
-item displayed in the content area.
-
-@widget stepper
---]]--
-
-return function (self)
-
---[[--
-Special Attributes
-
-@section special
---]]--
-
---[[--
-Content items.
-
-Contains an array of child widgets to be displayed.
-
-@attrib items
---]]--
-    self:defineAttribute('items', {})
-
---[[--
-Child item index.
-
-Contains the index in `items` of the item being displayed.
-
-@attrib index
---]]--
-    self:defineAttribute('index', {})
---[[--
-@section end
---]]--
-
-    self.items = {}
-    self.index = 1
-
-    for index, child in ipairs(self) do
-        child.type = child.type or 'stepper.item'
-        self.items[index] = child
-        self[index] = nil
-    end
-
-    local before = self:addChild { type = 'stepper.before' }
-    local view = self:addChild { type = 'stepper.view' }
-    local after = self:addChild { type = 'stepper.after' }
-
-    self:onReshape(function (event)
-        if self.flow == 'x' then
-            before.height = false
-            after.height = false
-            before.width = 0
-            after.width = 0
-        else
-            before.width = false
-            after.width = false
-            before.height = 0
-            after.height = 0
-        end
-    end)
-
-    local function updateValue ()
-        local item = self.items[self.index]
-        self.value = item.value
-        view[1] = nil
-        view:addChild(item)
-        view:reshape()
-    end
-
-    local function decrement ()
-        if not self.items then return end
-        self.index = self.index - 1
-        if self.index < 1 then
-            self.index = #self.items
-        end
-        updateValue()
-    end
-
-    local function increment ()
-        if not self.items then return end
-        self.index = self.index + 1
-        if self.index > #self.items then
-            self.index = 1
-        end
-        updateValue()
-    end
-
-    before:onPress(function (event)
-        if event.button ~= 'left' then return end
-        if self.flow == 'x' then decrement() else increment() end
-    end)
-
-    after:onPress(function (event)
-        if event.button ~= 'left' then return end
-        if self.flow == 'x' then increment() else decrement() end
-    end)
-
-    self:onChange(function (event)
-        if self.value == "override" then
-            updateValue()
-        end
-    end)
-
-    updateValue()
-end
diff --git a/src/lib/luigi/widget/text.lua b/src/lib/luigi/widget/text.lua
deleted file mode 100644
index 1d542c8..0000000
--- a/src/lib/luigi/widget/text.lua
+++ /dev/null
@@ -1,441 +0,0 @@
---[[--
-A text entry area.
-
-@widget text
---]]--
-local ROOT = (...):gsub('[^.]*.[^.]*$', '')
-
-local utf8 = require(ROOT .. 'utf8')
-local Backend = require(ROOT .. 'backend')
-
--- make sure selection range doesn't extend past EOT
-local function trimRange (self)
-    local max = #self.value
-    if self.startIndex > max then self.startIndex = max end
-    if self.endIndex > max then self.endIndex = max end
-end
-
-local function updateHighlight (self)
-    local value = self.value
-    local font = self:getFont()
-    local startIndex, endIndex = self.startIndex, self.endIndex
-    local offset = self:getRectangle(true, true) - self.scrollX
-    self.startX = font:getAdvance(value:sub(1, startIndex)) + offset
-    self.endX = font:getAdvance(value:sub(1, endIndex)) + offset
-end
-
-local function scrollToCaret (self)
-    updateHighlight(self)
-    local x1, y1, w, h = self:getRectangle(true, true)
-    local x2, y2 = x1 + w, y1 + h
-    local oldX = self.endX or x1
-
-    if oldX <= x1 then
-        self.scrollX = self.scrollX - (x1 - oldX)
-        updateHighlight(self)
-    elseif oldX >= x2 then
-        self.scrollX = self.scrollX + (oldX - x2 + 1)
-        updateHighlight(self)
-    end
-end
-
-local function selectRange (self, startIndex, endIndex)
-    if startIndex then self.startIndex = startIndex end
-    if endIndex then self.endIndex = endIndex end
-    trimRange(self)
-
-    scrollToCaret(self)
-end
-
--- return caret index
-local function findIndexFromPoint (self, x, y)
-    local x1 = self:getRectangle(true, true)
-
-    local font = self.fontData
-    local width = 0
-    local lastPosition = 0
-
-    local function checkPosition (position)
-        local text = self.value:sub(1, position - 1)
-        width = font:getAdvance(text)
-        if width > x + self.scrollX - x1 then
-            if position == 1 then
-                return 0
-            end
-            return lastPosition
-        end
-        lastPosition = position - 1
-    end
-
-    for position in utf8.codes(self.value) do
-        local index = checkPosition(position)
-        if index then return index end
-    end
-
-    local index = checkPosition(#self.value + 1)
-    if index then return index end
-
-    return #self.value
-end
-
--- move the caret or end of selection range one character to the left
-local function moveCharLeft (self, alterRange)
-    trimRange(self)
-    local text, endIndex = self.value, self.endIndex
-
-    -- clamp caret to beginning
-    if endIndex < 1 then endIndex = 1 end
-
-    -- move left
-    local index = (utf8.offset(text, -1, endIndex + 1) or 0) - 1
-    selectRange(self, not alterRange and index, index)
-end
-
--- move caret or end of selection range one word to the left
-local function moveWordLeft (self, alterRange)
-    trimRange(self)
-    local text = self.value:sub(1, self.endIndex)
-    local pos = text:find('%s[^%s]+%s*$') or 0
-    selectRange(self, not alterRange and pos, pos)
-end
-
--- move the caret or end of selection range to the beginning of the line
-local function moveLineLeft (self, alterRange)
-    trimRange(self)
-    selectRange(self, not alterRange and 0, 0)
-end
-
--- move caret or end of selection range one character to the right
-local function moveCharRight (self, alterRange)
-    trimRange(self)
-    local text, endIndex = self.value, self.endIndex
-
-    -- clamp caret to end
-    if endIndex >= #text then endIndex = #text - 1 end
-
-    -- move right
-    local index = (utf8.offset(text, 2, endIndex + 1) or #text) - 1
-    selectRange(self, not alterRange and index, index)
-end
-
--- move caret or end of selection range one word to the right
-local function moveWordRight (self, alterRange)
-    trimRange(self)
-    local text = self.value
-    local _, pos = text:find('^%s*[^%s]+', self.endIndex + 1)
-    pos = pos or #text + 1
-    selectRange(self, not alterRange and pos, pos)
-end
-
--- move caret or end of selection range to the end of the line
-local function moveLineRight (self, alterRange)
-    trimRange(self)
-    local text = self.value
-    selectRange(self, not alterRange and #text, #text)
-end
-
-local function getRange (self)
-    trimRange(self)
-    if self.startIndex <= self.endIndex then
-        return self.startIndex, self.endIndex
-    end
-
-    return self.endIndex, self.startIndex
-end
-
-local function deleteRange (self)
-    trimRange(self)
-    local text = self.value
-    local first, last = getRange(self)
-
-    -- if expanded range is selected, delete text in range
-    if first ~= last then
-        local left = text:sub(1, first)
-        local index = #left
-        self.value = left .. text:sub(last + 1)
-        selectRange(self, index, index)
-        return true
-    end
-end
-
-local function deleteCharacterLeft (self)
-    trimRange(self)
-    local text = self.value
-    local first, last = getRange(self)
-
-    -- if cursor is at beginning, do nothing
-    if first < 1 then
-        return
-    end
-
-    -- delete character to the left
-    local offset = utf8.offset(text, -1, last + 1) or 0
-    local left = text:sub(1, offset - 1)
-    local index = #left
-    self.value = left .. text:sub(first + 1)
-    selectRange(self, index, index)
-end
-
-local function deleteCharacterRight (self)
-    trimRange(self)
-    local text = self.value
-    local first, last = getRange(self)
-
-    -- if cursor is at end, do nothing
-    if first == #text then
-        return
-    end
-
-    -- delete character to the right
-    local offset = utf8.offset(text, 2, last + 1) or 0
-    local left = text:sub(1, first)
-    local index = #left
-    self.value = left .. text:sub(offset)
-    selectRange(self, index, index)
-end
-
-local function copyRangeToClipboard (self)
-    trimRange(self)
-    local text = self.value
-    local first, last = getRange(self)
-    if last >= first + 1 then
-        Backend.setClipboardText(text:sub(first + 1, last))
-    end
-end
-
-local function pasteFromClipboard (self)
-    trimRange(self)
-    local text = self.value
-    local pasted = Backend.getClipboardText() or ''
-    local first, last = getRange(self)
-    local left = text:sub(1, first) .. pasted
-    local index = #left
-    self.value = left .. text:sub(last + 1)
-    selectRange(self, index, index)
-end
-
-local function insertText (self, newText)
-    trimRange(self)
-    local text = self.value
-    local first, last = getRange(self)
-    local left = text:sub(1, first) .. newText
-    local index = #left
-    self.value = left .. text:sub(last + 1)
-    selectRange(self, index, index)
-end
-
-local function isShiftPressed ()
-    return Backend.isKeyDown('lshift', 'rshift')
-end
-
--- check command (gui) key, only on Mac.
-local isCommandPressed
-if Backend.isMac() then
-    isCommandPressed = function ()
-        return Backend.isKeyDown('lgui', 'rgui')
-    end
-else
-    isCommandPressed = function ()
-        return false
-    end
-end
-
--- check command (gui) key on Mac and ctrl key everywhere else.
-local isCommandOrCtrlPressed
-if Backend.isMac() then
-    isCommandOrCtrlPressed = function ()
-        return Backend.isKeyDown('lgui', 'rgui')
-    end
-else
-    isCommandOrCtrlPressed = function ()
-        return Backend.isKeyDown('lctrl', 'rctrl')
-    end
-end
-
--- check option (alt) key on Mac and ctrl key everywhere else.
-local isOptionOrCtrlPressed
-if Backend.isMac() then
-    isOptionOrCtrlPressed = function ()
-        return Backend.isKeyDown('lalt', 'ralt')
-    end
-else
-    isOptionOrCtrlPressed = function ()
-        return Backend.isKeyDown('lctrl', 'rctrl')
-    end
-end
-
--- Special keys.
-local function createDefaultKeyActions (self)
-    return {
-        -- let tab press propagate
-        ['tab'] = function () return true end,
-        ['backspace'] = function ()
-            if not deleteRange(self) then
-                deleteCharacterLeft(self)
-            end
-        end,
-        ['delete'] = function ()
-            if not deleteRange(self) then
-                deleteCharacterRight(self)
-            end
-        end,
-        ['left'] = function ()
-            if isOptionOrCtrlPressed() then
-                moveWordLeft(self, isShiftPressed())
-            elseif isCommandPressed() then
-                moveLineLeft(self, isShiftPressed())
-            else
-                moveCharLeft(self, isShiftPressed())
-            end
-        end,
-        ['right'] = function ()
-            if isOptionOrCtrlPressed() then
-                moveWordRight(self, isShiftPressed())
-            elseif isCommandPressed() then
-                moveLineRight(self, isShiftPressed())
-            else
-                moveCharRight(self, isShiftPressed())
-            end
-        end,
-        ['home'] = function ()
-            moveLineLeft(self, isShiftPressed())
-        end,
-        ['end'] = function ()
-            moveLineRight(self, isShiftPressed())
-        end,
-        ['x'] = function ()
-            if isCommandOrCtrlPressed() then
-                copyRangeToClipboard(self)
-                deleteRange(self)
-            end
-        end,
-        ['c'] = function ()
-            if isCommandOrCtrlPressed() then
-                copyRangeToClipboard(self)
-            end
-        end,
-        ['v'] = function ()
-            if isCommandOrCtrlPressed() then
-                pasteFromClipboard(self)
-            end
-        end,
-        ['a'] = function ()
-            if isCommandOrCtrlPressed() then
-                selectRange(self, 0, #self.value)
-            end
-        end,
-    }
-end
-
-local textInputKeys = {
-    ['space'] = true,
-    ['return'] = true,
-    ['kp00'] = true,
-    ['kp000'] = true,
-    ['kp&&'] = true,
-    ['kp||'] = true,
-}
-
-local function isKeyTextInput (key)
-    if textInputKeys[key] or #key == 1
-    or (#key == 3 and key:sub(1, 2) == "kp") then
-        return not Backend.isKeyDown(
-            'lalt', 'ralt', 'lctrl', 'rctrl', 'lgui', 'rgui')
-    end
-    return false
-end
-
-return function (self)
-    self.startIndex, self.endIndex = 0, 0
-    self.startX, self.endX = -1, -1
-    self.scrollX = 0
-    self.value = tostring(self.value or self.text or '')
-    self.text = ''
-    self.keyActions = createDefaultKeyActions(self)
-
---[[--
-Special Attributes
-
-@section special
---]]--
-
---[[--
-Highlight color.
-
-Should contain an array with 3 or 4 values (RGB or RGBA) from 0 to 255.
-
-This color is used to indicate the selected range of text.
-
-@attrib highlight
---]]--
-
-    self:defineAttribute('highlight')
-    local defaultHighlight = { 0x80, 0x80, 0x80, 0x80 }
---[[--
-@section end
---]]--
-
-    self:onPressStart(function (event)
-        if event.button ~= 'left' then return end
-        self.startIndex = findIndexFromPoint(self, event.x)
-        self.endIndex = self.startIndex
-        scrollToCaret(self)
-    end)
-
-    self:onPressDrag(function (event)
-        if event.button ~= 'left' then return end
-        self.endIndex = findIndexFromPoint(self, event.x)
-        scrollToCaret(self)
-    end)
-
-    self:onTextInput(function (event)
-        insertText(self, event.text)
-    end)
-
-    self:onKeyPress(function (event)
-        local key = event.key
-        local act = self.keyActions[key]
-        if act then
-            if act() then return end
-        end
-        return isKeyTextInput(key) or nil
-    end)
-
-    self:onDisplay(function (event)
-        local startX, endX = self.startX, self.endX
-        local x, y, w, h = self:getRectangle(true, true)
-        local width, height = endX - startX, h
-        local font = self:getFont()
-        local color = self.color or { 0, 0, 0, 255 }
-        local textTop = math.floor(y + (h - font:getLineHeight()) / 2)
-
-        Backend.push()
-        Backend.intersectScissor(x, y, w, h)
-        Backend.setFont(font)
-
-        if self.focused then
-            -- draw highlighted selection
-            Backend.setColor(self.highlight or defaultHighlight)
-            Backend.drawRectangle('fill', startX, y, width, height)
-            -- draw cursor selection
-            if Backend.getTime() % 2 < 1.75 then
-                Backend.setColor(color)
-                Backend.drawRectangle('fill', endX, y, 1, height)
-            end
-        else
-            Backend.setColor { color[1], color[2], color[3],
-                (color[4] or 256) / 8 }
-            Backend.drawRectangle('fill', startX, y, width, height)
-        end
-
-        -- draw text
-        Backend.setColor(color)
-        Backend.print(self.value, x - self.scrollX, textTop)
-
-        Backend.pop()
-    end)
-
-    self:onReshape(function ()
-        updateHighlight(self)
-    end)
-end
diff --git a/src/lib/luigi/widget/window.lua b/src/lib/luigi/widget/window.lua
deleted file mode 100644
index 237edd4..0000000
--- a/src/lib/luigi/widget/window.lua
+++ /dev/null
@@ -1,265 +0,0 @@
---[[--
-Window widget.
-
-Set properties of the window with this widget's attributes.
-This widget should only be used as the root widget of a layout.
-
-@usage
--- create a new window
-local window = Layout {
-    type = 'window',
-    icon = 'logo.png',
-    text = 'Window Example',
-    width = 800,
-    height = 600,
-    { icon = 'logo.png', text = 'Window Example', align = 'middle center' },
-    { type = 'panel', flow = 'x', height = 'auto',
-        {}, -- spacer
-        { type = 'button', id = 'quitButton', text = 'Quit' }
-    }
-}
-
--- handle quit button
-window.quitButton:onPress(function ()
-    os.exit()
-end)
-
--- show the window
-window:show()
-
-@widget window
---]]--
-
-local ROOT = (...):gsub('[^.]*.[^.]*$', '')
-
-local Backend = require(ROOT .. 'backend')
-
-return function (self)
-
-    function self:calculateRootPosition (axis)
-        self.position[axis] = 0
-        return 0
-    end
-
-    function self.painter:paintIconAndText () end
-
---[[--
-Special Attributes
-
-@section special
---]]--
-
---[[--
-Maximized. Set to `true` to make the window as large as possible.
-Set to `false` to restore the size and position.
-
-@attrib maximized
---]]--
-    self:defineAttribute('maximized', {
-        set = function (_, value)
-            if value == nil then return end
-            Backend.setWindowMaximized(value)
-            self.layout.root:reshape()
-        end,
-        get = Backend.getWindowMaximized
-    })
-
---[[--
-Minimized. Set to `true` to minimize the window to an iconic representation.
-Set to `false` to restore the size and position.
-
-@attrib minimized
---]]--
-    self:defineAttribute('minimized', {
-        set = function (_, value)
-            if value == nil then return end
-            Backend.setWindowMinimized(value)
-        end,
-        get = Backend.getWindowMinimized
-    })
-
---[[--
-Borderless. Set to `true` or `false` to change the border state of the window.
-You can't change the border state of a fullscreen window.
-
-@attrib borderless
---]]--
-    self:defineAttribute('borderless', {
-        set = function (_, value)
-            if value == nil then return end
-            Backend.setWindowBorderless(value)
-            self.layout.root:reshape()
-        end,
-        get = Backend.getWindowBorderless
-    })
-
---[[--
-Fullscreen. Set to `true` or `false` to change the fullscreen state
-of the window.
-
-@attrib fullscreen
---]]--
-    self:defineAttribute('fullscreen', {
-        set = function (_, value)
-            if value == nil then return end
-            Backend.setWindowFullscreen(value)
-            self.layout.root:reshape()
-        end,
-        get = Backend.getWindowFullscreen
-    })
-
---[[--
-Mouse grab. Set to `true` or `false` to change the window's input grab mode.
-When input is grabbed the mouse is confined to the window.
-
-If the caller enables a grab while another window is currently grabbed,
-the other window loses its grab in favor of the caller's window.
-
-@attrib grab
---]]--
-    self:defineAttribute('grab', {
-        set = function (_, value)
-            if value == nil then return end
-            Backend.setWindowGrab(value)
-        end,
-        get = Backend.getWindowGrab
-    })
-
---[[--
-Window icon. Should be a string containing a path to an image.
-
-@attrib icon
---]]--
-    local icon
-
-    self:defineAttribute('icon', {
-        set = function (_, value)
-            if value == nil then return end
-            icon = value
-            Backend.setWindowIcon(value)
-        end,
-        get = function () return icon end
-    })
---[[--
-Maximum width of the window's client area.
-
-@attrib maxwidth
---]]--
-    self:defineAttribute('maxwidth', {
-        set = function (_, value)
-            if value == nil then return end
-            Backend.setWindowMaxwidth(value)
-        end,
-        get = Backend.getWindowMaxwidth
-    })
-
---[[--
-Maximum height of the window's client area.
-
-@attrib maxheight
---]]--
-    self:defineAttribute('maxheight', {
-        set = function (_, value)
-            if value == nil then return end
-            Backend.setWindowMaxheight(value)
-        end,
-        get = Backend.getWindowMaxheight
-    })
-
---[[--
-Minimum width of the window's client area.
-
-@attrib minwidth
---]]--
-    self:defineAttribute('minwidth', {
-        set = function (_, value)
-            if value == nil then return end
-            Backend.setWindowMinwidth(value)
-        end,
-        get = Backend.getWindowMinwidth
-    })
-
---[[--
-Minimum height of the window's client area.
-
-@attrib minheight
---]]--
-    self:defineAttribute('minheight', {
-        set = function (_, value)
-            if value == nil then return end
-            Backend.setWindowMinheight(value)
-        end,
-        get = Backend.getWindowMinheight
-    })
-
---[[--
-Position of the window's top edge.
-
-@attrib top
---]]--
-    self:defineAttribute('top', {
-        set = function (_, value)
-            if value == nil then return end
-            Backend.setWindowTop(value)
-        end,
-        get = Backend.getWindowTop
-    })
-
---[[--
-Position of the window's left edge.
-
-@attrib left
---]]--
-    self:defineAttribute('left', {
-        set = function (_, value)
-            if value == nil then return end
-            Backend.setWindowLeft(value)
-        end,
-        get = Backend.getWindowLeft
-    })
-
---[[--
-Width of the window's content area.
-
-@attrib width
---]]--
-    self:defineAttribute('width', {
-        set = function (_, value)
-            if value == nil then return end
-            Backend.setWindowWidth(value)
-            self.layout.root:reshape()
-        end,
-        get = Backend.getWindowWidth
-    })
-
---[[--
-Height of the window's content area.
-
-@attrib height
---]]--
-    self:defineAttribute('height', {
-        set = function (_, value)
-            if value == nil then return end
-            Backend.setWindowHeight(value)
-            self.layout.root:reshape()
-        end,
-        get = Backend.getWindowHeight
-    })
-
---[[--
-Title of the window.
-
-@attrib title
---]]--
-    self:defineAttribute('title', {
-        set = function (_, value)
-            if value == nil then return end
-            Backend.setWindowTitle(value)
-        end,
-        get = Backend.getWindowTitle
-    })
-
---[[--
-@section end
---]]--
-end
diff --git a/src/lib/moses.lua b/src/lib/moses.lua
deleted file mode 100644
index 0b406fd..0000000
--- a/src/lib/moses.lua
+++ /dev/null
@@ -1,2250 +0,0 @@
---- Utility-belt library for functional programming in Lua ([source](http://github.com/Yonaba/Moses))
--- @author [Roland Yonaba](http://github.com/Yonaba)
--- @copyright 2012-2017
--- @license [MIT](http://www.opensource.org/licenses/mit-license.php)
--- @release 1.6.1
--- @module moses
-
-local _MODULEVERSION = '1.6.1'
-
--- Internalisation
-local next, type, select, pcall  = next, type, select, pcall
-local setmetatable, getmetatable = setmetatable, getmetatable
-local t_insert, t_sort           = table.insert, table.sort
-local t_remove,t_concat          = table.remove, table.concat
-local randomseed, random, huge   = love.math.setRandomSeed, love.math.random, math.huge
-local floor, max, min            = math.floor, math.max, math.min
-local rawget                     = rawget
-local unpack                     = table.unpack or unpack
-local pairs,ipairs               = pairs,ipairs
-local clock                      = os.clock
-local _                          = {}
-
-
--- ======== Private helpers
-
-local function f_max(a,b) return a>b end
-local function f_min(a,b) return a<b end
-local function clamp(var,a,b) return (var<a) and a or (var>b and b or var) end
-local function isTrue(_,value) return value and true end
-local function iNot(value) return not value end
-
-local function count(t)  -- raw count of items in an map-table
-  local i = 0
-    for k,v in pairs(t) do i = i + 1 end
-  return i
-end
-
-local function extract(list,comp,transform,...) -- extracts value from a list
-  local _ans
-  local transform = transform or _.identity
-  for index,value in pairs(list) do
-    if not _ans then _ans = transform(value,...)
-    else
-      local value = transform(value,...)
-      _ans = comp(_ans,value) and _ans or value
-    end
-  end
-  return _ans
-end
-
-local function partgen(t, n, f, pad) -- generates array partitions
-  for i = 0, #t, n do
-    local s = _.slice(t, i+1, i+n)
-    if #s>0 then
-      while (#s < n and pad) do s[#s+1] = pad end
-      f(s)
-    end
-  end
-end
-
-local function partgen2(t, n, f, pad) -- generates sliding array partitions
-  for i = 0, #t, n-1 do
-    local s = _.slice(t, i+1, i+n)
-    if #s>0 and i+1<#t then
-      while (#s < n and pad) do s[#s+1] = pad end
-      f(s)
-    end
-  end
-end
-
-local function permgen(t, n, f) -- taken from PiL: http://www.lua.org/pil/9.3.html
-  if n == 0 then f(t) end
-  for i = 1,n do
-    t[n], t[i] = t[i], t[n]
-    permgen(t, n-1, f)
-    t[n], t[i] = t[i], t[n]
-  end
-end
-
--- Internal counter for unique ids generation
-local unique_id_counter = -1
-
---- Table functions
--- @section Table functions
-
---- Clears a table. All its values become nil.
--- @name clear
--- @param t a table
--- @return the given table, cleared.
-function _.clear(t)
-  for k in pairs(t) do t[k] = nil end
-  return t
-end
-
---- Iterates on key-value pairs, calling `f (k, v)` at every step.
--- <br/><em>Aliased as `forEach`</em>.
--- @name each
--- @param t a table
--- @param f a function, prototyped as `f (k, v, ...)`
--- @param[opt] ... Optional args to be passed to `f`
--- @see eachi
-function _.each(t, f, ...)
-  for index,value in pairs(t) do
-    f(index,value,...)
-  end
-end
-
---- Iterates on integer key-value pairs, calling `f(k, v)` every step.
--- Only applies to values located at integer keys. The table can be a sparse array.
--- Iteration will start from the lowest integer key found to the highest one.
--- <br/><em>Aliased as `forEachi`</em>.
--- @name eachi
--- @param t a table
--- @param f a function, prototyped as `f (k, v, ...)`
--- @param[opt] ... Optional args to be passed to `f`
--- @see each
-function _.eachi(t, f, ...)
-  local lkeys = _.sort(_.select(_.keys(t), function(k,v)
-    return _.isInteger(v)
-  end))
-  for k, key in ipairs(lkeys) do
-    f(key, t[key],...)
-  end
-end
-
---- Collects values at given keys and return them wrapped in an array.
--- @name at
--- @param t a table
--- @param ... A variable number of keys to collect values
--- @return an array-list of values
-function _.at(t, ...)
-  local values = {}
-  for i, key in ipairs({...}) do
-    if _.has(t, key) then values[#values+1] = t[key] end
-  end
-  return values
-end
-
---- Counts occurrences of a given value in a table. Uses @{isEqual} to compare values.
--- @name count
--- @param t a table
--- @param[opt] value a value to be searched in the table. If not given, the @{size} of the table will be returned
--- @return the count of occurrences of the given value
--- @see countf
--- @see size
-function _.count(t, value)
-  if _.isNil(value) then return _.size(t) end
-  local count = 0
-  _.each(t, function(k,v)
-    if _.isEqual(v, value) then count = count + 1 end
-  end)
-  return count
-end
-
---- Counts occurrences validating a predicate. Same as @{count}, but uses an iterator.
--- Returns the count for values passing the test `f (k, v, ...)`
--- @name countf
--- @param t a table
--- @param f an iterator function, prototyped as `f (k, v, ...)`
--- @param[opt] ... Optional args to be passed to `f`
--- @return the count of values validating the predicate
--- @see count
--- @see size
-function _.countf(t, f, ...)
-  return _.count(_.map(t, f, ...), true)
-end
-
---- Loops `n` times through a table. In case `n` is omitted, it will loop forever.
--- In case `n` is lower or equal to 0, it returns an empty function.
--- <br/><em>Aliased as `loop`</em>.
--- @name cycle
--- @param t a table
--- @param n the number of loops
--- @return an iterator function yielding key-value pairs from the passed-in table.
-function _.cycle(t, n)
-  n = n or 1
-  if n<=0 then return _.noop end
-  local k, fk
-  local i = 0
-  while true do
-    return function()
-      k = k and next(t,k) or next(t)
-      fk = not fk and k or fk
-      if n then
-        i = (k==fk) and i+1 or i
-        if i > n then
-          return
-        end
-      end
-      return k, t[k]
-    end
-  end
-end
-
---- Maps `f (k, v)` on key-value pairs, collects and returns the results.
--- <br/><em>Aliased as `collect`</em>.
--- @name map
--- @param t a table
--- @param f  an iterator function, prototyped as `f (k, v, ...)`
--- @param[opt] ... Optional args to be passed to `f`
--- @return a table of results
-function _.map(t, f, ...)
-  local _t = {}
-  for index,value in pairs(t) do
-    local k, kv, v = index, f(index,value,...)
-    _t[v and kv or k] = v or kv
-  end
-  return _t
-end
-
---- Reduces a table, left-to-right. Folds the table from the first element to the last element
--- to a single value, using a given iterator and an initial state.
--- The iterator takes a state and a value and returns a new state.
--- <br/><em>Aliased as `inject`, `foldl`</em>.
--- @name reduce
--- @param t a table
--- @param f an iterator function, prototyped as `f (state, value)`
--- @param[opt] state an initial state of reduction. Defaults to the first value in the table.
--- @return the final state of reduction
--- @see reduceRight
--- @see reduceby
-function _.reduce(t, f, state)
-  for __,value in pairs(t) do
-    if state == nil then state = value
-    else state = f(state,value)
-    end
-  end
-  return state
-end
-
---- Reduces values in a table passing a given predicate. Folds the table left-to-right, considering
--- only values validating a given predicate.
--- @name reduceby
--- @param t a table
--- @param f an iterator function, prototyped as `f (state, value)`
--- @param state an initial state of reduction.
--- @param pred a predicate function `pred (k, v, ...)` to select values to be considered for reduction
--- @param[opt] ... optional args to be passed to `pred`
--- @return the final state of reduction
--- @see reduce
-function _.reduceby(t, f, state, pred, ...)
-  return _.reduce(_.select(t, pred, ...), f, state)
-end
-
---- Reduces a table, right-to-left. Folds the table from the last element to the first element
--- to single value, using a given iterator and an initial state.
--- The iterator takes a state and a value, and returns a new state.
--- <br/><em>Aliased as `injectr`, `foldr`</em>.
--- @name reduceRight
--- @param t a table
--- @param f an iterator function, prototyped as `f (state, value)`
--- @param[opt] state an initial state of reduction. Defaults to the last value in the table.
--- @return the final state of reduction
--- @see reduce
-function _.reduceRight(t, f, state)
-  return _.reduce(_.reverse(t),f,state)
-end
-
---- Reduces a table while saving intermediate states. Folds the table left-to-right
--- using a given iterator and an initial state. The iterator takes a state and a value,
--- and returns a new state. The result is an array of intermediate states.
--- <br/><em>Aliased as `mapr`</em>
--- @name mapReduce
--- @param t a table
--- @param f an iterator function, prototyped as `f (state, value)`
--- @param[opt] state an initial state of reduction. Defaults to the first value in the table.
--- @return an array of states
--- @see mapReduceRight
-function _.mapReduce(t, f, state)
-  local _t = {}
-  for i,value in pairs(t) do
-    _t[i] = not state and value or f(state,value)
-    state = _t[i]
-  end
-  return _t
-end
-
---- Reduces a table while saving intermediate states. Folds the table right-to-left
--- using a given iterator and an initial state. The iterator takes a state and a value,
--- and returns a new state. The result is an array of intermediate states.
--- <br/><em>Aliased as `maprr`</em>
--- @name mapReduceRight
--- @param t a table
--- @param f an iterator function, prototyped as `f (state, value)`
--- @param[opt] state an initial state of reduction. Defaults to the last value in the table.
--- @return an array of states
--- @see mapReduce
-function _.mapReduceRight(t, f, state)
-  return _.mapReduce(_.reverse(t),f,state)
-end
-
---- Performs a linear search for a value in a table. It does not work for nested tables.
--- The given value can be a function prototyped as `f (v, value)` which should return true when
--- any v in the table equals the value being searched.
--- <br/><em>Aliased as `any`, `some`, `contains`</em>
--- @name include
--- @param t a table
--- @param value a value to search for
--- @return a boolean : `true` when found, `false` otherwise
--- @see detect
-function _.include(t, value)
-  local _iter = _.isFunction(value) and value or _.isEqual
-  for __,v in pairs(t) do
-    if _iter(v,value) then return true end
-  end
-  return false
-end
-
---- Performs a linear search for a value in a table. Returns the key of the value if found.
--- The given value can be a function prototyped as `f (v, value)` which should return true when
--- any v in the table equals the value being searched.
--- @name detect
--- @param t a table
--- @param value a value to search for
--- @return the key of the value when found or __nil__
--- @see include
-function _.detect(t, value)
-  local _iter = _.isFunction(value) and value or _.isEqual
-  for key,arg in pairs(t) do
-    if _iter(arg,value) then return key end
-  end
-end
-
---- Returns all values having specified keys `props`.
--- @name where
--- @param t a table
--- @param props a set of keys
--- @return an array of values from the passed-in table
--- @see findWhere
-function _.where(t, props)
-  local r = _.select(t, function(__,v)
-    for key in pairs(props) do
-      if v[key] ~= props[key] then return false end
-    end
-    return true
-  end)
-  return #r > 0 and r or nil
-end
-
---- Returns the first value having specified keys `props`.
--- @name findWhere
--- @param t a table
--- @param props a set of keys
--- @return a value from the passed-in table
--- @see where
-function _.findWhere(t, props)
-  local index = _.detect(t, function(v)
-    for key in pairs(props) do
-      if props[key] ~= v[key] then return false end
-    end
-    return true
-  end)
-  return index and t[index]
-end
-
---- Selects and returns values passing an iterator test.
--- <br/><em>Aliased as `filter`</em>.
--- @name select
--- @param t a table
--- @param f an iterator function, prototyped as `f (k, v, ...)`
--- @param[opt] ... Optional args to be passed to `f`
--- @return the selected values
--- @see reject
-function _.select(t, f, ...)
-  local _t = {}
-  for index,value in pairs(t) do
-    if f(index, value,...) then _t[#_t+1] = value end
-  end
-  return _t
-end
-
---- Clones a table while dropping values passing an iterator test.
--- <br/><em>Aliased as `discard`</em>
--- @name reject
--- @param t a table
--- @param f an iterator function, prototyped as `f (k, v, ...)`
--- @param[opt] ... Optional args to be passed to `f`
--- @return the remaining values
--- @see select
-function _.reject(t, f, ...)
-  local _mapped = _.map(t,f,...)
-  local _t = {}
-  for index,value in pairs (_mapped) do
-    if not value then _t[#_t+1] = t[index] end
-  end
-  return _t
-end
-
---- Checks if all values in a table are passing an iterator test.
--- <br/><em>Aliased as `every`</em>
--- @name all
--- @param t a table
--- @param f an iterator function, prototyped as `f (k, v, ...)`
--- @param[opt] ... Optional args to be passed to `f`
--- @return `true` if all values passes the predicate, `false` otherwise
-function _.all(t, f, ...)
-  return ((#_.select(_.map(t,f,...), isTrue)) == count(t))
-end
-
---- Invokes a method on each value in a table.
--- @name invoke
--- @param t a table
--- @param method a function, prototyped as `f (v, ...)`
--- @param[opt] ... Optional args to be passed to `method`
--- @return the result of the call `f (v, ...)`
--- @see pluck
-function _.invoke(t, method, ...)
-  local args = {...}
-  return _.map(t, function(__,v)
-    if _.isTable(v) then
-      if _.has(v,method) then
-        if _.isCallable(v[method]) then
-          return v[method](v,unpack(args))
-        else
-          return v[method]
-        end
-      else
-        if _.isCallable(method) then
-          return method(v,unpack(args))
-        end
-      end
-    elseif _.isCallable(method) then
-      return method(v,unpack(args))
-    end
-  end)
-end
-
---- Extracts values in a table having a given key.
--- @name pluck
--- @param t a table
--- @param key a key, will be used to index in each value: `value[key]`
--- @return an array of values having the given key
-function _.pluck(t, key)
-  return _.reject(_.map(t,function(__,value)
-      return value[key]
-    end), iNot)
-end
-
---- Returns the max value in a collection. If an transformation function is passed, it will
--- be used to evaluate values by which all objects will be sorted.
--- @name max
--- @param t a table
--- @param[opt] transform a transformation function, prototyped as `transform (v, ...)`, defaults to @{identity}
--- @param[optchain] ... Optional args to be passed to `transform`
--- @return the max value found
--- @see min
-function _.max(t, transform, ...)
-  return extract(t, f_max, transform, ...)
-end
-
---- Returns the min value in a collection. If an transformation function is passed, it will
--- be used to evaluate values by which all objects will be sorted.
--- @name min
--- @param t a table
--- @param[opt] transform a transformation function, prototyped as `transform (v, ...)`, defaults to @{identity}
--- @param[optchain] ... Optional args to be passed to `transform`
--- @return the min value found
--- @see max
-function _.min(t, transform, ...)
-  return extract(t, f_min, transform, ...)
-end
-
---- Returns a shuffled copy of a given collection. If a seed is provided, it will
--- be used to init the pseudo random number generator (using `math.randomseed`).
--- @name shuffle
--- @param t a table
--- @param[opt] seed a seed
--- @return a shuffled copy of the given table
-function _.shuffle(t, seed)
-  if seed then randomseed(seed) end
-  local _shuffled = {}
-  _.each(t,function(index,value)
-     local randPos = floor(random()*index)+1
-    _shuffled[index] = _shuffled[randPos]
-    _shuffled[randPos] = value
-  end)
-  return _shuffled
-end
-
---- Checks if two tables are the same. It compares if both tables features the same values,
--- but not necessarily at the same keys.
--- @name same
--- @param a a table
--- @param b another table
--- @return `true` or `false`
-function _.same(a, b)
-  return _.all(a, function (i,v) return _.include(b,v) end)
-     and _.all(b, function (i,v) return _.include(a,v) end)
-end
-
---- Sorts a table, in-place. If a comparison function is given, it will be used to sort values.
--- @name sort
--- @param t a table
--- @param[opt] comp a comparison function prototyped as `comp (a, b)`, defaults to <tt><</tt> operator.
--- @return the initial table, sorted.
--- @see sortBy
-function _.sort(t, comp)
-  t_sort(t, comp)
-  return t
-end
-
---- Sorts a table in-place using a transform. Values are ranked in a custom order of the results of
--- running `transform (v)` on all values. `transform` may also be a string name property  sort by.
--- `comp` is a comparison function.
--- @name sortBy
--- @param t a table
--- @param[opt] transform a `transform` function to sort elements prototyped as `transform (v)`. Defaults to @{identity}
--- @param[optchain] comp a comparision function, defaults to the `<` operator
--- @return a new array of sorted values
--- @see sort
-function _.sortBy(t, transform, comp)
-  local f = transform or _.identity
-  if _.isString(transform) then
-    f = function(t) return t[transform] end
-  end
-  comp = comp or f_min
-  local _t = {}
-  _.each(t, function(__,v)
-    _t[#_t+1] = {value = v, transform = f(v)}
-  end)
-  t_sort(_t, function(a,b) return comp(a.transform, b.transform) end)
-  return _.pluck(_t, 'value')
-end
-
---- Splits a table into subsets groups.
--- @name groupBy
--- @param t a table
--- @param iter an iterator function, prototyped as `iter (k, v, ...)`
--- @param[opt] ... Optional args to be passed to `iter`
--- @return a table of subsets groups
-function _.groupBy(t, iter, ...)
-  local vararg = {...}
-  local _t = {}
-  _.each(t, function(i,v)
-      local _key = iter(i,v, unpack(vararg))
-      if _t[_key] then _t[_key][#_t[_key]+1] = v
-      else _t[_key] = {v}
-      end
-    end)
-  return _t
-end
-
---- Groups values in a collection and counts them.
--- @name countBy
--- @param t a table
--- @param iter an iterator function, prototyped as `iter (k, v, ...)`
--- @param[opt] ... Optional args to be passed to `iter`
--- @return a table of subsets groups names paired with their count
-function _.countBy(t, iter, ...)
-  local vararg = {...}
-  local stats = {}
-  _.each(t,function(i,v)
-      local key = iter(i,v,unpack(vararg))
-      stats[key] = (stats[key] or 0) +1
-    end)
-  return stats
-end
-
---- Counts the number of values in a collection. If being passed more than one argument
--- it will return the count of all passed-in arguments.
--- @name size
--- @param[opt] ... Optional variable number of arguments
--- @return a count
--- @see count
--- @see countf
-function _.size(...)
-  local args = {...}
-  local arg1 = args[1]
-  if _.isTable(arg1) then
-    return count(args[1])
-  else
-    return count(args)
-  end
-end
-
---- Checks if all the keys of `other` table exists in table `t`. It does not
--- compares values. The test is not commutative, i.e table `t` may contains keys
--- not existing in `other`.
--- @name containsKeys
--- @param t a table
--- @param other another table
--- @return `true` or `false`
--- @see sameKeys
-function _.containsKeys(t, other)
-  for key in pairs(other) do
-    if not t[key] then return false end
-  end
-  return true
-end
-
---- Checks if both given tables have the same keys. It does not compares values.
--- @name sameKeys
--- @param tA a table
--- @param tB another table
--- @return `true` or `false`
--- @see containsKeys
-function _.sameKeys(tA, tB)
-  for key in pairs(tA) do
-    if not tB[key] then return false end
-  end
-  for key in pairs(tB) do
-    if not tA[key] then return false end
-  end
-  return true
-end
-
---- Array functions
--- @section Array functions
-
---- Samples `n` random values from an array. If `n` is not specified, returns a single element.
--- It uses internally @{shuffle} to shuffle the array before sampling values. If `seed` is passed,
--- it will be used for shuffling.
--- @name sample
--- @param array an array
--- @param[opt] n a number of elements to be sampled. Defaults to 1.
--- @param[optchain] seed an optional seed for shuffling
--- @return an array of selected values or a single value when `n` == 1
--- @see sampleProb
-function _.sample(array, n, seed)
-  n = n or 1
-  if n < 1 then return end
-  if n == 1 then
-    if seed then randomseed(seed) end
-    return array[random(1, #array)]
-  end
-  return _.slice(_.shuffle(array, seed), 1, n)
-end
-
---- Return elements from a sequence with a given probability. It considers each value independently.
--- Providing a seed will result in deterministic sampling. Given the same seed it will return the same sample
--- every time.
--- @name sampleProb
--- @param array an array
--- @param prob a probability for each element in array to be selected
--- @param[opt] seed an optional seed for deterministic sampling
--- @return an array of selected values
--- @see sample
-function _.sampleProb(array, prob, seed)
-  if seed then randomseed(seed) end
-  return _.select(array, function(_,v) return random() < prob end)
-end
-
---- Converts a list of arguments to an array.
--- @name toArray
--- @param ... a list of arguments
--- @return an array of all passed-in args
-function _.toArray(...) return {...} end
-
---- Looks for the first occurrence of a given value in an array. Returns the value index if found.
--- Uses @{isEqual} to compare values.
--- @name find
--- @param array an array of values
--- @param value a value to lookup for
--- @param[opt] from the index from where the search will start. Defaults to 1.
--- @return the index of the value if found in the array, `nil` otherwise.
-function _.find(array, value, from)
-  for i = from or 1, #array do
-    if _.isEqual(array[i], value) then return i end
-  end
-end
-
---- Returns an array where values are in reverse order. The passed-in array should not be sparse.
--- @name reverse
--- @param array an array
--- @return a reversed array
-function _.reverse(array)
-  local _array = {}
-  for i = #array,1,-1 do
-    _array[#_array+1] = array[i]
-  end
-  return _array
-end
-
---- Replaces elements in a given array with a given value. In case `i` and `j` are given
--- it will only replaces values at indexes between `[i,j]`. In case `j` is greather than the array
--- size, it will append new values, increasing the array.
--- @name fill
--- @param array an array
--- @param value a value
--- @param[opt] i the index from which to start replacing values. Defaults to 1.
--- @param[optchain] j the index where to stop replacing values. Defaults to the array size.
--- @return the original array with values changed
-function _.fill(array, value, i, j)
-  j = j or _.size(array)
-  for i = i or 1, j do array[i] = value end
-  return array
-end
-
---- Collects values from a given array. The passed-in array should not be sparse.
--- This function collects values as long as they satisfy a given predicate and returns on the first falsy test.
--- <br/><em>Aliased as `takeWhile`</em>
--- @name selectWhile
--- @param array an array
--- @param f an iterator function prototyped as `f (k, v, ...)`
--- @param[opt] ... Optional args to be passed to `f`
--- @return a new table containing all values collected
--- @see dropWhile
-function _.selectWhile(array, f, ...)
-  local t = {}
-  for i,v in ipairs(array) do
-    if f(i,v,...) then t[i] = v else break end
-  end
-  return t
-end
-
---- Collects values from a given array. The passed-in array should not be sparse.
--- This function collects values as long as they do not satisfy a given predicate and returns on the first truthy test.
--- <br/><em>Aliased as `rejectWhile`</em>
--- @name dropWhile
--- @param array an array
--- @param f an iterator function prototyped as `f (k,v, ...)`
--- @param[opt] ... Optional args to be passed to `f`
--- @return a new table containing all values collected
--- @selectWhile
-function _.dropWhile(array, f, ...)
-  local _i
-  for i,v in ipairs(array) do
-    if not f(i,v,...) then
-      _i = i
-      break
-    end
-  end
-  if _.isNil(_i) then return {} end
-  return _.rest(array,_i)
-end
-
---- Returns the index at which a value should be inserted. This index is evaluated so
--- that it maintains the sort. If a comparison function is passed, it will be used to sort
--- values.
--- @name sortedIndex
--- @param array an array
--- @param the value to be inserted
--- @param[opt] comp an comparison function prototyped as `f (a, b)`, defaults to <tt><</tt> operator.
--- @param[optchain] sort whether or not the passed-in array should be sorted
--- @return number the index at which the passed-in value should be inserted
-function _.sortedIndex(array, value, comp, sort)
-  local _comp = comp or f_min
-  if sort then _.sort(array,_comp) end
-  for i = 1,#array do
-    if not _comp(array[i],value) then return i end
-  end
-  return #array+1
-end
-
---- Returns the index of the first occurence of value in an array.
--- @name indexOf
--- @param array an array
--- @param value the value to search for
--- @return the index of the passed-in value
--- @see lastIndexOf
-function _.indexOf(array, value)
-  for k = 1,#array do
-    if array[k] == value then return k end
-  end
-end
-
---- Returns the index of the last occurrence of value in an array.
--- @name lastIndexOf
--- @param array an array
--- @param value the value to search for
--- @return the index of the last occurrence of the passed-in value or __nil__
--- @see indexOf
-function _.lastIndexOf(array, value)
-  local key = _.indexOf(_.reverse(array),value)
-  if key then return #array-key+1 end
-end
-
---- Returns the first index at which a predicate returns true.
--- @name findIndex
--- @param array an array
--- @param predicate a predicate function prototyped as `predicate (k, v, ...)`
--- @param[opt] ... optional arguments to `pred`
--- @return the index found or __nil__
--- @see findLastIndex
-function _.findIndex(array, predicate, ...)
-  for k = 1, #array do
-    if predicate(k,array[k],...) then return k end
-  end
-end
-
---- Returns the last index at which a predicate returns true.
--- @name findLastIndex
--- @param array an array
--- @param predicate a predicate function prototyped as `predicate (k, v, ...)`
--- @param[opt] ... optional arguments to `pred`
--- @return the index found or __nil__
--- @see findIndex
-function _.findLastIndex(array, predicate, ...)
-  local key = _.findIndex(_.reverse(array),predicate,...)
-  if key then return #array-key+1 end
-end
-
---- Adds all passed-in values at the top of an array. The last elements will bubble to the
--- top of the given array.
--- @name addTop
--- @param array an array
--- @param ... a variable number of arguments
--- @return the passed-in array with new values added
--- @see push
-function _.addTop(array, ...)
-  _.each({...},function(i,v) t_insert(array,1,v) end)
-  return array
-end
-
---- Pushes all passed-in values at the end of an array.
--- @name push
--- @param array an array
--- @param ... a variable number of arguments
--- @return the passed-in array with new added values
--- @see addTop
-function _.push(array, ...)
-  _.each({...}, function(i,v) array[#array+1] = v end)
-  return array
-end
-
---- Removes and returns the values at the top of a given array.
--- <br/><em>Aliased as `shift`</em>
--- @name pop
--- @param array an array
--- @param[opt] n the number of values to be popped. Defaults to 1.
--- @return the popped values
--- @see unshift
-function _.pop(array, n)
-  n = min(n or 1, #array)
-  local ret = {}
-  for i = 1, n do
-    local retValue = array[1]
-    ret[#ret + 1] = retValue
-    t_remove(array,1)
-  end
-  return unpack(ret)
-end
-
---- Removes and returns the values at the end of a given array.
--- @name unshift
--- @param array an array
--- @param[opt] n the number of values to be unshifted. Defaults to 1.
--- @return the values
--- @see pop
-function _.unshift(array, n)
-  n = min(n or 1, #array)
-  local ret = {}
-  for i = 1, n do
-    local retValue = array[#array]
-    ret[#ret + 1] = retValue
-    t_remove(array)
-  end
-  return unpack(ret)
-end
-
---- Removes all provided values in a given array.
--- <br/><em>Aliased as `remove`</em>
--- @name pull
--- @param array an array
--- @param ... a variable number of values to be removed from the array
--- @return the passed-in array with values removed
-function _.pull(array, ...)
-  for __, rmValue in ipairs({...}) do
-    for i = #array, 1, -1 do
-      if _.isEqual(array[i], rmValue) then
-        t_remove(array, i)
-      end
-    end
-  end
-  return array
-end
-
---- Removes values at index within the range `[start, finish]`.
--- <br/><em>Aliased as `rmRange`, `chop`</em>
--- @name removeRange
--- @param array an array
--- @param[opt] start the lower bound index, defaults to the first index in the array.
--- @param[optchain] finish the upper bound index, defaults to the array length.
--- @return the passed-in array with values removed
-function _.removeRange(array, start, finish)
-  local array = _.clone(array)
-  local i,n = (next(array)),#array
-  if n < 1 then return array end
-
-  start = clamp(start or i,i,n)
-  finish = clamp(finish or n,i,n)
-
-  if finish < start then return array end
-
-  local count = finish - start + 1
-  local i = start
-  while count > 0 do
-    t_remove(array,i)
-    count = count - 1
-  end
-  return array
-end
-
---- Chunks together consecutive values. Values are chunked on the basis of the return
--- value of a provided predicate `f (k, v, ...)`. Consecutive elements which return
--- the same value are chunked together. Leaves the first argument untouched if it is not an array.
--- @name chunk
--- @param array an array
--- @param f an iterator function prototyped as `f (k, v, ...)`
--- @param[opt] ... Optional args to be passed to `f`
--- @return a table of chunks (arrays)
--- @see zip
-function _.chunk(array, f, ...)
-  if not _.isArray(array) then return array end
-  local ch, ck, prev = {}, 0
-  local mask = _.map(array, f,...)
-  _.each(mask, function(k,v)
-    prev = (prev==nil) and v or prev
-    ck = ((v~=prev) and (ck+1) or ck)
-    if not ch[ck] then
-      ch[ck] = {array[k]}
-    else
-      ch[ck][#ch[ck]+1] = array[k]
-    end
-    prev = v
-  end)
-  return ch
-end
-
---- Slices values indexed within `[start, finish]` range.
--- <br/><em>Aliased as `_.sub`</em>
--- @name slice
--- @param array an array
--- @param[opt] start the lower bound index, defaults to the first index in the array.
--- @param[optchain] finish the upper bound index, defaults to the array length.
--- @return a new array of sliced values
-function _.slice(array, start, finish)
-  return _.select(array, function(index)
-      return (index >= (start or next(array)) and index <= (finish or #array))
-    end)
-end
-
---- Returns the first N values in an array.
--- <br/><em>Aliased as `head`, `take`</em>
--- @name first
--- @param array an array
--- @param[opt] n the number of values to be collected, defaults to 1.
--- @return a new array
--- @see initial
--- @see last
--- @see rest
-function _.first(array, n)
-  local n = n or 1
-  return _.slice(array,1, min(n,#array))
-end
-
---- Returns all values in an array excluding the last N values.
--- @name initial
--- @param array an array
--- @param[opt] n the number of values to be left, defaults to the array length.
--- @return a new array
--- @see first
--- @see last
--- @see rest
-function _.initial(array, n)
-  if n and n < 0 then return end
-  return _.slice(array,1, n and #array-(min(n,#array)) or #array-1)
-end
-
---- Returns the last N values in an array.
--- @name last
--- @param array an array
--- @param[opt] n the number of values to be collected, defaults to the array length.
--- @return a new array
--- @see first
--- @see initial
--- @see rest
-function _.last(array, n)
-  if n and n <= 0 then return end
-  return _.slice(array,n and #array-min(n-1,#array-1) or 2,#array)
-end
-
---- Removes all values before index.
--- <br/><em>Aliased as `tail`</em>
--- @name rest
--- @param array an array
--- @param[opt] index an index, defaults to 1
--- @return a new array
--- @see first
--- @see initial
--- @see last
-function _.rest(array,index)
-  if index and index > #array then return {} end
-  return _.slice(array,index and max(1,min(index,#array)) or 1,#array)
-end
-
---- Returns the value at a given index.
--- @name nth
--- @param array an array
--- @param index an index
--- @return the value at the given index
-function _.nth(array, index)
-  return array[index]
-end
-
---- Removes all falsy (false and nil) values.
--- @name compact
--- @param array an array
--- @return a new array
-function _.compact(array)
-  return _.reject(array, function (_,value)
-    return not value
-  end)
-end
-
---- Flattens a nested array. Passing `shallow` will only flatten at the first level.
--- @name flatten
--- @param array an array
--- @param[opt] shallow specifies the flattening depth
--- @return a new array, flattened
-function _.flatten(array, shallow)
-  local shallow = shallow or false
-  local new_flattened
-  local _flat = {}
-  for key,value in pairs(array) do
-    if _.isTable(value) then
-      new_flattened = shallow and value or _.flatten (value)
-      _.each(new_flattened, function(_,item) _flat[#_flat+1] = item end)
-    else _flat[#_flat+1] = value
-    end
-  end
-  return _flat
-end
-
---- Returns values from an array not present in all passed-in args.
--- <br/><em>Aliased as `without` and `diff`</em>
--- @name difference
--- @param array an array
--- @param another array
--- @return a new array
--- @see union
--- @see intersection
--- @see symmetricDifference
-function _.difference(array, array2)
-  if not array2 then return _.clone(array) end
-  return _.select(array,function(i,value)
-      return not _.include(array2,value)
-    end)
-end
-
---- Returns the duplicate-free union of all passed in arrays.
--- @name union
--- @param ... a variable number of arrays arguments
--- @return a new array
--- @see difference
--- @see intersection
--- @see symmetricDifference
-function _.union(...)
-  return _.uniq(_.flatten({...}))
-end
-
---- Returns the  intersection of all passed-in arrays.
--- Each value in the result is present in each of the passed-in arrays.
--- @name intersection
--- @param array an array
--- @param ... a variable number of array arguments
--- @return a new array
--- @see difference
--- @see union
--- @see symmetricDifference
-function _.intersection(array, ...)
-  local arg = {...}
-  local _intersect = {}
-  for i,value in ipairs(array) do
-    if _.all(arg,function(i,v)
-          return _.include(v,value)
-        end) then
-      t_insert(_intersect,value)
-    end
-  end
-  return _intersect
-end
-
---- Performs a symmetric difference. Returns values from `array` not present in `array2` and also values
--- from `array2` not present in `array`.
--- <br/><em>Aliased as `symdiff`</em>
--- @name symmetricDifference
--- @param array an array
--- @param array2 another array
--- @return a new array
--- @see difference
--- @see union
--- @see intersection
-function _.symmetricDifference(array, array2)
-  return _.difference(
-    _.union(array, array2),
-    _.intersection(array,array2)
-  )
-end
-
---- Produces a duplicate-free version of a given array.
--- <br/><em>Aliased as `uniq`</em>
--- @name unique
--- @param array an array
--- @return a new array, duplicate-free
--- @see isunique
-function _.unique(array)
-  local ret = {}
-  for i = 1, #array do
-    if not _.find(ret, array[i]) then
-      ret[#ret+1] = array[i]
-    end
-  end
-  return ret
-end
-
---- Checks if a given array contains distinct values. Such an array is made of distinct elements,
--- which only occur once in this array.
--- <br/><em>Aliased as `isuniq`</em>
--- @name isunique
--- @param array an array
--- @return `true` if the given array is unique, `false` otherwise.
--- @see unique
-function _.isunique(array)
-  return _.isEqual(array, _.unique(array))
-end
-
---- Merges values of each of the passed-in arrays in subsets.
--- Only values indexed with the same key in the given arrays are merged in the same subset.
--- <br/><em>Aliased as `transpose`</em>
--- @name zip
--- @param ... a variable number of array arguments
--- @return a new array
-function _.zip(...)
-  local arg = {...}
-  local _len = _.max(_.map(arg,function(i,v)
-      return #v
-    end))
-  local _ans = {}
-  for i = 1,_len do
-    _ans[i] = _.pluck(arg,i)
-  end
-  return _ans
-end
-
---- Clones `array` and appends `other` values.
--- @name append
--- @param array an array
--- @param other an array
--- @return a new array
-function _.append(array, other)
-  local t = {}
-  for i,v in ipairs(array) do t[i] = v end
-  for i,v in ipairs(other) do t[#t+1] = v end
-  return t
-end
-
---- Interleaves arrays. It returns a single array made of values from all
--- passed in arrays in their given order, interleaved.
--- @name interleave
--- @param ... a variable list of arrays
--- @return a new array
--- @see interpose
-function _.interleave(...) return _.flatten(_.zip(...)) end
-
---- Interposes value in-between consecutive pair of values in `array`.
--- @name interpose
--- @param value a value
--- @param array an array
--- @return a new array
--- @see interleave
-function _.interpose(value, array)
-  return _.flatten(_.zip(array, _.rep(value, #array-1)))
-end
-
---- Produces a flexible list of numbers. If one positive value is passed, will count from 0 to that value,
--- with a default step of 1. If two values are passed, will count from the first one to the second one, with the
--- same default step of 1. A third value passed will be considered a step value.
--- @name range
--- @param[opt] from the initial value of the range
--- @param[optchain] to the final value of the range
--- @param[optchain] step the step of count
--- @return a new array of numbers
-function _.range(...)
-  local arg = {...}
-  local _start,_stop,_step
-  if #arg==0 then return {}
-  elseif #arg==1 then _stop,_start,_step = arg[1],0,1
-  elseif #arg==2 then _start,_stop,_step = arg[1],arg[2],1
-  elseif #arg == 3 then _start,_stop,_step = arg[1],arg[2],arg[3]
-  end
-  if (_step and _step==0) then return {} end
-  local _ranged = {}
-  local _steps = max(floor((_stop-_start)/_step),0)
-  for i=1,_steps do _ranged[#_ranged+1] = _start+_step*i end
-  if #_ranged>0 then t_insert(_ranged,1,_start) end
-  return _ranged
-end
-
---- Creates an array list of `n` values, repeated.
--- @name rep
--- @param value a value to be repeated
--- @param n the number of repetitions of value.
--- @return a new array of `n` values
-function _.rep(value, n)
-  local ret = {}
-  for i = 1, n do ret[#ret+1] = value end
-  return ret
-end
-
---- Iterator returning partitions of an array. It returns arrays of length `n`
--- made of values from the given array. If the last partition has lower elements than `n` and
--- `pad` is supplied, it will be adjusted to `n` of elements with `pad` value.
--- @name partition
--- @param array an array
--- @param[opt] n the size of partitions. Should be greater than 0. Defaults to 1.
--- @param[optchain] pad a value to adjust the last subsequence to the `n` elements
--- @return an iterator function
-function _.partition(array, n, pad)
-  if n<=0 then return end
-  return coroutine.wrap(function()
-    partgen(array, n or 1, coroutine.yield, pad)
-  end)
-end
-
---- Iterator returning sliding partitions of an array. It returns overlapping subsequences
--- of length `n`. If the last subsequence has lower elements than `n` and `pad` is
--- supplied, it will be adjusted to `n` elements with `pad` value.
--- @name sliding.
--- @param array an array
--- @param[opt] n the size of partitions. Should be greater than 1. Defaults to 2.
--- @param[optchain] pad a value to adjust the last subsequence to the `n` elements
--- @return an iterator function
-function _.sliding(array, n, pad)
-  if n<=1 then return end
-  return coroutine.wrap(function()
-    partgen2(array, n or 2, coroutine.yield, pad)
-  end)
-end
-
---- Iterator returning the permutations of an array. It returns arrays made of all values
--- from the passed-in array, with values permuted.
--- @name permutation
--- @param array an array
--- @return an iterator function
-function _.permutation(array)
-  return coroutine.wrap(function()
-    permgen(array, #array, coroutine.yield)
-  end)
-end
-
---- Swaps keys with values. Produces a new array where previous keys are now values,
--- while previous values are now keys.
--- <br/><em>Aliased as `mirror`</em>
--- @name invert
--- @param array a given array
--- @return a new array
-function _.invert(array)
-  local _ret = {}
-  _.each(array,function(i,v) _ret[v] = i end)
-  return _ret
-end
-
---- Concatenates values in a given array. Handles booleans as well. If `sep` string is
--- passed, it will be used as a separator. Passing `i` and `j` will result in concatenating
--- only values within `[i, j]` range.
--- <br/><em>Aliased as `join`</em>
--- @name concat
--- @param array a given array
--- @param[opt] sep a separator string, defaults to the empty string `''`.
--- @param[optchain] i the starting index, defaults to 1.
--- @param[optchain] j the final index, defaults to the array length.
--- @return a string
-function _.concat(array, sep, i, j)
-  local _array = _.map(array,function(i,v)
-    return tostring(v)
-  end)
-  return t_concat(_array,sep,i or 1,j or #array)
-
-end
-
---- Utility functions
--- @section Utility functions
-
---- The no-operation function.
--- @name noop
--- @return nothing
-function _.noop() return end
-
---- Returns the passed-in value. This function is used internally
--- as a default iterator.
--- @name identity
--- @param value a value
--- @return the passed-in value
-function _.identity(value) return value end
-
---- Creates a constant function which returns the same output on every call.
--- @name constant
--- @param value a constant value
--- @return a constant function
-function _.constant(value) return function() return value end end
-
---- Memoizes a given function by caching the computed result.
--- Useful for speeding-up slow-running functions. If a `hash` function is passed,
--- it will be used to compute hash keys for a set of input values for caching.
--- <br/><em>Aliased as `cache`</em>
--- @name memoize
--- @param f a function
--- @param[opt] hash a hash function, defaults to @{identity}
--- @return a new function
-function _.memoize(f, hash)
-  local _cache = setmetatable({},{__mode = 'kv'})
-  local _hasher = hash or _.identity
-  return function (...)
-      local _hashKey = _hasher(...)
-      local _result = _cache[_hashKey]
-      if not _result then _cache[_hashKey] = f(...) end
-      return _cache[_hashKey]
-    end
-end
-
---- Returns a version of `f` that runs only once. Successive calls to `f`
--- will keep yielding the same output, no matter what the passed-in arguments are.
--- It can be used to initialize variables.
--- @name once
--- @param f a function
--- @return a new function
--- @see before
--- @see after
-function _.once(f)
-  local _internal = 0
-  local _args = {}
-  return function(...)
-    _internal = _internal+1
-    if _internal <= 1 then _args = {...} end
-    return f(unpack(_args))
-  end
-end
-
---- Returns a version of `f` that will run no more than `count` times. Next calls will
--- keep yielding the results of the count-th call.
--- @name before
--- @param f a function
--- @param count a count
--- @return a new function
--- @see once
--- @see after
-function _.before(f, count)
-  local _internal = 0
-  local _args = {}
-  return function(...)
-    _internal = _internal+1
-    if _internal <= count then _args = {...} end
-    return f(unpack(_args))
-  end
-end
-
---- Returns a version of `f` that runs on the `count-th` call.
--- Useful when dealing with asynchronous tasks.
--- @name after
--- @param f a function
--- @param count the number of calls before `f` will start running.
--- @return a new function
--- @see once
--- @see before
-function _.after(f, count)
-  local _limit,_internal = count, 0
-  return function(...)
-    _internal = _internal+1
-    if _internal >= _limit then return f(...) end
-  end
-end
-
---- Composes functions. Each passed-in function consumes the return value of the function that follows.
--- In math terms, composing the functions `f`, `g`, and `h` produces the function `f(g(h(...)))`.
--- @name compose
--- @param ... a variable number of functions
--- @return a new function
--- @see pipe
-function _.compose(...)
-  -- See: https://github.com/Yonaba/Moses/pull/15#issuecomment-139038895
-  local f = _.reverse {...}
-  return function (...)
-    local first, _temp = true
-    for i, func in ipairs(f) do
-      if first then
-        first = false
-        _temp = func(...)
-      else
-        _temp = func(_temp)
-      end
-    end
-    return _temp
-  end
-end
-
---- Pipes a value through a series of functions. In math terms,
--- given some functions `f`, `g`, and `h` in that order, it returns `f(g(h(value)))`.
--- @name pipe
--- @param value a value
--- @param ... a variable number of functions
--- @return the result of the composition of function calls.
--- @see compose
-function _.pipe(value, ...)
-  return _.compose(...)(value)
-end
-
---- Returns the logical complement of a given function. For a given input, the returned
--- function will output `false` if the original function would have returned `true`,
--- and vice-versa.
--- @name complement
--- @param f a function
--- @return  the logical complement of the given function `f`.
-function _.complement(f)
-  return function(...) return not f(...) end
-end
-
---- Calls a sequence of passed-in functions with the same argument.
--- Returns a sequence of results.
--- <br/><em>Aliased as `juxt`</em>
--- @name juxtapose
--- @param value a value
--- @param ... a variable number of functions
--- @return a list of results
-function _.juxtapose(value, ...)
-  local res = {}
-  _.each({...}, function(_,f) res[#res+1] = f(value) end)
-  return unpack(res)
-end
-
---- Wraps `f` inside of the `wrapper` function. It passes `f` as the first argument to `wrapper`.
--- This allows the wrapper to execute code before and after `f` runs,
--- adjust the arguments, and execute it conditionally.
--- @name wrap
--- @param f a function to be wrapped, prototyped as `f (...)`
--- @param wrapper a wrapper function, prototyped as `wrapper (f, ...)`
--- @return the results
-function _.wrap(f, wrapper)
-  return function (...) return  wrapper(f,...) end
-end
-
---- Runs `iter` function `n` times. Collects the results of each run and returns them in an array.
--- @name times
--- @param n the number of times `iter` should be called
--- @param  iter an iterator function, prototyped as `iter (i, ...)`
--- @param ... args to be passed to `iter` function
--- @return table an array of results
-function _.times(n, iter, ...)
-  local results = {}
-  for i = 1,n do
-    results[i] = iter(i,...)
-  end
-  return results
-end
-
---- Binds `v` to be the first argument to `f`. Calling `f (...)` will result to `f (v, ...)`.
--- @name bind
--- @param f a function
--- @param v a value
--- @return a function
--- @see bind2
--- @see bindn
--- @see bindAll
-function _.bind(f, v)
-  return function (...)
-      return f(v,...)
-    end
-end
-
---- Binds `v` to be the second argument to `f`. Calling `f (a, ...)` will result to `f (a, v, ...)`.
--- @name bind2
--- @param f a function
--- @param v a value
--- @return a function
--- @see bind
--- @see bindn
--- @see bindAll
-function _.bind2(f, v)
-  return function (t, ...)
-    return f(t, v, ...)
-  end
-end
-
---- Binds `...` to be the N-first arguments to function `f`.
--- Calling `f (a1, a2, ..., aN)` will result to `f (..., a1, a2, ...,aN)`.
--- @name bindn
--- @param f a function
--- @param ... a variable number of arguments
--- @return a function
--- @see bind
--- @see bind2
--- @see bindAll
-function _.bindn(f, ...)
-  local iArg = {...}
-  return function (...)
-      return f(unpack(_.append(iArg,{...})))
-    end
-end
-
---- Binds methods to object. As such, whenever any of these methods is invoked, it
--- always receives the object as its first argument.
--- @name bindAll
--- @param obj an abject
--- @param ... a variable number of method names
--- @return the passed-in object with all methods bound to the object itself.
--- @see bind
--- @see bind2
--- @see bindn
-function _.bindAll(obj, ...)
-  local methodNames = {...}
-  for __, methodName in ipairs(methodNames) do
-    local method = obj[methodName]
-    if method then obj[methodName] = _.bind(method, obj) end
-  end
-  return obj
-end
-
---- Generates an unique ID for the current session. If given a string `template`, it
--- will use this template for output formatting. Otherwise, if `template` is a function, it
--- will evaluate `template (id, ...)`.
--- <br/><em>Aliased as `uid`</em>.
--- @name uniqueId
--- @param[opt] template either a string or a function template to format the ID
--- @param[optchain] ... a variable number of arguments to be passed to `template`, in case it is a function.
--- @return value an ID
-function _.uniqueId(template, ...)
-  unique_id_counter = unique_id_counter + 1
-  if template then
-    if _.isString(template) then
-      return template:format(unique_id_counter)
-    elseif _.isFunction(template) then
-      return template(unique_id_counter,...)
-    end
-  end
-  return unique_id_counter
-end
-
---- Produces an iterator which repeatedly apply a function `f` onto an input.
--- Yields x, then f(x), then f(f(x)), continuously.
--- @name iterator
--- @param f a function
--- @param x an initial input to `f`
--- @return an iterator fnction
--- <br/><em>Aliased as `iter`</em>.
-function _.iterator(f, x)
-  return function()
-    x = f(x)
-    return x
-  end
-end
-
---- Iterates an iterator and returns its values in an array.
--- @name array
--- @param ... an iterator (a function, a table and a value)
--- @return an array of results
-function _.array(...)
-  local r = {}
-  for v in ... do r[#r+1] = v end
-  return r
-end
-
---- Creates a function of `f` with arguments flipped in reverse order.
--- @name flip
--- @param f a function
--- @return a function
-function _.flip(f)
-  return function(...)
-    return f(unpack(_.reverse({...})))
-  end
-end
-
---- Creates a function that runs transforms on all arguments it receives.
--- @name over
--- @param ... a set of functions which will receive all arguments to the returned function
--- @return a function
--- @see overEvery
--- @see overSome
--- @see overArgs
-function _.over(...)
-  local transforms = {...}
-  return function(...)
-    local r = {}
-    for __,transform in ipairs(transforms) do
-      r[#r+1] = transform(...)
-    end
-    return r
-  end
-end
-
---- Creates a validation function. The returned function checks if *all* of the given predicates return
--- truthy when invoked with the arguments it receives.
--- @name overEvery
--- @param ... a list of predicate functions
--- @return a new function
--- @see over
--- @see overSome
--- @see overArgs
-function _.overEvery(...)
-  local f = _.over(...)
-  return function(...)
-    return _.reduce(f(...),function(state,v) return state and v end)
-  end
-end
-
---- Creates a validation function. The return function checks if *any* of a given predicates return
--- truthy when invoked with the arguments it receives.
--- @name overSome
--- @param ... a list of predicate functions
--- @return a new function
--- @see over
--- @see overEvery
--- @see overArgs
-function _.overSome(...)
-  local f = _.over(...)
-  return function(...)
-    return _.reduce(f(...),function(state,v) return state or v end)
-  end
-end
-
---- Creates a function that invokes `f` with its arguments transformed. 1rst arguments will be passed to
--- the 1rst transform, 2nd arg to the 2nd transform, etc. Remaining arguments will not be transformed.
--- @name overArgs
--- @param f a function
--- @param ... a list of transforms funcs prototyped as `f (v)`
--- @return the result of running `f` with its transformed arguments
--- @see over
--- @see overEvery
--- @see overSome
-function _.overArgs(f,...)
-  local _argf = {...}
-  return function(...)
-    local _args = {...}
-    for i = 1,#_argf do
-      local f = _argf[i]
-      if _args[i] then _args[i] = f(_args[i]) end
-    end
-    return f(unpack(_args))
-  end
-end
-
---- Partially apply a function by filling in any number of its arguments.
--- One may pass a string `'_'` as a placeholder in the list of arguments to specify an argument
--- that should not be pre-filled, but left open to be supplied at call-time.
--- @name partial
--- @param f a function
--- @param ... a list of partial arguments to `f`
--- @return a new version of function f having some of it original arguments filled
--- @see partialRight
--- @see curry
-function _.partial(f,...)
-  local partial_args = {...}
-  return function (...)
-    local n_args = {...}
-    local f_args = {}
-    for k,v in ipairs(partial_args) do
-      f_args[k] = (v == '_') and _.pop(n_args) or v
-    end
-    return f(unpack(_.append(f_args,n_args)))
-  end
-end
-
---- Similar to @{partial}, but from the right.
--- @name partialRight
--- @param f a function
--- @param ... a list of partial arguments to `f`
--- @return a new version of function f having some of it original arguments filled
--- @see partialRight
--- @see curry
-function _.partialRight(f,...)
-  local partial_args = {...}
-  return function (...)
-    local n_args = {...}
-    local f_args = {}
-    for k = 1,#partial_args do
-      f_args[k] = (partial_args[k] == '_') and _.pop(n_args) or partial_args[k]
-    end
-    return f(unpack(_.append(n_args, f_args)))
-  end
-end
-
---- Curries a function. If the given function `f` takes multiple arguments, it returns another version of
--- `f` that takes a single argument (the first of the arguments to the original function) and returns a new
--- function that takes the remainder of the arguments and returns the result.
--- @name curry
--- @param f a function
--- @param[opt] n_args the number of arguments expected for `f`. Defaults to 2.
--- @return a curried version of `f`
--- @see partial
--- @see partialRight
-function _.curry(f, n_args)
-  n_args = n_args or 2
-  local _args = {}
-  local function scurry(v)
-    if n_args == 1 then return f(v) end
-    if v ~= nil then _args[#_args+1] = v end
-    if #_args < n_args then
-      return scurry
-    else
-      local r = {f(unpack(_args))}
-      _args = {}
-      return unpack(r)
-    end
-  end
-  return scurry
-end
-
---- Returns the execution time of `f (...)` and its returned values.
--- @name time
--- @param f a function
--- @param[opt] ... optional args to `f`
--- @return the execution time and the results of `f (...)`
-function _.time(f, ...)
-  local stime = clock()
-  local r = {f(...)}
-  return clock() - stime, unpack(r)
-end
-
---- Object functions
---@section Object functions
-
---- Returns the keys of the object properties.
--- @name keys
--- @param obj an object
--- @return an array
-function _.keys(obj)
-  local _oKeys = {}
-  _.each(obj,function(key) _oKeys[#_oKeys+1]=key end)
-  return _oKeys
-end
-
---- Returns the values of the object properties.
--- @name values
--- @param obj an object
--- @return an array
-function _.values(obj)
-  local _oValues = {}
-  _.each(obj,function(_,value) _oValues[#_oValues+1]=value end)
-  return _oValues
-end
-
---- Converts keys and values a an array-list of [k, v].
--- @name kvpairs
--- @param obj an object
--- @return an array list of key-values pairs
--- @see toObj
-function _.kvpairs(obj)
-  local t = {}
-  _.each(obj, function(k,v) t[#t+1] = {k,v} end)
-  return t
-end
-
---- Converts an array list of `kvpairs` to an object. Keys are taken
--- from the 1rst column in the `kvpairs` sequence, associated with values in the 2nd
--- column
--- @name toObj
--- @param kvpairs an array-list of `kvpairs`
--- @return an object
--- @see kvpairs
-function _.toObj(kvpairs)
-  local obj = {}
-  for __, v in ipairs(kvpairs) do
-    obj[v[1]] = v[2]
-  end
-  return obj
-end
-
---- Returns a function that will return the key property of any passed-in object.
--- @name property
--- @param key a key property name
--- @return a function which should accept an object as argument
--- @see propertyOf
-function _.property(key)
-  return function(obj) return obj[key] end
-end
-
---- Returns a function which will return the value of an object property.
--- @name propertyOf
--- @param obj an object
--- @return a function which should accept a key property argument
--- @see property
-function _.propertyOf(obj)
-  return function(key) return obj[key] end
-end
-
---- Converts any given value to a boolean
--- @name toBoolean
--- @param value a value. Can be of any type
--- @return `true` if value is true, `false` otherwise (false or nil).
-function _.toBoolean(value)
-  return not not value
-end
-
---- Extends an object properties. It copies the properties of extra passed-in objects
--- into the destination object, and returns the destination object. The last objects
--- will override properties of the same name.
--- @name extend
--- @param destObj a destination object
--- @param ... a list of objects
--- @return the destination object extended
-function _.extend(destObj, ...)
-  local sources = {...}
-  _.each(sources,function(__,source)
-    if _.isTable(source) then
-      _.each(source,function(key,value)
-        destObj[key] = value
-      end)
-    end
-  end)
-  return destObj
-end
-
---- Returns a sorted list of all methods names found in an object. If the given object
--- has a metatable implementing an `__index` field pointing to another table, will also recurse on this
--- table if `recurseMt` is provided. If `obj` is omitted, it defaults to the library functions.
--- <br/><em>Aliased as `methods`</em>.
--- @name functions
--- @param[opt] obj an object. Defaults to Moses library functions.
--- @return an array-list of methods names
-function _.functions(obj, recurseMt)
-  obj = obj or _
-  local _methods = {}
-  _.each(obj,function(key,value)
-    if _.isFunction(value) then
-      _methods[#_methods+1]=key
-    end
-  end)
-  if not recurseMt then
-    return _.sort(_methods)
-  end
-  local mt = getmetatable(obj)
-  if mt and mt.__index then
-    local mt_methods = _.functions(mt.__index)
-    _.each(mt_methods, function(k,fn)
-      _methods[#_methods+1] = fn
-    end)
-  end
-  return _.sort(_methods)
-end
-
---- Clones a given object properties. If `shallow` is passed will also clone nested array properties.
--- @name clone
--- @param obj an object
--- @param[opt] shallow whether or not nested array-properties should be cloned, defaults to false.
--- @return a copy of the passed-in object
-function _.clone(obj, shallow)
-  if not _.isTable(obj) then return obj end
-  local _obj = {}
-  _.each(obj,function(i,v)
-    if _.isTable(v) then
-      if not shallow then
-        _obj[i] = _.clone(v,shallow)
-      else _obj[i] = v
-      end
-    else
-      _obj[i] = v
-    end
-  end)
-  return _obj
-end
-
---- Invokes interceptor with the object, and then returns object.
--- The primary purpose of this method is to "tap into" a method chain, in order to perform operations
--- on intermediate results within the chain.
--- @name tap
--- @param obj an object
--- @param f an interceptor function, should be prototyped as `f (obj, ...)`
--- @param[opt] ... args to be passed to `f`
--- @return the passed-in object
-function _.tap(obj, f, ...)
-  f(obj,...)
-  return obj
-end
-
---- Checks if a given object implements a property.
--- @name has
--- @param obj an object
--- @param key a key property to be checked
--- @return `true` or `false`
-function _.has(obj, key)
-  return obj[key]~=nil
-end
-
---- Returns an object copy having white-listed properties.
--- <br/><em>Aliased as `choose`</em>.
--- @name pick
--- @param obj an object
--- @param ... a variable number of string keys
--- @return the filtered object
-function _.pick(obj, ...)
-  local whitelist = _.flatten {...}
-  local _picked = {}
-  _.each(whitelist,function(key,property)
-      if not _.isNil(obj[property]) then
-        _picked[property] = obj[property]
-      end
-    end)
-  return _picked
-end
-
---- Returns an object copy without black-listed properties.
--- <br/><em>Aliased as `drop`</em>.
--- @name omit
--- @param obj an object
--- @param ... a variable number of string keys
--- @return the filtered object
-function _.omit(obj, ...)
-  local blacklist = _.flatten {...}
-  local _picked = {}
-  _.each(obj,function(key,value)
-      if not _.include(blacklist,key) then
-        _picked[key] = value
-      end
-    end)
-  return _picked
-end
-
---- Applies a template to an object, preserving non-nil properties.
--- <br/><em>Aliased as `defaults`</em>.
--- @name template
--- @param obj an object
--- @param[opt] template a template object. Defaults to an empty table `{}`.
--- @return the passed-in object filled
-function _.template(obj, template)
-  _.each(template or {},function(i,v)
-  if not obj[i] then obj[i] = v end
-  end)
-  return obj
-end
-
---- Performs a deep comparison test between two objects. Can compare strings, functions
--- (by reference), nil, booleans. Compares tables by reference or by values. If `useMt`
--- is passed, the equality operator `==` will be used if one of the given objects has a
--- metatable implementing `__eq`.
--- <br/><em>Aliased as `_.compare`</em>
--- @name isEqual
--- @param objA an object
--- @param objB another object
--- @param[opt] useMt whether or not `__eq` should be used, defaults to false.
--- @return `true` or `false`
-function _.isEqual(objA, objB, useMt)
-  local typeObjA = type(objA)
-  local typeObjB = type(objB)
-
-  if typeObjA~=typeObjB then return false end
-  if typeObjA~='table' then return (objA==objB) end
-
-  local mtA = getmetatable(objA)
-  local mtB = getmetatable(objB)
-
-  if useMt then
-    if (mtA or mtB) and (mtA.__eq or mtB.__eq) then
-      return mtA.__eq(objA, objB) or mtB.__eq(objB, objA) or (objA==objB)
-    end
-  end
-
-  if _.size(objA)~=_.size(objB) then return false end
-
-  for i,v1 in pairs(objA) do
-    local v2 = objB[i]
-    if _.isNil(v2) or not _.isEqual(v1,v2,useMt) then return false end
-  end
-
-  for i,v1 in pairs(objB) do
-    local v2 = objA[i]
-    if _.isNil(v2) then return false end
-  end
-
-  return true
-end
-
---- Invokes an object method. It passes the object itself as the first argument. if `method` is not
--- callable, will return `obj[method]`.
--- @name result
--- @param obj an object
--- @param method a string key to index in object `obj`.
--- @param[opt] ... Optional args to be passed to `method`
--- @return the returned value of `method (obj, ...)` call
-function _.result(obj, method, ...)
-  if obj[method] then
-    if _.isCallable(obj[method]) then
-      return obj[method](obj,...)
-    else return obj[method]
-    end
-  end
-  if _.isCallable(method) then
-    return method(obj,...)
-  end
-end
-
---- Checks if the given arg is a table.
--- @name isTable
--- @param t a value to be tested
--- @return `true` or `false`
-function _.isTable(t)
-  return type(t) == 'table'
-end
-
---- Checks if the given argument is callable. Assumes `obj` is callable if
--- it is either a function or a table having a metatable implementing `__call` metamethod.
--- @name isCallable
--- @param obj an object
--- @return `true` or `false`
-function _.isCallable(obj)
-  return (_.isFunction(obj) or
-     (_.isTable(obj) and getmetatable(obj)
-                   and getmetatable(obj).__call~=nil) or false)
-end
-
---- Checks if the given argument is an array. Assumes `obj` is an array
--- if is a table with consecutive integer keys starting at 1.
--- @name isArray
--- @param obj an object
--- @return `true` or `false`
-function _.isArray(obj)
-  if not _.isTable(obj) then return false end
-  -- Thanks @Wojak and @Enrique García Cota for suggesting this
-  -- See : http://love2d.org/forums/viewtopic.php?f=3&t=77255&start=40#p163624
-  local i = 0
-  for __ in pairs(obj) do
-     i = i + 1
-     if _.isNil(obj[i]) then return false end
-  end
-  return true
-end
-
---- Checks if the given object is iterable with `pairs` (or `ipairs`).
--- @name isIterable
--- @param obj an object
--- @return `true` if the object can be iterated with `pairs` (or `ipairs`), `false` otherwise
-function _.isIterable(obj)
-  return _.toBoolean((pcall(pairs, obj)))
-end
-
---- Checks if the given pbject is empty. If `obj` is a string, will return `true`
--- if `#obj == 0`. Otherwise, if `obj` is a table, will return whether or not this table
--- is empty. If `obj` is `nil`, it will return true.
--- @name isEmpty
--- @param[opt] obj an object
--- @return `true` or `false`
-function _.isEmpty(obj)
-  if _.isNil(obj) then return true end
-  if _.isString(obj) then return #obj==0 end
-  if _.isTable(obj) then return next(obj)==nil end
-  return true
-end
-
---- Checks if the given argument is a string.
--- @name isString
--- @param obj an object
--- @return `true` or `false`
-function _.isString(obj)
-  return type(obj) == 'string'
-end
-
---- Checks if the given argument is a function.
--- @name isFunction
--- @param obj an object
--- @return `true` or `false`
-function _.isFunction(obj)
-   return type(obj) == 'function'
-end
-
---- Checks if the given argument is nil.
--- @name isNil
--- @param obj an object
--- @return `true` or `false`
-function _.isNil(obj)
-  return obj==nil
-end
-
---- Checks if the given argument is a number.
--- @name isNumber
--- @param obj an object
--- @return `true` or `false`
--- @see isNaN
-function _.isNumber(obj)
-  return type(obj) == 'number'
-end
-
---- Checks if the given argument is NaN (see [Not-A-Number](http://en.wikipedia.org/wiki/NaN)).
--- @name isNaN
--- @param obj an object
--- @return `true` or `false`
--- @see isNumber
-function _.isNaN(obj)
-  return _.isNumber(obj) and obj~=obj
-end
-
---- Checks if the given argument is a finite number.
--- @name isFinite
--- @param obj an object
--- @return `true` or `false`
-function _.isFinite(obj)
-  if not _.isNumber(obj) then return false end
-  return obj > -huge and obj < huge
-end
-
---- Checks if the given argument is a boolean.
--- @name isBoolean
--- @param obj an object
--- @return `true` or `false`
-function _.isBoolean(obj)
-  return type(obj) == 'boolean'
-end
-
---- Checks if the given argument is an integer.
--- @name isInteger
--- @param obj an object
--- @return `true` or `false`
-function _.isInteger(obj)
-  return _.isNumber(obj) and floor(obj)==obj
-end
-
--- Aliases
-
-do
-
-  -- Table functions aliases
-  _.forEach     = _.each
-  _.forEachi    = _.eachi
-  _.loop        = _.cycle
-  _.collect     = _.map
-  _.inject      = _.reduce
-  _.foldl       = _.reduce
-  _.injectr     = _.reduceRight
-  _.foldr       = _.reduceRight
-  _.mapr        = _.mapReduce
-  _.maprr       = _.mapReduceRight
-  _.any         = _.include
-  _.some        = _.include
-  _.contains    = _.include
-  _.filter      = _.select
-  _.discard     = _.reject
-  _.every       = _.all
-
-  -- Array functions aliases
-  _.takeWhile   = _.selectWhile
-  _.rejectWhile = _.dropWhile
-  _.shift       = _.pop
-  _.remove      = _.pull
-  _.rmRange     = _.removeRange
-  _.chop        = _.removeRange
-  _.sub         = _.slice
-  _.head        = _.first
-  _.take        = _.first
-  _.tail        = _.rest
-  _.skip        = _.last
-  _.without     = _.difference
-  _.diff        = _.difference
-  _.symdiff     = _.symmetricDifference
-  _.xor         = _.symmetricDifference
-  _.uniq        = _.unique
-  _.isuniq      = _.isunique
-  _.transpose   = _.zip
-  _.part        = _.partition
-  _.perm        = _.permutation
-  _.mirror      = _.invert
-  _.join        = _.concat
-
-  -- Utility functions aliases
-  _.cache       = _.memoize
-  _.juxt        = _.juxtapose
-  _.uid         = _.uniqueId
-  _.iter        = _.iterator
-
-  -- Object functions aliases
-  _.methods     = _.functions
-  _.choose      = _.pick
-  _.drop        = _.omit
-  _.defaults    = _.template
-  _.compare     = _.isEqual
-
-end
-
--- Setting chaining and building interface
-
-do
-
-  -- Wrapper to Moses
-  local f = {}
-
-  -- Will be returned upon requiring, indexes into the wrapper
-  local __ = {}
-  __.__index = f
-
-  -- Wraps a value into an instance, and returns the wrapped object
-  local function new(value)
-    local i = {_value = value, _wrapped = true}
-    return setmetatable(i, __)
-  end
-
-  setmetatable(__,{
-    __call  = function(self,v) return new(v) end, -- Calls returns to instantiation
-    __index = function(t,key,...) return f[key] end  -- Redirects to the wrapper
-  })
-
-  --- Returns a wrapped object. Calling library functions as methods on this object
-  -- will continue to return wrapped objects until @{obj:value} is used. Can be aliased as `_(value)`.
-  -- @class function
-  -- @name chain
-  -- @param value a value to be wrapped
-  -- @return a wrapped object
-  function __.chain(value)
-    return new(value)
-  end
-
-  --- Extracts the value of a wrapped object. Must be called on an chained object (see @{chain}).
-  -- @class function
-  -- @name obj:value
-  -- @return the value previously wrapped
-  function __:value()
-    return self._value
-  end
-
-  -- Register chaining methods into the wrapper
-  f.chain, f.value = __.chain, __.value
-
-  -- Register all functions into the wrapper
-  for fname,fct in pairs(_) do
-    f[fname] = function(v, ...)
-      local wrapped = _.isTable(v) and v._wrapped or false
-      if wrapped then
-        local _arg = v._value
-        local _rslt = fct(_arg,...)
-        return new(_rslt)
-      else
-        return fct(v,...)
-      end
-    end
-  end
-
-  --- Imports all library functions into a context.
-  -- @name import
-  -- @param[opt] context a context. Defaults to `_G` (global environment) when not given.
-  -- @param[optchain] noConflict if supplied, will not import functions having a key existing in the destination context.
-  -- @return the passed-in context
-  f.import = function(context, noConflict)
-    context = context or _ENV or _G
-    local funcs = _.functions()
-    _.each(funcs, function(k, fname)
-      if rawget(context, fname) then
-        if not noConflict then
-          context[fname] = _[fname]
-        end
-      else
-        context[fname] = _[fname]
-      end
-    end)
-    return context
-  end
-
-  -- Descriptive tags
-  __._VERSION     = 'Moses v'.._MODULEVERSION
-  __._URL         = 'http://github.com/Yonaba/Moses'
-  __._LICENSE     = 'MIT <http://raw.githubusercontent.com/Yonaba/Moses/master/LICENSE>'
-  __._DESCRIPTION = 'utility-belt library for functional programming in Lua'
-
-  return __
-
-end
diff --git a/src/lib/strict.lua b/src/lib/strict.lua
deleted file mode 100644
index 40e62b7..0000000
--- a/src/lib/strict.lua
+++ /dev/null
@@ -1,39 +0,0 @@
--- strict.lua
--- checks uses of undeclared global variables
--- All global variables must be 'declared' through a regular assignment
--- (even assigning nil will do) in a main chunk before being used
--- anywhere or assigned to inside a function.
--- distributed under the Lua license: http://www.lua.org/license.html
-
-local getinfo, error, rawset, rawget = debug.getinfo, error, rawset, rawget
-
-local mt = getmetatable(_G)
-if mt == nil then
-  mt = {}
-  setmetatable(_G, mt)
-end
-
-mt.__declared = {}
-
-local function what ()
-  local d = getinfo(3, "S")
-  return d and d.what or "C"
-end
-
-mt.__newindex = function (t, n, v)
-  if not mt.__declared[n] then
-    local w = what()
-    if w ~= "main" and w ~= "C" then
-      error("assign to undeclared variable '"..n.."'", 2)
-    end
-    mt.__declared[n] = true
-  end
-  rawset(t, n, v)
-end
-
-mt.__index = function (t, n)
-  if not mt.__declared[n] and what() ~= "C" then
-    error("variable '"..n.."' is not declared", 2)
-  end
-  return rawget(t, n)
-end
diff --git a/src/lib/terebi.lua b/src/lib/terebi.lua
deleted file mode 100644
index 3ef2356..0000000
--- a/src/lib/terebi.lua
+++ /dev/null
@@ -1,234 +0,0 @@
-local Terebi = {
-  _VERSION     = 'terebi v0.4.0',
-  _URL         = 'https://github.com/oniietzschan/terebi',
-  _DESCRIPTION = 'Graphics scaling library for Love2D.',
-  _LICENSE     = [[
-    Massachusecchu... あれっ！ Massachu... chu... chu... License!
-
-    Copyright (c) 1789 Retia Adolf
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to deal
-    in the Software without restriction, including without limitation the rights
-    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in all
-    copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED 【AS IZ】, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-    SOFTWARE. PLEASE HAVE A FUN AND BE GENTLE WITH THIS SOFTWARE.
-  ]]
-}
-
-
-
-function Terebi.initializeLoveDefaults()
-  love.graphics.setDefaultFilter('nearest', 'nearest')
-  love.graphics.setLineStyle('rough')
-end
-
-
-
-local Screen = {}
-local ScreenMetaTable = {__index = Screen}
-
-function Terebi.newScreen(...)
-  return setmetatable({}, ScreenMetaTable)
-    :initialize(...)
-end
-
-function Screen:initialize(width, height, scale)
-  assert(type(scale) == 'number')
-
-  return self
-    :setBackgroundColor(0, 0, 0)
-    :setDimensions(width, height, scale)
-end
-
-function Screen:getDimensions()
-  return self._width, self._height
-end
-
-function Screen:setDimensions(width, height, scale, isSkipWindowResize)
-  assert(type(width) == 'number')
-  assert(type(height) == 'number')
-  scale = scale or self._scale
-
-  self._width = width
-  self._height = height
-  self._canvas = love.graphics.newCanvas(width, height)
-
-  return self
-    :setScale(scale, isSkipWindowResize)
-    :_saveScale()
-end
-
-function Screen:setBackgroundColor(r, g, b)
-  assert(type(r) == 'number')
-  assert(type(g) == 'number')
-  assert(type(b) == 'number')
-
-  self._backgroundColor = {r, g, b}
-
-  return self
-end
-
-function Screen:getScale()
-  return self._scale
-end
-
-function Screen:setScale(scale, isSkipWindowResize)
-  assert(type(scale) == 'number')
-
-  self._scale = math.floor(math.max(1, math.min(scale, self:_getMaxScale())))
-
-  if isSkipWindowResize ~= true then
-    self:_resizeWindow()
-  end
-  return self:_updateDrawOffset()
-end
-
-function Screen:_resizeWindow()
-  local currentW, currentH, flags = love.window.getMode()
-  local newW, newH = love.window.fromPixels(self._width * self._scale, self._height * self._scale)
-  if not love.window.getFullscreen() and (currentW ~= newW or currentH ~= newH) then
-    love.window.setMode(newW, newH, flags)
-  end
-
-  return self
-end
-
-function Screen:_saveScale()
-  self._savedScale = self._scale
-
-  return self
-end
-
-function Screen:_restoreScale()
-  return self:setScale(self._savedScale)
-end
-
-function Screen:increaseScale(isSkipWindowResize)
-  return self
-    :setScale(self._scale + 1, isSkipWindowResize)
-    :_saveScale()
-end
-
-function Screen:decreaseScale(isSkipWindowResize)
-  return self
-    :setScale(self._scale - 1, isSkipWindowResize)
-    :_saveScale()
-end
-
-function Screen:toggleFullscreen()
-  if love.window.getFullscreen() then
-    love.window.setFullscreen(false)
-    self:_restoreScale()
-
-  else
-    self:_saveScale()
-    love.window.setFullscreen(true)
-    self
-      :setMaxScale()
-      :_updateDrawOffset()
-  end
-
-  return self
-end
-
-function Screen:setMaxScale()
-  return self:setScale(self:_getMaxScale())
-end
-
-function Screen:_getMaxScale()
-  local desktopW, desktopH = self:_getDesktopDimensions()
-  local maxScaleX = math.floor(desktopW / self._width)
-  local maxScaleY = math.floor(desktopH / self._height)
-
-  return math.min(maxScaleX, maxScaleY)
-end
-
-function Screen:handleResize()
-  return self
-    :setScale(self:_getMaxScaleForWindow(), true)
-    :_updateDrawOffset()
-end
-
-function Screen:_getMaxScaleForWindow()
-  local w, h = love.window.getMode()
-  return self:_getMaxScaleForDimensions(w, h)
-end
-
-function Screen:_getMaxScaleForDimensions(w, h)
-  local maxScaleX = math.floor(w / self._width)
-  local maxScaleY = math.floor(h / self._height)
-
-  return math.min(maxScaleX, maxScaleY)
-end
-
-function Screen:_updateDrawOffset()
-  local w, h = love.window.getMode()
-  local scaledWidth  = self._width * self._scale
-  local scaledHeight = self._height * self._scale
-  self._drawOffsetX = math.floor((w - scaledWidth) / 2)
-  self._drawOffsetY = math.floor((h - scaledHeight) / 2)
-
-  return self
-end
-
-function Screen:_getDesktopDimensions()
-  return love.window.toPixels(love.window.getDesktopDimensions())
-end
-
-function Screen:draw(drawFunc, ...)
-  assert(type(drawFunc) == 'function', type(drawFunc))
-
-  love.graphics.push('all')
-  love.graphics.setCanvas(self._canvas)
-  love.graphics.clear()
-  drawFunc(...)
-  love.graphics.pop()
-
-  -- Draw background if it would be visible
-  if self._drawOffsetX ~= 0 or self._drawOffsetY ~= 0 then
-    local r, g, b = love.graphics.getColor()
-    love.graphics.setColor(unpack(self._backgroundColor))
-    love.graphics.rectangle('fill', 0, 0, love.graphics.getDimensions())
-    love.graphics.setColor(r, g, b)
-  end
-  -- Draw screen
-  love.graphics.draw(self._canvas, self._drawOffsetX, self._drawOffsetY, 0, self._scale, self._scale)
-
-  return self
-end
-
-function Screen:getMousePosition()
-  return self:windowToScreen(love.mouse.getPosition())
-end
-
-function Screen:windowToScreen(x, y)
-  assert(type(x) == 'number')
-  assert(type(y) == 'number')
-
-  return (x - self._drawOffsetX) / self._scale,
-         (y - self._drawOffsetY) / self._scale
-end
-
-function Screen:screenToWindow(x, y)
-  assert(type(x) == 'number')
-  assert(type(y) == 'number')
-
-  return x * self._scale + self._drawOffsetX,
-         y * self._scale + self._drawOffsetY
-end
-
-
-
-return Terebi
diff --git a/src/log.lua b/src/log.lua
deleted file mode 100644
index 9aceb38..0000000
--- a/src/log.lua
+++ /dev/null
@@ -1,30 +0,0 @@
-local LOG_LEVEL, _logCounts, _logLines = 6, nil, nil
-local function _log(level, prefix, text, ...)
-  if LOG_LEVEL >= level then
-    local text = prefix .. text
-    if level ~= 4 then
-      print(text, ...)
-    end
-    table.insert(_logLines, text)
-  end
-  _logCounts[level] = _logCounts[level] + 1
-end
-function logError(...)   _log(1, 'ERROR: ',   ...) end
-function logWarning(...) _log(2, 'WARNING: ', ...) end
-function logNotice(...)  _log(3, 'NOTICE: ',  ...) end
-function logSpoiler(...) _log(4, 'SPOILER: ', ...) end
-function logSphere(...)  _log(5, 'SPHERE: ',  ...) end
-function logRoute(...)   _log(6, 'ROUTE: ',   ...) end
-function logInfo(...)    _log(7, 'INFO: ',    ...) end
-function logDebug(...)   _log(8, 'DEBUG: ',   ...) end
-function countLogWarningsAndErrors()
-  return _logCounts[2], _logCounts[1]
-end
-function getLogText()
-  return table.concat(_logLines, "\r\n")
-end
-function resetLog()
-  _logCounts = {0, 0, 0, 0, 0, 0, 0, 0}
-  _logLines = {}
-end
-resetLog()
\ No newline at end of file
diff --git a/src/main.lua b/src/main.lua
deleted file mode 100644
index 3f10429..0000000
--- a/src/main.lua
+++ /dev/null
@@ -1,185 +0,0 @@
-require 'lib.strict'
-
-VERSION = '2.1'
-CSVERSION = 3
-
-Class   = require 'lib.classic'
-_       = require 'lib.moses'
-
-lf = love.filesystem
-lg = love.graphics
-ld = love.data
-
-U = require 'util'
-
-require 'log'
-require 'lib.bit'
-
-local random = require 'randomizer'
-local settings = require 'settings'
-Settings = settings()
-Randomizer = random()
-Screen = require 'ui.draw'
-
-local csdirectory
-
-function love.load(args)
-  Settings:init()
-
-  if _.contains(args, "--daily") then
-    love.window.close()
-    U.writeFile("daily.txt", generateDaily())
-    love.event.quit()
-    return
-  end
-  Screen:setup()
-
-  if Settings.settings.csdirectory == "csdata" then
-    Screen:setStatus("Cave story folder found!")
-    Randomizer:setPath(Settings.settings.csdirectory)
-  else
-    Screen:setStatus("Drag and drop your Cave Story folder here.")
-  end
-  Screen:draw()
-end
-
-local function recursiveWrite(path, name)
-  local filesTable = lf.getDirectoryItems(path)
-  lf.createDirectory(name)
-  for i,v in ipairs(filesTable) do
-    local file = path..'/'..v
-    if lf.getInfo(file, 'file') ~= nil then
-      local n
-      lf.write(name..'/'..v, lf.read(file))
-    elseif lf.getInfo(file, 'directory') ~= nil then
-      recursiveWrite(file, name..'/'..v)
-    end
-  end
-end
-
-local function recursivelyDelete( item )
-  if lf.getInfo( item , "directory" ) then
-      for _, child in ipairs( lf.getDirectoryItems( item )) do
-          recursivelyDelete( item .. '/' .. child )
-          lf.remove( item .. '/' .. child )
-      end
-  elseif lf.getInfo( item ) then
-      lf.remove( item )
-  end
-  lf.remove( item )
-end
-
-function love.directorydropped(path)
-  local success, dirStage = Randomizer:_mountDirectory(path)
-  local csversion = lf.read(dirStage .. '/_version.txt') or "0"
-  csversion = tonumber(csversion)
-  --Randomizer:_unmountDirectory(path)
-  if success then
-    if csversion >= CSVERSION then
-      recursivelyDelete('csdata') -- completely clear the folder, in case of user error :)
-      recursiveWrite('mounted-data', 'csdata')
-
-      Settings.settings.csdirectory = 'csdata'
-      Settings.settings.csversion = csversion
-      Settings:update()
-      Randomizer:setPath('csdata')
-      Screen:setStatus("Cave Story folder updated!")
-    else
-      Screen:setStatus("Invalid Cave Story folder!\n\nMake sure you're using an up to date version of the randomizer's included Cave Story folder.")
-    end
-  else
-    Screen:setStatus("Could not find \"data\" subfolder.\n\nMaybe try dropping your Cave Story \"data\" folder in directly?")
-  end
-end
-
-function love.keypressed(key)
-  if key == 'escape' then
-    love.event.push('quit')
-  end
-end
-
-function love.draw()
-  Screen:draw()
-end
-
-function generateDaily()
-  local json = [[{"embeds": [{"title": "**Daily Challenge: %s**","color": 11323851,"fields": [{"name": "Seed","value": "%s","inline": true},{"name": "Version","value": "%s","inline": true},{"name": "Settings","value": "**Objective**: %s\n**Spawn**: %s\n**Puppies outside Sand Zone**: %s\n**Sequence breaks**: %s\n"},{"name": "Title Screen Code","value": "<%s> <%s> <%s> <%s> <%s> (%s/%s/%s/%s/%s)"},{"name": "<:rando:558942498668675072> Sharecode","value": "`%s`"}]}]}]]
-  
-  -- no matter what time of day you run the daily, it'll be consistent throughout the day
-  local date = os.date("*t", os.time())
-  Randomizer.customseed = tostring(os.time({year=date.year, month=date.month, day=date.day}))
-  Randomizer:_seedRngesus()
-
-  local datestring = os.date("%B %d, %Y")
-
-  local function pick(t) return t[love.math.random(#t)] end
-  local objective = pick({{name = "Bad Ending", val = "objBadEnd"}, {name = "Normal Ending", val = "objNormalEnd"}, {name = "Best Ending", val = "objBestEnd"}, {name = "Bad Ending", val = "objBadEnd"}, {name = "Normal Ending", val = "objNormalEnd"}, {name = "Best Ending", val = "objBestEnd"}, {name = "All Bosses", val = "objAllBosses"}, {name = "100%", val = "obj100Percent"}})
-  local spawn = pick({"Start Point", "Arthur's House", "Start Point", "Arthur's House", "Camp"})
-  local puppies = pick({{name = "Enabled", val = true}, {name = "Disabled", val = false}})
-  local sequence = pick({{name = "All", val = true}, {name = "None", val = false}, {name = "None", val = false}})
-
-  Randomizer.obj = objective.val
-  Randomizer.worldGraph.spawn = spawn
-  Randomizer.puppy = puppies.val
-  Randomizer.worldGraph.seqbreak = sequence.val
-
-  Randomizer.worldGraph.dboosts.cthulhu.enabled = sequence.val
-  Randomizer.worldGraph.dboosts.chaco.enabled = sequence.val
-  Randomizer.worldGraph.dboosts.paxChaco.enabled = sequence.val
-  Randomizer.worldGraph.dboosts.flightlessHut.enabled = sequence.val
-  Randomizer.worldGraph.dboosts.camp.enabled = sequence.val
-  Randomizer.worldGraph.dboosts.sisters.enabled = sequence.val
-  Randomizer.worldGraph.dboosts.plantation.enabled = sequence.val
-  Randomizer.worldGraph.dboosts.rocket.enabled = sequence.val
-
-  -- reinitialize seed after pick()ing
-  local seed = Randomizer:_seedRngesus()
-  Randomizer:_updateSharecode(seed)
-  Randomizer:_shuffleItems()
-
-  local itemdata = {
-    {emoji = ":arthurkey:685845258843455501", name = "Arthur's Key"},
-    {emoji = ":mapsystem:685848232374567076", name = "Map System"},
-    {emoji = ":santakey:685848232428830790", name = "Santa's Key"},
-    {emoji = ":silverlocket:685848232584413185", name = "Silver Locket"},
-    {emoji = ":beastfang:685848232428830720", name = "Beast Fang"},
-    {emoji = ":lifecapsule:685848233393913946", name = "Life Capsule"},
-    {emoji = ":idcard:685848232295006208", name = "ID Card"},
-    {emoji = ":jellyfishjuice:685848232290680879", name = "Jellyfish Juice"},
-    {emoji = ":rustykey:685848232554791045", name = "Rusty Key"},
-    {emoji = ":gumkey:685848232173240381", name = "Gum Key"},
-    {emoji = ":gumbase:685848232336818195", name = "Gum Base"},
-    {emoji = ":charcoal:685848232987066409", name = "Charcoal"},
-    {emoji = ":explosive:685848232328560712", name = "Explosive"},
-    {emoji = ":puppyitem:685848232554791003", name = "Puppy"},
-    {emoji = ":lifepot:685848231875575868", name = "Life Pot"},
-    {emoji = ":cureall:685848232315715596", name = "Cure-All"},
-    {emoji = ":clinickey:685848232315715589", name = "Clinic Key"},
-    {emoji = ":booster08:685848232332492802", name = "Booster 0.8"},
-    {emoji = ":armsbarrier:685848232252932127", name = "Arms Barrier"},
-    {emoji = ":turbocharge:685848232756248614", name = "Turbocharge"},
-    {emoji = ":airtank:685848232311521353", name = "Curly's Air Tank"},
-    {emoji = ":nikumaru:685848232504590342", name = "Nikumaru Counter"},
-    {emoji = ":booster20:685848232299069511", name = "Booster 2.0"},
-    {emoji = ":mimigamask:685848232592539695", name = "Mimiga Mask"},
-    {emoji = ":teleportkey:685848232655716423", name = "Teleporter Room Key"},
-    {emoji = ":suesletter:685848232554659898", name = "Sue's Letter"},
-    {emoji = ":controller:685848232294613036", name = "Controller"},
-    {emoji = ":brokensprinkler:685848232290680898", name = "Broken Sprinkler"},
-    {emoji = ":sprinkler:685848232588476438", name = "Sprinkler"},
-    {emoji = ":towrope:685848232403927093", name = "Tow Rope"},
-    {emoji = ":clayfiguremedal:685848232160526375", name = "Clay Figure Medal"},
-    {emoji = ":mrlittle:685848232521367630", name = "Mr. Little"},
-    {emoji = ":mushroombadge:685848232445870111", name = "Mushroom Badge"},
-    {emoji = ":mapignon:685848232122777673", name = "Ma Pignon"},
-    {emoji = ":panties:685848232508915752", name = "Curly's Panties"},
-    {emoji = ":alienmedal:685848232076640298", name = "Alien Medal"},
-    {emoji = ":lipstick:685848232370372609", name = "Chaco's Lipstick"},
-    {emoji = ":whimsicalstar:685848232458190853", name = "Whimsical Star"},
-    {emoji = ":ironbond:685848232341143625", name = "Iron Bond"}
-  }
-  local hash = Randomizer:_generateHash()
-  local h = {itemdata[hash[1]], itemdata[hash[2]], itemdata[hash[3]], itemdata[hash[4]], itemdata[hash[5]]}
-
-  return json:format(datestring, seed, VERSION, objective.name, spawn, puppies.name, sequence.name, h[1].emoji, h[2].emoji, h[3].emoji, h[4].emoji, h[5].emoji, h[1].name, h[2].name, h[3].name, h[4].name, h[5].name, Randomizer.sharecode)
-end
\ No newline at end of file
diff --git a/src/pxm_file.lua b/src/pxm_file.lua
deleted file mode 100644
index c9e898e..0000000
--- a/src/pxm_file.lua
+++ /dev/null
@@ -1,46 +0,0 @@
-local function readLittleEndian(file, bytes)
-  local string = file:read(2)
-  local bytes = string:byte()
-  -- print(string, type(bytes), bytes)
-  return bytes
-end
-
--- https://gist.github.com/fdeitylink/3fded36e9187fe838eb18a412c712800
--- -=~ PXM File Data ~=-
---   maps must be minimum of 21x16
-local function readPXM(filename)
-  print('reading PXM: ' .. filename)
-  local file = assert(io.open(filename, MODE_READ_BINARY))
-  -- First three bytes are PXM, then 0x10.
-  assert(file:read(3) == "PXM")
-  assert(file:read(1):byte() == 0x10)
-
-  -- Then 0x_map_length - 2 bytes
-  -- Then 0x_map_height - 2 bytes
-  local length = readLittleEndian(file, 2)
-  local height = readLittleEndian(file, 2)
-  print('length:', length)
-  print('height:', height)
-
-  -- Then 0x_map_tile_from_tileset for the rest of the file (numbered from 0, and going left to right, top to bottom) - 1 byte
-  local tiles = {}
-  for x = 1, length do
-    tiles[x] = {}
-  end
-  for y = 1, height do
-    for x = 1, length do
-      tiles[x][y] = file:read(1):byte()
-    end
-  end
-  -- Print result
-  local XXX = 3
-  for y = 1, height do
-    local line = ""
-    for x = 1, length do
-      local tile = tiles[x][y]
-      local len = string.len(tile)
-      line = line .. string.rep(' ', XXX - len) .. tile
-    end
-    print(line)
-  end
-end
diff --git a/src/randomizer.lua b/src/randomizer.lua
deleted file mode 100644
index e1fa630..0000000
--- a/src/randomizer.lua
+++ /dev/null
@@ -1,518 +0,0 @@
-local Items = require 'database.items'
-local TscFile  = require 'tsc_file'
-local WorldGraph = require 'database.world_graph'
-local Music = require 'database.music'
-
-local C = Class:extend()
-
-local TSC_FILES = {}
-do
-  for key, location in ipairs(WorldGraph(Items()):getLocations()) do
-    if location.map ~= nil and location.event ~= nil then
-      local filename = location.map
-      if not _.contains(TSC_FILES, filename) then
-        table.insert(TSC_FILES, filename)
-      end
-    end
-  end
-  for key, cue in pairs(Music():getCues()) do
-    local filename = cue.map
-    if not _.contains(TSC_FILES, filename) then
-      table.insert(TSC_FILES, filename)
-    end
-  end
-end
-
-local csdirectory
-
-local function mkdir(path)
-    local mkdir_str
-    if package.config:sub(1,1) == '\\' then -- Windows
-      mkdir_str = 'mkdir "%s"'
-    else -- *nix
-      mkdir_str = "mkdir -p '%s'"
-    end
-    os.execute(mkdir_str:format(path)) -- HERE BE DRAGONS!!!	
-end
-
-function C:new()
-  self._isCaveStoryPlus = false
-  self.itemDeck = Items()
-  self.worldGraph = WorldGraph(self.itemDeck)
-  self.music = Music()
-
-  self.customseed = nil
-  self.puppy = false
-  self.obj = ""
-  self.sharecode = ""
-  self.mychar = ""
-  self.shuffleMusic = false
-  self.completableLogic = true
-  self.spheres = {}
-end
-
-function C:setPath(path)
-  csdirectory = path
-end
-
-function C:ready()
-  return csdirectory ~= nil
-end
-
-function C:randomize()
-  resetLog()
-  logNotice('=== Cave Story Randomizer v' .. VERSION .. ' ===')
-  local success, dirStage = self:_mountDirectory(csdirectory)
-  if not success then
-    return "Could not find \"data\" subfolder.\n\nMaybe try dropping your Cave Story \"data\" folder in directly?"
-  end
-  
-  self:_logSettings()
-
-  local seed = self:_seedRngesus(self.obj) -- append obj string in order to shuffle differently depending on the objective
-  self:_updateSharecode(seed)
-
-  local tscFiles = self:_createTscFiles(dirStage)
-
-  self:_shuffleItems(tscFiles)
-  self:_generateHash()
-  if self.shuffleMusic then self.music:shuffleMusic(tscFiles) end
-
-  self:_logSpheres()
-  self:_generateRoute()
-
-  self:_writeModifiedData(tscFiles)
-  self:_writePlaintext(tscFiles)
-  self:_writeLog()
-  self:_copyMyChar()
-  self:_unmountDirectory(csdirectory)
-
-  self:_updateSettings()
-
-  return self:_getStatusMessage(seed, self.sharecode)
-end
-
-function C:_mountDirectory(path)
-  local mountPath = 'mounted-data'
-  assert(lf.mount(path, mountPath))
-  local dirStage = '/' .. mountPath
-
-  local items = lf.getDirectoryItems(dirStage)
-  local containsData = _.contains(items, 'data')
-  if containsData then
-    dirStage = dirStage .. '/data'
-  end
-
-  -- For Cave Story+
-  local items = lf.getDirectoryItems(dirStage)
-  local containsBase = _.contains(items, 'base')
-  if containsBase then
-    dirStage = dirStage .. '/base'
-    self._isCaveStoryPlus = true
-  end
-
-  local items = lf.getDirectoryItems(dirStage)
-  local containsStage = _.contains(items, 'Stage')
-  if containsStage then
-    dirStage = dirStage .. '/Stage'
-  else
-    return false, ''
-  end
-
-  return true, dirStage
-end
-
-function C:_seedRngesus(suffix)
-  local seedstring = self.customseed or tostring(os.time())
-  local seed = ld.encode('string', 'hex', ld.hash('sha256', seedstring  .. suffix))
-  local s1 = tonumber(seed:sub(-8,  -1), 16) -- first 32 bits (from right)
-  local s2 = tonumber(seed:sub(-16, -9), 16) -- next 32 bits
-
-  love.math.setRandomSeed(s1, s2)
-  
-  logNotice(('Offering seed "%s" to RNGesus' ):format(seedstring))
-  return seedstring
-end
-
-function C:_createTscFiles(dirStage)
-  local tscFiles = {}
-  for _, filename in ipairs(TSC_FILES) do
-    local path = dirStage .. '/' .. filename .. ".tsc"
-    tscFiles[filename] = TscFile(path)
-    tscFiles[filename].mapName = filename
-  end
-  return tscFiles
-end
-
-function C:_writePlaintext(tscFiles)
-  local sourcePath = lf.getSourceBaseDirectory()
-
-  -- Create /data/Plaintext if it doesn't already exist.
-  mkdir(sourcePath .. '/data/Plaintext')
-
-  -- Write modified files.
-  for filename, tscFile in pairs(tscFiles) do
-    local path = sourcePath .. '/data/Plaintext/' .. filename .. '.txt'
-    tscFile:writePlaintextTo(path)
-  end
-end
-
-function C:getObjective()
-  return {self.itemDeck:getByKey(self.obj)}
-end
-
-function C:_shuffleItems(tscFiles)
-  local obj = self:getObjective()[1]
-  obj.name = obj.name .. (", %s"):format(self.worldGraph.spawn)
-  obj.script = obj.script .. self.worldGraph:getSpawnScript()
-  if self.worldGraph.seqbreak and self.worldGraph.dboosts.rocket.enabled then obj.script = "<FL+6400" .. obj.script end
-  if self.worldGraph.noFallingBlocks then obj.script = "<FL+1351" .. obj.script end
-  -- place the objective scripts in Start Point
-  self:_fastFillItems({obj}, self.worldGraph:getObjectiveSpot())
-
-  if self.worldGraph:StartPoint() then
-    -- first, fill one of the first cave spots with a weapon that can break blocks
-    _.shuffle(self.worldGraph:getFirstCaveSpots())[1]:setItem(_.shuffle(self.itemDeck:getItemsByAttribute("weaponSN"))[1])
-  elseif self.worldGraph:Camp() then
-    -- give Dr. Gero a strong weapon... you'll need it
-    self.worldGraph:getCamp()[1]:setItem(_.shuffle(self.itemDeck:getItemsByAttribute("weaponStrong"))[1])
-    -- and some HP once you fight your way past the first few enemies
-    self.worldGraph:getCamp()[2]:setItem(self.itemDeck:getByKey("capsule5G"))
-  end
-
-  -- place the bomb on MALCO for bad end
-  if self.obj == "objBadEnd" then
-    self.worldGraph:getMALCO()[1]:setItem(self.itemDeck:getByKey("bomb"))
-  end
-
-  local mandatory = _.compact(_.shuffle(self.itemDeck:getMandatoryItems(true)))
-  local optional = _.compact(_.shuffle(self.itemDeck:getOptionalItems(true)))
-  local puppies = _.compact(_.shuffle(self.itemDeck:getItemsByAttribute("puppy")))
-
-  if not self.puppy then
-    -- then fill puppies, for normal gameplay
-    self:_fastFillItems(puppies, _.shuffle(self.worldGraph:getPuppySpots()))
-  else
-    -- for puppysanity, shuffle puppies in with the mandatory items
-    mandatory = _.shuffle(_.append(mandatory, puppies))
-    puppies = {}
-  end
-  
-  -- next fill hell chests, which cannot have mandatory items
-  if not self.completableLogic then
-    self:_fastFillItems(optional, _.shuffle(self.worldGraph:getHellSpots()))
-  end
-
-  -- add map system AFTER filling hell chests so that it gets placed somewhere accessible in every objective
-  optional = _.append(optional, self.itemDeck:getByKey("mapSystem"))
-
-  -- place mandatory items with assume fill
-  self:_fillItems(mandatory, _.shuffle(_.reverse(self.worldGraph:getEmptyLocations())))
-
-  -- place optional items with a simple random fill
-  local opt = #optional
-  local loc = #self.worldGraph:getEmptyLocations()
-  if opt > loc then
-    logWarning(("Trying to fill more optional items than there are locations! Items: %d Locations: %d"):format(opt, loc))
-  end
-  self:_fastFillItems(optional, _.shuffle(self.worldGraph:getEmptyLocations()))
-  self:_generateHints()
-
-  if tscFiles ~= nil then
-    self.worldGraph:writeItems(tscFiles)
-    self.worldGraph:logLocations()
-  end
-end
-
-function C:_fillItems(items, locations)
-  assert(#items > 0, ("No items provided! Trying to fill %s locations."):format(#locations))
-  assert(#items <= #locations, string.format("Trying to fill more items than there are locations! Items: %d Locations: %d", #items, #locations))
-
-  local itemsLeft = _.clone(items)
-  repeat
-    local item = _.pop(itemsLeft)
-    local assumed = self.worldGraph:collect(itemsLeft)
-
-    local filter = function(k,v) return not v:hasItem() and v:canAccess(assumed) end
-
-    if self.completableLogic and self.worldGraph:canBeatGame(assumed, self.obj) then
-      filter = function(k,v) return not v:hasItem() end
-    end
-
-    local fillable = _.filter(locations, filter)
-    
-    if #fillable > 0 then
-      logDebug(("Placing %s at %s"):format(item.name, fillable[1].name))
-      fillable[1]:setItem(item)
-    else
-      logError(("No available locations for %s! Items left: %d"):format(item.name, #itemsLeft))
-    end
-  until #itemsLeft == 0
-end
-
-function C:_fastFillItems(items, locations)
-  assert(#items > 0, ("No items provided! Attempting to fast fill %s locations."):format(#locations))
-
-  for key, location in ipairs(locations) do
-    local item = _.pop(items)
-    if item == nil then break end -- no items left to place, but there are still locations open
-    location:setItem(item)
-  end
-end
-
-function C:_analyzeSpheres(forceUpdate)
-  if not forceUpdate and #self.spheres > 0 then
-    return self.spheres
-  end
-  self.spheres = {}
-
-  local items = {}
-  local locations
-
-  repeat
-    local collected
-    collected, locations = self.worldGraph:collect(items, locations, true)
-    local sphereItems = _.difference(collected, items)
-    items = collected
-
-    local sphere = {}
-    for k,v in pairs(sphereItems) do
-      table.insert(sphere, v)
-    end
-    if #sphere == 0 then break end
-
-    table.insert(self.spheres, sphere)
-  until false
-  if self.obj ~= "objBadEnd" and self.obj ~= "objNormalEnd" then
-    -- add the hell sphere at the very end, shh it works trust me
-    local sphere = {}
-    table.insert(sphere, self.worldGraph.regions.endgame.locations.hellB1.item)
-    table.insert(sphere, self.worldGraph.regions.endgame.locations.hellB3.item)
-    table.insert(self.spheres, sphere)
-  end
-
-  return self.spheres
-end
-
-function C:_logSpheres()
-  local total = 0
-  for i,sphere in ipairs(self:_analyzeSpheres()) do
-    logSphere(("Sphere %i"):format(i))
-    for i2,item in ipairs(sphere) do
-      if not _.contains(item.attributes, "abstract") then
-        total = total + 1
-      end
-      if not _.contains(item.attributes, "objective") then
-        logSphere(("\t %s: %s"):format(item.location_name, item.name))
-      end
-    end
-  end
-  logSphere(("Maximum items to collect: %i"):format(total))
-end
-
-function C:_generateRoute()
-  return
-end
-
-function C:_generateHints()
-  local toHint = _.shuffle(self.worldGraph:getHintableLocations(self.obj))
-  for k, hintLocation in ipairs(_.shuffle(self.worldGraph:getHintLocations())) do
-    hintLocation.item = self.worldGraph.items:createHint(_.pop(toHint))
-  end
-  self.worldGraph.hintregion.locations.mrsLittle.item = self.worldGraph.items:prebuiltHint(self.worldGraph.regions.outerWall.locations.littleHouse)
-  self.worldGraph.hintregion.locations.malco.item = self.worldGraph.items:prebuiltHint(self.worldGraph.regions.grasstownEast.locations.malco)
-  self.worldGraph.hintregion.locations.numahachi1.item = self.worldGraph.items:prebuiltHint(self.worldGraph.regions.endgame.locations.hellB1, "<CLR<EVE0302")
-  self.worldGraph.hintregion.locations.numahachi2.item = self.worldGraph.items:prebuiltHint(self.worldGraph.regions.endgame.locations.hellB3, "<CLR<EVE0303")
-  self.worldGraph.hintregion.locations.jenka.item = self.worldGraph.items:prebuiltHint(self.worldGraph.regions.lowerSandZone.locations.jenka)
-end
-
-function C:_writeModifiedData(tscFiles)
-  local basePath = self:_getWritePathStage()
-  for filename, tscFile in pairs(tscFiles) do
-    local path = basePath .. '/' .. filename .. '.tsc'
-    tscFile:writeTo(path)
-  end
-end
-
-function C:_copyModifiedFirstCave()
-  local cavePxmPath = self:_getWritePathStage() .. '/Cave.pxm'
-  local data = lf.read('database/Cave.pxm')
-  assert(data)
-  U.writeFile(cavePxmPath, data)
-end
-
-function C:_writeLog()
-  local path = self:_getWritePath() .. '/log.txt'
-  local data = getLogText()
-  U.writeFile(path, data)
-end
-
-function C:_copyMyChar()
-  local path = self:_getWritePath() .. '/MyChar.bmp'
-  if self.mychar then 
-    local data = lf.read(self.mychar)
-    U.writeFile(path, data)
-  else
-    U.eraseFile(path)
-  end
-end
-
-function C:_generateHash()
-  local serialized = table.concat(self.worldGraph:serialize())
-  local hashed = ld.encode('string', 'hex', ld.hash('sha256', serialized))
-  hashed = tonumber(hashed:sub(-8,  -1), 16)
-  hashed = hashed % (39^5)
-  
-  local h = {}
-  for i=1,5 do
-    table.insert(h, (hashed%39)+1)
-    hashed = math.floor(hashed / 39)
-  end
-
-  local path = self:_getWritePath() .. '/hash.txt'
-  U.writeFile(path, ("%04d,%04d,%04d,%04d,%04d"):format(h[1], h[2], h[3], h[4], h[5]))
-  return h
-end
-
-function C:_getWritePath()
-  return select(1, self:_getWritePaths())
-end
-
-function C:_getWritePathStage()
-  return select(2, self:_getWritePaths())
-end
-
-function C:_getWritePaths()
-  if self._writePath == nil then
-    local sourcePath = lf.getSourceBaseDirectory()
-    self._writePath = sourcePath .. '/data'
-    self._writePathStage = (self._isCaveStoryPlus)
-      and (self._writePath .. '/base/Stage')
-      or  (self._writePath .. '/Stage')
-  end
-  -- Create /data(/base)/Stage if it doesn't already exist.
-  mkdir(self._writePathStage)
-  return self._writePath, self._writePathStage
-end
-
-function C:_unmountDirectory(path)
-  assert(lf.unmount(path))
-end
-
-function C:_logSettings()
-  -- these random calls are a hacky way to make sure that
-  -- randomization changes between seeds if settings change
-  local obj = "Best Ending"
-  if self.obj == "objBadEnd" then
-    obj = "Bad Ending"
-  elseif self.obj == "objNormalEnd" then
-    obj = "Normal Ending"
-  elseif self.obj == "objAllBosses" then
-    obj = "All Bosses"
-  end
-
-  local spawn = (", %s"):format(self.worldGraph.spawn)
-
-  local puppy = self.puppy and ", Puppysanity" or ""
-  logNotice(("Game settings: %s"):format(obj .. spawn .. puppy))
-end
-
-function C:_updateSettings()
-  Settings.settings.puppy = self.puppy
-  Settings.settings.obj = self.obj
-  Settings.settings.mychar = self.mychar
-  Settings.settings.spawn = self.worldGraph.spawn
-  Settings.settings.seqbreaks = self.worldGraph.seqbreak
-  Settings.settings.dboosts = _.map(self.worldGraph.dboosts, function(k,v) return v.enabled end)
-  Settings.settings.musicShuffle = self.shuffleMusic
-  Settings.settings.musicBeta = self.music.betaEnabled
-  Settings.settings.musicFlavor = self.music.flavor
-  Settings.settings.noFallingBlocks = self.worldGraph.noFallingBlocks
-  Settings.settings.completableLogic = self.completableLogic
-  Settings:update()
-end
-
-function C:_updateSharecode(seed)
-  local settings = 0 -- 0b0000000000000000
-  -- P: single bit used for puppysanity
-  -- O: three bits used for objective
-  -- S: three bits used for spawn location
-  -- B: single bit used for sequence breaks
-  -- F: single bit used for falling blocks in Hell
-  -- C: single bit used for completeable logic
-  -- 0b000000CFBSSSOOOP
-
-  -- bitshift intervals
-  local obj = 1
-  local pup = 0
-  local spn = 4
-  local brk = 7
-  local nfb = 8
-  local cpl = 9
-
-  if self.obj == "objBadEnd" then
-    settings = bit.bor(settings, bit.blshift(1, obj))
-  elseif self.obj == "objNormalEnd" then
-    settings = bit.bor(settings, bit.blshift(2, obj))
-  elseif self.obj == "objAllBosses" then
-    settings = bit.bor(settings, bit.blshift(3, obj))
-  elseif self.obj == "obj100Percent" then
-    settings = bit.bor(settings, bit.blshift(4, obj))
-  end
-  if self.puppy then settings = bit.bor(settings, bit.blshift(1, pup)) end
-
-  if self.worldGraph:StartPoint() then
-    settings = bit.bor(settings, bit.blshift(0, spn))
-  elseif self.worldGraph:Arthur() then
-    settings = bit.bor(settings, bit.blshift(1, spn))
-  elseif self.worldGraph:Camp() then
-    settings = bit.bor(settings, bit.blshift(2, spn))
-  end
-
-  local seq = 0
-  if self.worldGraph.seqbreak then
-    settings = bit.bor(settings, bit.blshift(1, brk)) 
-    if self.worldGraph.dboosts.cthulhu.enabled then seq = bit.bor(seq, 1) end
-    if self.worldGraph.dboosts.chaco.enabled then seq = bit.bor(seq, 2) end
-    if self.worldGraph.dboosts.paxChaco.enabled then seq = bit.bor(seq, 4) end
-    if self.worldGraph.dboosts.flightlessHut.enabled then seq = bit.bor(seq, 8) end
-    if self.worldGraph.dboosts.camp.enabled then seq = bit.bor(seq, 16) end
-    if self.worldGraph.dboosts.sisters.enabled then seq = bit.bor(seq, 32) end
-    if self.worldGraph.dboosts.plantation.enabled then seq = bit.bor(seq, 64) end
-    if self.worldGraph.dboosts.rocket.enabled then seq = bit.bor(seq, 128) end
-  end
-
-  if self.worldGraph.noFallingBlocks then
-    settings = bit.bor(settings, bit.blshift(1, nfb))
-  end
-  if self.completableLogic then
-    settings = bit.bor(settings, bit.blshift(1, cpl))
-  end
-
-  if #seed < 20 then
-    seed = seed .. (" "):rep(20-#seed)
-  end
-
-  local packed = love.data.pack("data", "<s1I2B", seed, settings, seq)
-  self.sharecode = love.data.encode("string", "base64", packed)
-
-  logNotice(("Sharecode: %s"):format(self.sharecode))
-end
-
-function C:_getStatusMessage(seed, sharecode)
-  local warnings, errors = countLogWarningsAndErrors()
-  local line1
-  if warnings == 0 and errors == 0 then
-    line1 = ("Randomized data successfully created!\nSeed: %s\nSharecode: %s"):format(seed, sharecode)
-  elseif warnings ~= 0 and errors == 0 then
-    line1 = ("Randomized data was created with %d warning(s)."):format(warnings)
-  else
-    return ("Encountered %d error(s) and %d warning(s) when randomizing data!"):format(errors, warnings)
-  end
-  local line2 = "Next overwrite the files in your copy of Cave Story with the versions in the newly created \"data\" folder. Don't forget to save a backup of the originals!"
-  local line3 = "Then play and have a fun!"
-  local status = ("%s\n%s\n%s"):format(line1, line2, line3)
-  return status
-end
-
-return C
diff --git a/src/settings.lua b/src/settings.lua
deleted file mode 100644
index d027a82..0000000
--- a/src/settings.lua
+++ /dev/null
@@ -1,89 +0,0 @@
-local C = Class:extend()
-
-function C:init()
-  self.settings = {}
-  if lf.getInfo('settings.txt') == nil then
-    self.settings = self:getDefaults()
-  else
-    self.settings = lf.load('settings.txt')()
-    -- add any missing entries if new settings have been added
-    for k,v in pairs(self:getDefaults()) do
-      self.settings[k] = self.settings[k] or v
-    end
-  end
-  -- check for out of date CS folder
-  if self.settings.csversion < CSVERSION then
-    self.settings.csdirectory = nil
-  end
-  self:update()
-end
-
-function C:getDefaults()
-  return {
-    csdirectory = "",
-    puppy = false,
-    obj = "objBestEnd",
-    mychar = "assets/myChar/Quote.bmp",
-    spawn = "Start Point",
-    seqbreaks = false,
-    dboosts = {
-      cthulhu = true,
-      chaco = true,
-      paxChaco = true,
-      flightlessHut = true,
-      camp = true,
-      sisters = true,
-      plantation = true,
-      rocket = true
-    },
-    musicShuffle = false,
-    musicVanilla = true,
-    musicBeta = false,
-    musicKero = false,
-    musicFlavor = "Shuffle",
-    noFallingBlocks = false,
-    completableLogic = false,
-    csversion = 0
-  }
-end
-
-function C:update()
-  lf.write('settings.txt', self:serialize())
-end
-
-function C:serialize()
-  local function dboosts()
-    local line = "{"
-    for k,v in pairs(self.settings.dboosts) do
-      line = line .. ("%s = %s,"):format(k,v)
-    end
-    return line .. "}"
-  end
-
-  local line = "return {\r\n"
-  local tab = "  "
-  line = line .. tab .. ("csdirectory = %q,\r\n"):format(self.settings.csdirectory or "")
-  line = line .. tab .. ("puppy = %s,\r\n"):format(self.settings.puppy)
-  line = line .. tab .. ("obj = %q,\r\n"):format(self.settings.obj or "")
-  line = line .. tab .. ("mychar = %q,\r\n"):format(self.settings.mychar or "")
-  line = line .. tab .. ("spawn = %q,\r\n"):format(self.settings.spawn or "")
-  local dboost = dboosts()
-  line = line .. tab .. ("seqbreaks = %s,\r\n"):format(self.settings.seqbreaks)
-  line = line .. tab .. ("dboosts = %s,\r\n"):format(dboost)
-  line = line .. tab .. ("musicShuffle = %s,\r\n"):format(self.settings.musicShuffle)
-  line = line .. tab .. ("musicVanilla = %s,\r\n"):format(self.settings.musicVanilla)
-  line = line .. tab .. ("musicBeta = %s,\r\n"):format(self.settings.musicBeta)
-  line = line .. tab .. ("musicKero = %s,\r\n"):format(self.settings.musicKero)
-  line = line .. tab .. ("musicFlavor = %q,\r\n"):format(self.settings.musicFlavor)
-  line = line .. tab .. ("noFallingBlocks = %s,\r\n"):format(self.settings.noFallingBlocks)
-  line = line .. tab .. ("completableLogic = %s,\r\n"):format(self.settings.completableLogic)
-  line = line .. tab .. ("csversion = %s,\r\n"):format(self.settings.csversion)
-  
-  return line .. "}"
-end
-
-function C:getSettings()
-  return self.settings
-end
-
-return C
\ No newline at end of file
diff --git a/src/ui/draw.lua b/src/ui/draw.lua
deleted file mode 100644
index 7facb37..0000000
--- a/src/ui/draw.lua
+++ /dev/null
@@ -1,354 +0,0 @@
-local Luigi   = require 'lib.luigi.layout'
-
-local background
-
-local C = Class:extend()
-
-local layout = Luigi(require 'ui.main')
-local settings = Luigi(require 'ui.settings')
-local sequence = Luigi(require 'ui.sequence')
-local music = Luigi(require 'ui.music')
-
-local style = require 'ui.style'
-local theme = require 'lib.luigi.theme.dark'
-
-local utf8 = require("utf8")
-
-layout:setStyle(style)
-settings:setStyle(style)
-sequence:setStyle(style)
-music:setStyle(style)
-
-layout:setTheme(theme)
-settings:setTheme(theme)
-sequence:setTheme(theme)
-music:setTheme(theme)
-
-function C:setup()
-  self:loadPuppy(Settings.settings.puppy)
-  self:loadObjective(Settings.settings.obj)
-  self:loadMyChar(Settings.settings.mychar)
-  self:loadSpawn(Settings.settings.spawn)
-  self:loadSeqSettings(Settings.settings.seqbreaks, Settings.settings.dboosts)
-  self:loadMusicSettings(Settings.settings.musicShuffle, Settings.settings.musicFlavor, Settings.settings.musicVanilla, Settings.settings.musicBeta, Settings.settings.musicKero)
-  self:loadNoFallingBlocks(Settings.settings.noFallingBlocks)
-  self:loadCompleteableLogic(Settings.settings.completableLogic)
-
-  background = lg.newImage('assets/background.png')
-  self:draw()
-  layout:show()
-end
-
-settings.randoButton:onPress(function()
-  local function fifty() return love.math.random(2) == 2 end
-  Screen:loadPuppy(fifty())
-  Screen:loadObjective(love.math.random(4)-1)
-  settings.seedselect.value = false
-  settings.seedrandom.value = true
-  --Screen:loadMyChar(love.math.random(9))
-  Screen:loadSpawn(love.math.random(3)-1)
-  Screen:loadSeqSettings(fifty(), {
-  cthulhu = fifty(),
-  chaco = fifty(),
-  paxChaco = fifty(),
-  flightlessHut = fifty(),
-  camp = fifty(),
-  sisters = fifty(),
-  plantation = fifty(),
-  rocket = fifty()
-  })
-  --Screen:loadMusicSettings(fifty(), love.math.random(3), fifty())
-  Screen:loadNoFallingBlocks(fifty())
-end)
-
-function C:loadPuppy(puppy)
-  settings.puppy.value = puppy
-end
-
-function C:loadObjective(obj)
-  if obj == "objBadEnd" or obj == 1 then
-    settings.objective.index = 1
-  elseif obj == "objNormalEnd" or obj == 2 then
-    settings.objective.index = 2
-  elseif obj == "objAllBosses" or obj == 3 then
-    settings.objective.index = 4
-  elseif obj == "obj100Percent" or obj == 4 then
-    settings.objective.index = 5
-  else
-    settings.objective.index = 3
-  end
-  settings.objective.value = "override"
-end
-
-function C:loadSeed(seed)
-  if seed ~= nil then
-    settings.customseed.value = seed or ""
-    settings.seedselect.value = true
-    settings.seedrandom.value = false
-  end
-end
-
-function C:loadMyChar(mychar)
-  local mc = music.mychar
-  if type(mychar) == "number" then
-    mc.index = mychar
-  elseif mychar == "assets/myChar/Quote.bmp" then
-    mc.index = 1
-  elseif mychar == "assets/myChar/Curly.bmp" then
-    mc.index = 2
-  elseif mychar == "assets/myChar/Sue.bmp" then
-    mc.index = 3
-  elseif mychar == "assets/myChar/Toroko.bmp" then
-    mc.index = 4
-  elseif mychar == "assets/myChar/King.bmp" then
-    mc.index = 5
-  elseif mychar == "assets/myChar/Chaco.bmp" then
-    mc.index = 6
-  elseif mychar == "assets/myChar/Kanpachi.bmp" then
-    mc.index = 7
-  elseif mychar == "assets/myChar/Misery.bmp" then
-    mc.index = 8
-  elseif mychar == "assets/myChar/Frog.bmp" then
-    mc.index = 9
-  end
-  mc.value = "override"
-end
-
-function C.numToMyChar(num)
-  local mychars = {
-    "assets/myChar/Quote.bmp",
-    "assets/myChar/Curly.bmp",
-    "assets/myChar/Sue.bmp",
-    "assets/myChar/Toroko.bmp",
-    "assets/myChar/King.bmp",
-    "assets/myChar/Chaco.bmp",
-    "assets/myChar/Kanpachi.bmp",
-    "assets/myChar/Misery.bmp",
-    "assets/myChar/Frog.bmp",
-  }
-  return mychars[num]
-end
-
-function C:loadSpawn(spawn)
-  if spawn == "Start Point" or spawn == 0 then
-    settings.spawn.index = 1
-  elseif spawn == "Arthur's House" or spawn == 1 then
-    settings.spawn.index = 2
-  elseif spawn == "Camp" or spawn == 2 then
-    settings.spawn.index = 3
-  end
-  settings.spawn.value = "override"
-end
-
-function C:loadSeqSettings(breaks, seq)
-  if breaks ~= nil then settings.seqbreak.value = breaks end
-  if breaks or breaks == nil then
-    sequence.cthulhu.value = seq.cthulhu
-    sequence.chaco.value = seq.chaco
-    sequence.paxChaco.value = seq.paxChaco
-    sequence.flightlessHut.value = seq.flightlessHut
-    sequence.camp.value = seq.camp
-    sequence.sisters.value = seq.sisters
-    sequence.plantation.value = seq.plantation
-    sequence.rocket.value = seq.rocket
-  end
-end
-
-function C:loadMusicSettings(shuffle, flavor, cs, beta, kero)
-  music.music.value = shuffle
-  music.cavestory.value = cs
-  music.beta.value = beta
-  music.kero.value = kero
-  if flavor == "Shuffle" or flavor == 1 then 
-    music.shuffle.value = true
-    music.random.value = false
-    music.chaos.value = false
-  end
-  if flavor == "Random" or flavor == 2 then 
-    music.shuffle.value = false
-    music.random.value = true 
-    music.chaos.value = false
-  end
-  if flavor == "Chaos" or flavor == 3 then 
-    music.shuffle.value = false
-    music.random.value = false
-    music.chaos.value = true
-  end
-end
-
-function C:loadNoFallingBlocks(noFallingBlocks)
-  settings.noFallingBlocks.value = noFallingBlocks
-end
-
-function C:loadCompleteableLogic(completableLogic)
-  settings.completable.value = not completableLogic
-end
-
-layout.version.text = 'Cave Story Randomizer v' .. VERSION
-layout.author.text  = 'by duncathan'
-layout.twitter.text = '(@duncathan_salt)'
-
-layout.linktext.text = 'Join our Discord server!'
-layout.footerlink:onEnter(function()
-  layout.linktext.color = {0.8,0.8,0.8} -- #CCCCCC
-  layout.linkicon.icon = 'assets/icon/linkgrey.png'
-end)
-layout.footerlink:onLeave(function()
-  layout.linktext.color = {1,1,1} -- #FFFFFF
-  layout.linkicon.icon = 'assets/icon/link.png'
-end)
-layout.footerlink:onPress(function()
-  love.system.openURL("https://discord.gg/7zUdPEn")
-end)
-
-layout.footershru.text = 'Original randomizer by @shruuu'
-
-layout.go:onPress(function()
-  Randomizer:new()
-
-  if Randomizer:ready() then
-    if settings.seedselect.value and settings.customseed.value ~= "" then
-      Randomizer.customseed = settings.customseed.value:gsub("^%s*(.-)%s*$", "%1") -- trim any leading/trailing whitespace
-    end
-
-    Randomizer.obj = settings.objective.value
-    Randomizer.puppy = settings.puppy.value
-    if music.mychar.value == "random" then
-      Randomizer.mychar = Screen.numToMyChar(love.math.random(9))
-    else
-      Randomizer.mychar = music.mychar.value
-    end
-    Randomizer.worldGraph.spawn = settings.spawn.value
-
-    Randomizer.worldGraph.seqbreak = settings.seqbreak.value
-    Randomizer.worldGraph.dboosts.cthulhu.enabled = sequence.cthulhu.value
-    Randomizer.worldGraph.dboosts.chaco.enabled = sequence.chaco.value
-    Randomizer.worldGraph.dboosts.paxChaco.enabled = sequence.paxChaco.value
-    Randomizer.worldGraph.dboosts.flightlessHut.enabled = sequence.flightlessHut.value
-    Randomizer.worldGraph.dboosts.camp.enabled = sequence.camp.value
-    Randomizer.worldGraph.dboosts.sisters.enabled = sequence.sisters.value
-    Randomizer.worldGraph.dboosts.plantation.enabled = sequence.plantation.value
-    Randomizer.worldGraph.dboosts.rocket.enabled = sequence.rocket.value
-
-    Randomizer.shuffleMusic = music.music.value
-    Randomizer.music.vanillaEnabled = music.cavestory.value
-    Randomizer.music.betaEnabled = music.beta.value
-    Randomizer.music.keroEnabled = music.kero.value
-    if music.shuffle.value then Randomizer.music.flavor = "Shuffle" end
-    if music.random.value then Randomizer.music.flavor = "Random" end
-    if music.chaos.value then Randomizer.music.flavor = "Chaos" end
-
-    Randomizer.worldGraph.noFallingBlocks = settings.noFallingBlocks.value
-    Randomizer.completableLogic = not settings.completable.value
-
-    C:setStatus(Randomizer:randomize())
-
-    layout.sharecode.text = "Copy Sharecode"
-  else
-    C:setStatus("No Cave Story folder found!\r\nDrag and drop your Cave Story folder here.")
-  end
-end)
-
-layout.settings:onPress(function()
-  settings:show()
-  layout:hide()
-end)
-
-settings.closeButton:onPress(function()
-  settings:hide()
-  layout:show()
-  settings.sharecode.value = ""
-end)
-
-settings.seqButton:onPress(function()
-  sequence:show()
-  settings:hide()
-end)
-
-settings.musicButton:onPress(function()
-  music:show()
-  settings:hide()
-end)
-
-sequence.allOn:onPress(function()
-  Screen:loadSeqSettings(nil, _.map(Settings.settings.dboosts, function(k,v) return true end))
-end)
-
-sequence.allOff:onPress(function()
-  Screen:loadSeqSettings(nil, _.map(Settings.settings.dboosts, function(k,v) return false end))
-end)
-
-sequence.close:onPress(function()
-  sequence:hide()
-  settings:show()
-end)
-
-music.close:onPress(function()
-  music:hide()
-  settings:show()
-end)
-
-layout.sharecode:onPress(function()
-  if Randomizer.sharecode ~= "" then
-    love.system.setClipboardText(Randomizer.sharecode)
-    layout.sharecode.text = "Copied!"
-  end
-end)
-
-settings.customseed:onChange(function()
-  if #settings.customseed.value > 20 then
-    local str = settings.customseed.value:sub(1, 20)
-    local length, invalidPos = utf8.len(str)
-    if not length then -- produced invalid sequence, need to adjust
-      str = str:sub(1, invalidPos - 1)
-    end
-    settings.customseed.value = str
-  end
-  settings.seedcount.text = ("%s/20"):format(#settings.customseed.value)
-end)
-
-settings.importshare:onPress(function()
-  local success, seed, sharesettings, seq = pcall(function()
-    local packed = love.data.decode("data", "base64", settings.sharecode.value)
-    local seed, settings, seq = love.data.unpack("<s1I2B", packed)
-    assert(#seed == 20)
-    return seed, settings, seq
-  end)
-
-  if success then 
-    settings.importshare.text = "Sharecode Imported"
-    Screen:loadPuppy(bit.band(sharesettings, 1) ~= 0) -- settings & 0b000000001
-    Screen:loadObjective(bit.brshift(bit.band(sharesettings, 14), 1)) -- (settings & 0b000001110) >> 1
-    Screen:loadSpawn(bit.brshift(bit.band(sharesettings, 112), 4)) -- (settings & 0b001110000) >> 4
-    Screen:loadSeed(seed:gsub("^%s*(.-)%s*$", "%1")) -- trim any leading or trailing whitespace
-    Screen:loadSeqSettings(bit.band(sharesettings, 128) ~= 0, { -- (settings & 0b010000000)
-      cthulhu = bit.band(seq, 1) ~= 0,
-      chaco = bit.band(seq, 2) ~= 0,
-      paxChaco = bit.band(seq, 4) ~= 0,
-      flightlessHut = bit.band(seq, 8) ~= 0,
-      camp = bit.band(seq, 16) ~= 0,
-      sisters = bit.band(seq, 32) ~= 0,
-      plantation = bit.band(seq, 64) ~= 0,
-      rocket = bit.band(seq, 128) ~= 0
-    })
-    Screen:loadNoFallingBlocks(bit.band(sharesettings, 256) ~= 0) -- (settings & 0b100000000)
-    Screen:loadCompleteableLogic(bit.band(sharesettings, 512) ~= 0) -- (settings & 0b1000000000)
-  else
-    settings.importshare.text = "Invalid Sharecode!"
-  end
-end)
-
-settings.sharecode:onChange(function()
-  settings.importshare.text = "Import Sharecode"
-end)
-
-function C:draw()
-  lg.draw(background, 0, 0)
-  --layout:show()
-end
-
-function C:setStatus(text)
-  layout.status.text = text
-end
-
-return C
diff --git a/src/ui/main.lua b/src/ui/main.lua
deleted file mode 100644
index 50c0a87..0000000
--- a/src/ui/main.lua
+++ /dev/null
@@ -1,78 +0,0 @@
-return { id = 'window',
-  { flow = 'y',
-    {
-      type = 'panel',
-      id = 'header',
-      height = 100,
-      style = 'transpanel',
-      align = 'top center',
-      { height = 10 },
-      { id = 'version', text = "" },
-      { id = 'author', text = ""  },
-      { id = 'twitter', text = "" },
-      { height = 10 }
-    },
-    {
-      type = 'panel',
-      id = 'status',
-      height = 260,
-      style = 'transpanel',
-      align = 'top center',
-      margin = 24,
-      wrap = true,
-    },
-    { 
-      flow = 'x',
-      height = '40',
-      { width = false },
-      {
-        type = 'button',
-        style = 'button',
-        id = 'settings',
-        text = 'Settings',
-        width = 100,
-        height = 32,
-      },
-      {
-        type = 'button',
-        style = 'button',
-        id = 'go',
-        text = 'Randomize!',
-        width = 100,
-        height = 32,
-      },
-      {
-        type = 'button',
-        style = 'button',
-        id = 'sharecode',
-        text = "Copy Sharecode",
-        width = 100,
-        height = 32,
-      },
-      { width = false }
-    },
-    {
-      flow = 'x',
-      height = 120,
-      { width = 20 },
-      {
-        {
-          type = 'panel',
-          id = 'footershru',
-          height = 32,
-          style = 'transpanel',
-          align = 'top left'
-        },
-        { flow = 'x', 
-          type = 'panel',
-          id = 'footerlink',
-          height = 32,
-          style = 'transpanel',
-          align = 'top left',
-          { id = 'linktext', width = 310, icon = 'assets/icon/discord.png' },
-          { id = 'linkicon', icon = 'assets/icon/link.png'}
-        },
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/ui/music.lua b/src/ui/music.lua
deleted file mode 100644
index 882e138..0000000
--- a/src/ui/music.lua
+++ /dev/null
@@ -1,65 +0,0 @@
-return { style = 'dialog',
-  { style = 'dialogHead', text = 'Personal Settings' },
-  { style = 'dialogBody', padding = 24, flow = 'x',
-    {
-      { type = 'check', value = false, id = 'music', text = "Randomize music", minheight = 32, width = 170},
-      { type = 'label', text = 'Type of randomization' },
-      { type = 'radio', group = 'flavor', text = 'Shuffle', id = 'shuffle', minheight = 27, status = "Remap every song to a new song. For example, all instances of Mischievous Robot become Pulse. Songs may remap to themselves." },
-      { type = 'radio', group = 'flavor', text = 'Random', id = 'random', minheight = 27, status = "Remap every cue to a new song. For example, entering the Egg Corridor by any means plays Meltdown 2." },
-      { type = 'radio', group = 'flavor', text = 'Chaos', id = 'chaos', minheight = 27, status = "Remap every <CMU to a new song. For example, teleporting to the Egg Corridor plays Charge, but entering Egg Corridor from Cthulhu's Abode plays Run!" },
-      { type = 'label', text = 'Enabled music' },
-      --[[ individual toggles is a lot of work actually
-      { type = 'panel', id = 'musicToggles', scroll = true, 
-        { type = 'check', id = 'mischievousRobot', value = true, text = 'Mischievous Robot', minheight = 27},
-        { type = 'check', id = 'safety', value = true, text = 'Safety', minheight = 27},
-        { type = 'check', id = 'gravity', value = true, text = 'Gravity', minheight = 27},
-        { type = 'check', id = 'onToGrasstown', value = true, text = 'On to Grasstown', minheight = 27},
-        { type = 'check', id = 'meltdown', value = true, text = 'Meltdown 2', minheight = 27},
-        { type = 'check', id = 'eyesOfFlame', value = true, text = 'Eyes of Flame', minheight = 27},
-        { type = 'check', id = 'gestation', value = true, text = 'Gestation', minheight = 27},
-        { type = 'check', id = 'mimigaTown', value = true, text = 'Mimiga Town', minheight = 27},
-        { type = 'check', id = 'balrogsTheme', value = true, text = "Balrog's Theme", minheight = 27},
-        { type = 'check', id = 'cemetary', value = true, text = 'Cemetary', minheight = 27},
-        { type = 'check', id = 'plant', value = true, text = 'Plant', minheight = 27},
-        { type = 'check', id = 'pulse', value = true, text = 'Pulse', minheight = 27},
-        { type = 'check', id = 'tyrant', value = true, text = 'Tyrant', minheight = 27},
-        { type = 'check', id = 'run', value = true, text = 'Run!', minheight = 27},
-        { type = 'check', id = 'jenka1', value = true, text = 'Jenka 1', minheight = 27},
-        { type = 'check', id = 'labyrinthFight', value = true, text = 'Labyrinth Fight', minheight = 27},
-        { type = 'check', id = 'access', value = true, text = 'Access', minheight = 27},
-        { type = 'check', id = 'oppression', value = true, text = 'Oppression', minheight = 27},
-        { type = 'check', id = 'geothermal', value = true, text = 'Geothermal', minheight = 27},
-        { type = 'check', id = 'caveStory', value = true, text = 'Cave Story', minheight = 27},
-        { type = 'check', id = 'moonsong', value = true, text = 'Moonsong', minheight = 27},
-      }
-      ]]
-      { type = 'check', id = 'cavestory', value = true, text = 'Enable Cave Story music', minheight = 27 },
-      { type = 'check', id = 'beta', value = false, text = 'Enable beta music', minheight = 27, status = "Only compatible with the included Doukutsu.exe - no other platforms." },
-      { type = 'check', id = 'kero', value = false, text = 'Enable Kero Blaster music', minheight = 27, status = "Only compatible with the included Doukutsu.exe - no other platforms." },
-    },
-    { type = 'sash' },
-    {
-      width = 275,
-      { type = 'label', text = 'Player Sprite', minheight = 32 },
-      { type = 'stepper', id = 'mychar', align = 'middle left', height = 48, width = 200,
-        { text = "  Quote", value = "assets/myChar/Quote.bmp", icon = "assets/icon/Quote.png" },
-        { text = "  Curly", value = "assets/myChar/Curly.bmp", icon = "assets/icon/Curly.png" },
-        { text = "  Sue", value = "assets/myChar/Sue.bmp", icon = "assets/icon/Sue.png" },
-        { text = "  Toroko", value = "assets/myChar/Toroko.bmp", icon = "assets/icon/Toroko.png" },
-        { text = "  King", value = "assets/myChar/King.bmp", icon = "assets/icon/King.png" },
-        { text = "  Chaco", value = "assets/myChar/Chaco.bmp", icon = "assets/icon/Chaco.png" },
-        { text = "  Kanpachi", value = "assets/myChar/Kanpachi.bmp", icon = "assets/icon/Kanpachi.png" },
-        { text = "  Misery", value = "assets/myChar/Misery.bmp", icon = "assets/icon/Misery.png" },
-        { text = "  Frog", value = "assets/myChar/Frog.bmp", icon = "assets/icon/Frog.png" },
-        { text = "  Random", value = "random", icon = "assets/icon/Random.png", status = "Choose a random sprite each time you randomize." },
-        { text = "  Custom", value = false, icon = "assets/icon/Custom.png", status = "Use your own mychar.bmp! Place it in the main data folder." },
-      },
-      { type = 'sash' },
-      { type = 'status', wrap = true, height = false, },
-    },
-  },
-  { style = 'dialogFoot',
-    {},
-    { style = 'dialogButton', id = 'close', text = 'Close' }
-  }
-}
\ No newline at end of file
diff --git a/src/ui/sequence.lua b/src/ui/sequence.lua
deleted file mode 100644
index 899aa80..0000000
--- a/src/ui/sequence.lua
+++ /dev/null
@@ -1,19 +0,0 @@
-return { style = 'dialog',
-  { style = 'dialogHead', text = 'Sequence Break Settings'},
-  { style = 'dialogBody', padding = 24,
-    { type = 'check', value = true, id = 'cthulhu', text = "Cthulhu's Abode (requires 3HP)", minheight = 27 },
-    { type = 'check', value = true, id = 'chaco', text = "Chaco Skip (requires 5HP)", minheight = 27 },
-    { type = 'check', value = true, id = 'paxChaco', text = "Chaco Skip without a weapon (requires 10HP)", minheight = 27 },
-    { type = 'check', value = true, id = 'flightlessHut', text = "Flightless Grasstown Hut (requires 3HP)", minheight = 27 },
-    { type = 'check', value = true, id = 'camp', text = "Flightless Camp Chest (requires 9HP)", minheight = 27 },
-    { type = 'check', value = true, id = 'sisters', text = "Sisters Skip (requires flight)", minheight = 27 },
-    { type = 'check', value = true, id = 'plantation', text = "Flightless Plantation Chest (requires 15HP)", minheight = 27 },
-    { type = 'check', value = true, id = 'rocket', text = "Rocket Skip (requires 3HP, Machine Gun, and Booster 2.0)", minheight = 27 },
-  },
-  { style = 'dialogFoot',
-    {},
-    { style = 'dialogButton', id = 'allOn', text = 'All On' },
-    { style = 'dialogButton', id = 'allOff', text = 'All Off' },
-    { style = 'dialogButton', id = 'close', text = 'Close' }
-  }
-}
\ No newline at end of file
diff --git a/src/ui/settings.lua b/src/ui/settings.lua
deleted file mode 100644
index 4d36e1b..0000000
--- a/src/ui/settings.lua
+++ /dev/null
@@ -1,56 +0,0 @@
-return { style = 'dialog',
-  { style = 'dialogHead', text = 'Settings' },
-  { style = 'dialogBody', padding = 24,
-    { flow = 'x', minheight = 260,
-      {
-        { type = 'label', text = 'Seed', minheight = 32 },
-        {
-          { type = 'radio', group = 'seed', text = 'Use random seed', value = true, id = 'seedrandom', minheight = 27 },
-          { flow = 'y', { type = 'radio', group = 'seed', text = 'Use custom seed', id = 'seedselect', minheight = 27 }, 
-            {
-              flow = 'x',
-              { type = 'text', id = 'customseed', width = 200, minheight = 32},
-              { type = 'label', id = 'seedcount' }
-            }
-          }
-        },
-        { type = 'label', text = 'Randomization Options', minheight = 32 },
-        { type = 'check', value = false, id = 'puppy', text = "Puppies outside Sand Zone", minheight = 27 },
-        { type = 'check', value = true, id = 'completable', text = "Guarantee access to all locations", minheight = 54},
-        { flow = 'x', height = 32,
-          { type = 'check', value = false, id = 'seqbreak', text = "Sequence breaks", minheight = 32, width =  170},
-          { type = 'button', style = 'dialogButton', text = "Modify", id = 'seqButton', width = 70, align = 'center' },
-          { width = false }
-        },
-      },
-      {
-        { type = 'label', text = 'Objective', minheight = 32 },
-        { type = 'stepper', id = 'objective', align = 'center', width = 200,
-          { text = "Bad ending", value = "objBadEnd" },
-          { text = "Normal ending", value = "objNormalEnd" },
-          { text = "Best ending", value = "objBestEnd" },
-          { text = "All bosses", value = "objAllBosses" },
-          { text = "100%", value = "obj100Percent" }
-        },
-        { type = 'label', text = 'Spawn Location', minheight = 32 },
-        { type = 'stepper', id = 'spawn', align = 'middle left', height = 48, width = 200,
-          { text = "  Start\r\n  Point", value = "Start Point", icon = "assets/icon/StartPoint2.png" },
-          { text = "  Arthur's\r\n  House", value = "Arthur's House", icon = "assets/icon/Arthur2.png" },
-          { text = "  Camp", value = "Camp", icon = "assets/icon/Camp.png" }
-        },
-        { type = 'button', style = 'dialogButton', text = "Personal Settings", id = 'musicButton', width = 200, height = 48, align = 'center' },
-        { type = 'check', value = false, id = 'noFallingBlocks', text = "No Falling Blocks in Hell", minheight = 32 },
-      },
-    },
-    {
-      flow = 'x',
-      { type = 'text', id = 'sharecode', width = 350 },
-      { type = 'button', style = 'dialogButton', text = "Import Sharecode", id = 'importshare', width = 180, align = 'center' }
-    }
-  },
-  { style = 'dialogFoot',
-    {},
-    { style = 'dialogButton', id = 'randoButton', text = 'Random Settings',  width = 120 },
-    { style = 'dialogButton', id = 'closeButton', text = 'Close' }
-  }
-}
\ No newline at end of file
diff --git a/src/ui/style.lua b/src/ui/style.lua
deleted file mode 100644
index 241d489..0000000
--- a/src/ui/style.lua
+++ /dev/null
@@ -1,43 +0,0 @@
-return {
-  transpanel = {
-    background = {0,0,0,0},
-    font = 'assets/monogram_extended.ttf',
-    size = 32,
-    color = {1,1,1},
-  },
-  button = {
-    align = 'center middle',
-    size = 16,
-    font = 'assets/monogram_extended.ttf'
-  },
-   -- dialog styles
-   dialog = {
-    type = 'submenu',
-    width = 600,
-    height = 400,
-  },
-  dialogHead = {
-    align = 'middle center',
-    height = 36,
-    size = 16,
-    type = 'panel',
-  },
-  dialogBody = {
-    align = 'left middle',
-    font = 'assets/monogram_extended.ttf',
-    size = 24,
-    padding = 4,
-    wrap = true,
-  },
-  dialogFoot = {
-    flow = 'x',
-    height = 'auto',
-    type = 'panel',
-  },
-  dialogButton = {
-    type = 'button',
-    font = 'assets/monogram_extended.ttf',
-    size = 16,
-    width = 100,
-  }
-}
\ No newline at end of file
diff --git a/src/util.lua b/src/util.lua
deleted file mode 100644
index 81b0470..0000000
--- a/src/util.lua
+++ /dev/null
@@ -1,28 +0,0 @@
-local U = {}
-
--- https://www.lua.org/manual/5.1/manual.html#5.7
--- w+: Update mode, all previous data is erased;
--- b:  Binary mode, forces Windows to save with Unix endings.
-MODE_WRITE_ERASE_EXISTING = 'w+b'
-
-function U.writeFile(path, data)
-  logDebug('writing file: ' .. path)
-
-  local file, err = io.open(path, MODE_WRITE_ERASE_EXISTING)
-  assert(err == nil, err)
-  file:write(data)
-  file:flush()
-  file:close()
-end
-
-function U.eraseFile(path)
-  logDebug('erasing file: ' .. path)
-
-  local file, err = io.open(path, 'r')
-  if file ~= nil then
-    io.close(file)
-    os.remove(path)
-  end
-end
-
-return U