diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..7b09fd9
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "libs"]
+	path = libs
+	url = git@github.com:TheAMM/mpv_script_libs.git
diff --git a/README.md b/README.md
index 2b9270e..89984d9 100644
--- a/README.md
+++ b/README.md
@@ -130,7 +130,7 @@ Tricky examples of the property expansion:
 | Name | Type | Notes |
 | ---- | ---- | ----- |
 | `filename` | `string` | Original filename with the extension stripped off |
-| `file_ext` | `string` | Original extension, dot included |
+| `file_ext` | `string` | Original extension, without leading dot |
 | `path` | `string` | full source path - may be a network path, so beware |
 | `pos` | `number` | Current playback position (float), format it with `${#pos:TIMEFORMAT}`! |
 | `unique` | `number` | A sequence number. The script will choose the first available filename, starting with `unique` as 1 and counting up. Use with `${%...}` |
@@ -146,6 +146,8 @@ Tricky examples of the property expansion:
 
 ## Development
 
+This project uses git submodules. After cloning (or fetching updates), run `git submodule update --init` to update the `libs` submodule, which contains parts most of my scripts share and use.
+
 Included in the repository is the `concat_files.py` tool I use for automatically concatenating files upon their change, and also mapping changes to the output file back to the source files. It's really handy on stack traces when mpv gives you a line and column on the output file - no need to hunt down the right place in the source files!
 
 The script requires Python 3, so install that. Nothing more, though. Call it with `concat_files.py concat.json`.
diff --git a/concat.json b/concat.json
index 3423c5e..481dd43 100644
--- a/concat.json
+++ b/concat.json
@@ -4,12 +4,12 @@
 	"files" : [
 		"src/license_blurb.lua",
 		"<version>",
-		"src/helpers.lua",
-		"src/option_parser.lua",
+		"libs/helpers.lua",
+		"libs/option_parser.lua",
 		"src/options.lua",
-		"src/display_state.lua",
-		"src/asscropper.lua",
-		"src/property_expander.lua",
+		"libs/display_state.lua",
+		"libs/asscropper.lua",
+		"libs/property_expander.lua",
 		"src/main.lua"
 	],
 
diff --git a/libs b/libs
new file mode 160000
index 0000000..ce75339
--- /dev/null
+++ b/libs
@@ -0,0 +1 @@
+Subproject commit ce753395bb74d5b0f1e01329d12ee6abc950f69b
diff --git a/src/asscropper.lua b/src/asscropper.lua
deleted file mode 100644
index f3afd58..0000000
--- a/src/asscropper.lua
+++ /dev/null
@@ -1,978 +0,0 @@
-local ASSCropper = {}
-ASSCropper.__index = ASSCropper
-
-setmetatable(ASSCropper, {
-  __call = function (cls, ...) return cls.new(...) end
-})
-
-function ASSCropper.new(display_state)
-  local self = setmetatable({}, ASSCropper)
-  local script_name = mp.get_script_name()
-  self.keybind_group = script_name .. "_asscropper_binds"
-  self.cropdetect_label = script_name .. "_asscropper_cropdetect"
-  self.blackframe_label = script_name .. "_asscropper_blackframe"
-
-  self.display_state = display_state
-
-  self.tick_callback = nil
-  self.tick_timer = mp.add_periodic_timer(1/60, function()
-    if self.tick_callback then self.tick_callback() end
-  end)
-  self.tick_timer:stop()
-
-  self.text_size = 18
-
-  self.overlay_transparency = 160
-  self.overlay_lightness = 0
-
-  self.corner_size = 40
-  self.corner_required_size = self.corner_size * 3
-
-  self.guide_type_names = {
-    [0] = "No guides",
-    [1] = "Grid guides",
-    [2] = "Center guides"
-  }
-  self.guide_type_count = 3
-
-  self.default_options = {
-    even_dimensions = false,
-    guide_type = 0,
-    draw_mouse = false,
-    draw_help = true,
-    color_invert = false,
-    auto_invert = false,
-  }
-  self.options = default_options
-
-  self.active = false
-
-  self.mouse_screen = {x=0, y=0}
-  self.mouse_video  = {x=0, y=0}
-
-  -- Crop in video-space
-  self.current_crop = nil
-
-  self.dragging = 0
-  self.drag_start = {x=0, y=0}
-  self.restrict_ratio = false
-
-  self.detecting_crop = nil
-  self.cropdetect_wait = nil
-  self.cropdetect_timeout = nil
-
-  self.detecting_blackframe = nil
-  self.blackframe_wait = nil
-  self.blackframe_timeout = nil
-
-  local listeners = {
-    {"mouse_move", function()  self:update_mouse_position() end },
-    {"mouse_btn0", function(e) self:on_mouse("mouse_btn0", false) end, function(e) self:on_mouse("mouse_btn0", true) end},
-    {"shift+mouse_btn0", function(e) self:on_mouse("mouse_btn0", false, true) end, function(e) self:on_mouse("mouse_btn0", true, true) end},
-    {"c", function() self:key_event("CROSSHAIR") end },
-    {"d", function() self:key_event("CROP_DETECT") end },
-    {"x", function() self:key_event("GUIDES") end },
-    {"z", function() self:key_event("INVERT") end },
-    {"ENTER", function() self:key_event("ENTER") end },
-    {"ESC", function() self:key_event("ESC") end }
-  }
-  mp.set_key_bindings(listeners, self.keybind_group, "force")
-  self:disable_key_bindings()
-
-  return self
-end
-
-function ASSCropper:enable_key_bindings()
-  mp.enable_key_bindings(self.keybind_group)
-end
-
-function ASSCropper:disable_key_bindings()
-  mp.disable_key_bindings(self.keybind_group)
-end
-
-
-function ASSCropper:finalize_crop()
-  if self.current_crop ~= nil then
-    local x1, x2 = self.current_crop[1].x, self.current_crop[2].x
-    local y1, y2 = self.current_crop[1].y, self.current_crop[2].y
-
-    self.current_crop.x, self.current_crop.y = x1, y1
-    self.current_crop.w, self.current_crop.h = x2 - x1, y2 -y1
-
-    self.current_crop.x1, self.current_crop.x2 = x1, x2
-    self.current_crop.y1, self.current_crop.y2 = y1, y2
-  end
-end
-
-
-function ASSCropper:key_event(name)
-  if name == "ENTER" then
-    self:stop_crop(false)
-
-    self:finalize_crop()
-
-    if self.callback_on_crop == nil then
-      mp.set_osd_ass(0,0, "")
-    else
-      self.callback_on_crop(self.current_crop)
-    end
-
-  elseif name == "ESC" then
-    self:stop_crop(true)
-
-    if self.callback_on_cancel == nil then
-      mp.set_osd_ass(0,0, "")
-    else
-      self.callback_on_cancel()
-    end
-
-  elseif name == "CROP_DETECT" then
-    self:toggle_crop_detect()
-
-  elseif name == "CROSSHAIR" then
-    self.options.draw_mouse = not self.options.draw_mouse;
-  elseif name == "INVERT" then
-    self.options.color_invert = not self.options.color_invert;
-  elseif name == "GUIDES" then
-    self.options.guide_type = (self.options.guide_type + 1) % (self.guide_type_count)
-    mp.osd_message(self.guide_type_names[self.options.guide_type])
-  end
-end
-
-function ASSCropper:blackframe_stop()
-  if self.detecting_blackframe then
-    self.detecting_blackframe:stop()
-    self.detecting_blackframe = nil
-
-    local filters = mp.get_property_native("vf")
-    for i, filter in ipairs(filters) do
-      if filter.label == self.blackframe_label then
-        table.remove(filters, i)
-      end
-    end
-    mp.set_property_native("vf", filters)
-  end
-
-end
-
-function ASSCropper:blackframe_check()
-  local blackframe_metadata = mp.get_property_native("vf-metadata/" .. self.blackframe_label)
-  local black_percentage = tonumber(blackframe_metadata["lavfi.blackframe.pblack"])
-
-  local now = mp.get_time()
-  if black_percentage ~= nil and now >= self.blackframe_wait then
-    self:blackframe_stop()
-
-    self.options.color_invert = black_percentage < 50
-  elseif now > self.blackframe_timeout then
-    -- Couldn't get blackframe metadata in time!
-    self:blackframe_stop()
-  end
-end
-
-function ASSCropper:blackframe_start()
-  self:blackframe_stop()
-  if not self.detecting_blackframe then
-
-    local blackframe_filter = ('@%s:blackframe=amount=%d:threshold=%d'):format(self.blackframe_label, 0, 128)
-
-    local ret = mp.commandv('vf', 'add', blackframe_filter)
-    if ret then
-      self.blackframe_wait =  mp.get_time() + 0.15
-      self.blackframe_timeout =  self.blackframe_wait + 1
-
-      self.detecting_blackframe = mp.add_periodic_timer(1/10, function()
-        self:blackframe_check()
-      end)
-    end
-  end
-end
-
-function ASSCropper:cropdetect_stop()
-  if self.detecting_crop then
-    self.detecting_crop:stop()
-    self.detecting_crop = nil
-    self.cropdetect_wait = nil
-    self.cropdetect_timeout = nil
-
-    local filters = mp.get_property_native("vf")
-    for i, filter in ipairs(filters) do
-      if filter.label == self.cropdetect_label then
-        table.remove(filters, i)
-      end
-    end
-    mp.set_property_native("vf", filters)
-  end
-
-end
-
-function ASSCropper:cropdetect_check()
-  local cropdetect_metadata = mp.get_property_native("vf-metadata/" .. self.cropdetect_label)
-  local get_n = function(s) return tonumber(cropdetect_metadata["lavfi.cropdetect." .. s]) end
-
-  local now = mp.get_time()
-  if not isempty(cropdetect_metadata) and now >= self.cropdetect_wait then
-    self:cropdetect_stop()
-
-    self.current_crop = {
-      {x=get_n("x1"), y=get_n("y1")},
-      {x=get_n("x2")+1, y=get_n("y2")+1},
-    }
-
-    mp.osd_message("Crop detected")
-  elseif now > self.cropdetect_timeout then
-    mp.osd_message("Crop detect timed out")
-    self:cropdetect_stop()
-  end
-end
-
-function ASSCropper:toggle_crop_detect()
-  if self.detecting_crop then
-    self:cropdetect_stop()
-    mp.osd_message("Cancelled crop detect")
-
-  else
-    -- local cropdetect_filter = ('@%s:cropdetect=limit=%f:round=2:reset=0'):format(self.cropdetect_label, 30/255)
-    local cropdetect_filter = ('@%s:cropdetect=limit=%f:round=2:reset=0'):format(self.cropdetect_label, 30/255)
-
-    local ret = mp.commandv('vf', 'add', cropdetect_filter)
-    if not ret then
-      mp.osd_message("Crop detect failed")
-    else
-      self.cropdetect_wait = mp.get_time() + 0.2
-      self.cropdetect_timeout = self.cropdetect_wait + 1.5
-
-      mp.osd_message("Starting automatic crop detect")
-      self.detecting_crop = mp.add_periodic_timer(1/10, function()
-        self:cropdetect_check()
-      end)
-    end
-  end
-end
-
-
-function ASSCropper:start_crop(options, on_crop, on_cancel)
-  -- Refresh display state
-  self.display_state:recalculate_bounds(true)
-  if self.display_state.video_ready then
-    self.active = true
-    self.tick_timer:resume()
-
-    self.options = {}
-
-    for k, v in pairs(self.default_options) do
-      self.options[k] = v
-    end
-    for k, v in pairs(options or {}) do
-      self.options[k] = v
-    end
-
-    self.callback_on_crop = on_crop
-    self.callback_on_cancel = on_cancel
-
-    self.dragging = 0
-
-    self:enable_key_bindings()
-    self:update_mouse_position()
-
-    if self.options.auto_invert then
-      self:blackframe_start()
-    end
-  end
-end
-
-function ASSCropper:stop_crop(clear)
-  self.active = false
-  self.tick_timer:stop()
-
-  self:cropdetect_stop()
-  self:blackframe_stop()
-
-  self:disable_key_bindings()
-  if clear then
-    self.current_crop = nil
-  end
-end
-
-
-function ASSCropper:on_tick()
-  -- Unused, for debugging
-  if self.active then
-    self.display_state:recalculate_bounds()
-    self:render()
-  end
-end
-
-
-function ASSCropper:update_mouse_position()
-  -- These are real on-screen coords.
-  self.mouse_screen.x, self.mouse_screen.y = mp.get_mouse_pos()
-
-  if self.display_state:recalculate_bounds() and self.display_state.video_ready then
-    -- These are on-video coords.
-    local mx, my = self.display_state:screen_to_video(self.mouse_screen.x, self.mouse_screen.y)
-    self.mouse_video.x = mx
-    self.mouse_video.y = my
-  end
-
-end
-
-
-function ASSCropper:get_hitboxes(crop_box)
-  crop_box = crop_box or self.current_crop
-  if crop_box == nil then
-    return nil
-  end
-
-  local x1, x2 = order_pair(crop_box[1].x, crop_box[2].x)
-  local y1, y2 = order_pair(crop_box[1].y, crop_box[2].y)
-  local w, h = math.abs(x2 - x1), math.abs(y2 - y1)
-
-  -- Corner and required corner size in videospace pixels
-  local mult = math.min(self.display_state.scale.x, self.display_state.scale.y)
-  local videospace_corner_size = self.corner_size * mult
-  local videospace_required_size = self.corner_required_size * mult
-
-  local handles_outside = (math.min(w, h) <= videospace_required_size)
-
-  local hitbox_bases = {
-    { x1, y2, x1, y2 }, -- BL
-    { x1, y2, x2, y2 }, -- B
-    { x2, y2, x2, y2 }, -- BR
-
-    { x1, y1, x1, y2 }, -- L
-    { x1, y1, x2, y2 }, -- Center
-    { x2, y1, x2, y2 }, -- R
-
-    { x1, y1, x1, y1 }, -- TL
-    { x1, y1, x2, y1 }, -- T
-    { x2, y1, x2, y1 }  -- TR
-  }
-
-  local hitbox_mults
-  if handles_outside then
-    hitbox_mults = {
-      {-1,  0,  0,  1},
-      { 0,  0,  0,  1},
-      { 0,  0,  1,  1},
-
-      {-1,  0,  0,  0},
-      { 0,  0,  0,  0},
-      { 0,  0,  1,  0},
-
-      {-1, -1,  0,  0},
-      { 0, -1,  0,  0},
-      { 0, -1,  1,  0}
-    }
-
-  else
-    hitbox_mults = {
-      { 0, -1,  1,  0},
-      { 1, -1, -1,  0},
-      {-1, -1,  0,  0},
-
-      { 0,  1,  1, -1},
-      { 1,  1, -1, -1},
-      {-1,  1,  0, -1},
-
-      { 0,  0,  1,  1},
-      { 1,  0, -1,  1},
-      {-1,  0,  0,  1}
-    }
-  end
-
-
-  local hitboxes = {}
-  for index, hitbox_base in ipairs(hitbox_bases) do
-    local hitbox_mult = hitbox_mults[index]
-
-    hitboxes[index] = {
-      hitbox_base[1] + hitbox_mult[1] * videospace_corner_size,
-      hitbox_base[2] + hitbox_mult[2] * videospace_corner_size,
-      hitbox_base[3] + hitbox_mult[3] * videospace_corner_size,
-      hitbox_base[4] + hitbox_mult[4] * videospace_corner_size
-    }
-  end
-  -- Pseudobox to easily pass the original crop box
-  hitboxes[10] = {x1, y1, x2, y2}
-
-  return hitboxes
-end
-
-
-function ASSCropper:hit_test(hitboxes, position)
-  if hitboxes == nil then
-    return 0
-
-  else
-    local px, py = position.x, position.y
-
-    for i = 1,9 do
-      local hb = hitboxes[i]
-
-      if (px >= hb[1] and px < hb[3]) and (py >= hb[2] and py < hb[4]) then
-        return i
-      end
-
-    end
-    -- No hits
-    return 0
-  end
-end
-
-
-function ASSCropper:on_mouse(button, mouse_down, shift_down)
-  mouse_down = mouse_down or false
-  shift_down = shift_down or false
-
-  if button == "mouse_btn0" and self.active and not self.detecting_crop then
-
-    local mouse_pos = {x=self.mouse_video.x, y=self.mouse_video.y}
-
-    -- Helpers
-    local xy_same = function(a, b) return a.x == b.x and a.y == b.y end
-    local xy_distance = function(a, b)
-      local dx = a.x - b.x
-      local dy = a.y - b.y
-      return math.sqrt( dx*dx + dy*dy )
-    end
-    --
-
-    if mouse_down then -- Mouse pressed
-
-      local bound_mouse_pos = {
-        x = math.max(0, math.min(self.display_state.video.width, mouse_pos.x)),
-        y = math.max(0, math.min(self.display_state.video.height, mouse_pos.y)),
-      }
-
-      if self.current_crop == nil then
-        self.current_crop = { bound_mouse_pos, bound_mouse_pos }
-
-        self.dragging = 3
-        self.anchor_pos = {bound_mouse_pos.x, bound_mouse_pos.y}
-
-        self.crop_ratio = 1
-        self.drag_start = bound_mouse_pos
-
-        local handle_pos = self:_get_anchor_positions()[hit]
-        self.drag_offset = {0, 0}
-
-        self.restrict_ratio = shift_down
-
-      elseif self.dragging == 0 then
-        -- Check if we drag from a handle
-        local hitboxes = self:get_hitboxes()
-        local hit = self:hit_test(hitboxes, mouse_pos)
-
-        self.dragging = hit
-        self.anchor_pos = self:_get_anchor_positions()[10 - hit]
-
-        self.crop_ratio = (hitboxes[10][3] - hitboxes[10][1]) / (hitboxes[10][4] - hitboxes[10][2])
-        self.drag_start = mouse_pos
-
-        local handle_pos = self:_get_anchor_positions()[hit] or {mouse_pos.x, mouse_pos.y}
-        self.drag_offset = { mouse_pos.x - handle_pos[1], mouse_pos.y - handle_pos[2]}
-
-        self.restrict_ratio = shift_down
-
-        -- Start a new drag if not on handle
-        if self.dragging == 0 then
-          self.current_crop = { bound_mouse_pos, bound_mouse_pos }
-          self.crop_ratio = 1
-
-          self.dragging = 3
-          self.anchor_pos = {bound_mouse_pos.x, bound_mouse_pos.y}
-          -- self.drag_start = mouse_pos
-        end
-      end
-
-    else -- Mouse released
-
-      if xy_same(self.current_crop[1], self.current_crop[2]) and xy_distance(self.current_crop[1], mouse_pos) < 5 then
-        -- Mouse released after first click - ignore
-
-      elseif self.dragging > 0 then
-        -- Adjust current crop
-        self.current_crop = self:offset_crop_by_drag()
-        self.dragging = 0
-      end
-    end
-
-  end
-end
-
-
-function ASSCropper:_get_anchor_positions()
-  local x1, y1 = self.current_crop[1].x, self.current_crop[1].y
-  local x2, y2 = self.current_crop[2].x, self.current_crop[2].y
-  return {
-    [1] = {x1, y2},
-    [2] = {(x1+x2)/2, y2},
-    [3] = {x2, y2},
-
-    [4] = {x1, (y1+y2)/2},
-    [5] = {(x1+x2)/2, (y1+y2)/2},
-    [6] = {x2, (y1+y2)/2},
-
-    [7] = {x1, y1},
-    [8] = {(x1+x2)/2, y1},
-    [9] = {x2, y1},
-  }
-end
-
-
-function ASSCropper:offset_crop_by_drag()
-  -- Here be dragons lol
-  local vw, vh = self.display_state.video.width, self.display_state.video.height
-  local mx, my = self.mouse_video.x, self.mouse_video.y
-
-  local x1, x2 = self.current_crop[1].x, self.current_crop[2].x
-  local y1, y2 = self.current_crop[1].y, self.current_crop[2].y
-
-  local anchor_positions = self:_get_anchor_positions()
-
-  local handle = self.dragging
-  if self.dragging > 0 then
-    local ax, ay = self.anchor_pos[1], self.anchor_pos[2]
-
-    local ox, oy = self.drag_offset[1], self.drag_offset[2]
-
-    local dx, dy = mx - ax - ox, my - ay - oy
-
-    -- Select active corner
-    if handle % 2 == 1 and handle ~= 5 then -- Change corners 4/6, 2/8
-      handle = (mx - ox < ax) and 1 or 3
-      handle = handle +  ( (my - oy < ay) and 6 or 0)
-    else -- Change edges 1, 3, 7, 9
-      if handle == 4 and mx - ox > ax then
-        handle = 6
-      elseif handle == 6 and mx - ox < ax then
-        handle = 4
-      elseif handle == 2 and my - oy < ay then
-        handle = 8
-      elseif handle == 8 and my - oy > ay then
-        handle = 2
-      end
-    end
-
-    -- Handle booleans for logic
-    local h_bot = handle >= 1 and handle <= 3
-    local h_top = handle >= 7 and handle <= 9
-    local h_left = (handle - 1) % 3 == 0
-    local h_right = handle % 3 == 0
-
-    local h_horiz = handle == 4 or handle == 6
-    local h_vert = handle == 2 or handle == 8
-
-    -- Keep rect aspect ratio
-    if self.restrict_ratio then
-      local adx, ady = math.abs(dx), math.abs(dy)
-
-      -- Fit rect to mouse
-      local tmpy = adx / self.crop_ratio
-      if tmpy < ady then
-        adx = ady * self.crop_ratio
-      else
-        ady = tmpy
-      end
-
-      -- Figure out max size for corners, limit adx/ady
-      local max_w, max_h = vw, vh
-
-      if h_bot then
-        max_h = vh - ay -- Max height is from anchor to video bottom
-      elseif h_top then
-        max_h = ay      -- Max height is from video bottom to anchor
-      elseif h_horiz then
-        -- Max height is closest edge * 2
-        max_h = math.min(vh - ay, ay) * 2
-      end
-
-      if h_left then
-        max_w = ax
-      elseif h_right then
-        max_w = vw - ax
-      elseif h_vert then
-        max_w = math.min(vw - ax, ax) * 2
-      end
-
-      -- Limit size to corners
-      if handle ~= 5 then
-        -- TODO this can be done tidier?
-
-        -- If wider than max width, scale down
-        if adx > max_w then
-          adx = max_w
-          ady = adx / self.crop_ratio
-        end
-        -- If taller than max height, scale down
-        if ady > max_h then
-          ady = max_h
-          adx = ady * self.crop_ratio
-        end
-      end
-
-      -- Hacky offsets
-      if handle == 1 then
-        dx = -adx
-        dy = ady
-      elseif handle == 2 then
-          dx = adx
-        dy = ady
-      elseif handle == 3 then
-        dx = adx
-        dy = ady
-
-      elseif handle == 4 then
-        dx = -adx
-          dy = ady
-      elseif handle == 5 then
-        -- pass
-      elseif handle == 6 then
-        dx = adx
-          dy = ady
-
-      elseif handle == 7 then
-        dy = -ady
-        dx = -adx
-      elseif handle == 8 then
-          dx = adx
-        dy = -ady
-      elseif handle == 9 then
-        dx = adx
-        dy = -ady
-      end
-    end
-
-    -- Can this be done not-manually?
-    -- Re-create the rect with some corners anchored etc
-    if handle == 5 then
-      -- Simply move the box around
-      x1, x2 = x1+dx, x2+dx
-      y1, y2 = y1+dy, y2+dy
-
-    elseif handle == 1 then
-      x1, x2 = ax + dx, ax
-      y1, y2 = ay, ay+dy
-
-    elseif handle == 2 then
-      y1, y2 = ay, ay + dy
-
-      if self.restrict_ratio then
-        x1, x2 = ax - dx/2, ax + dx/2
-      end
-
-    elseif handle == 3 then
-      x1, x2 = ax, ax + dx
-      y1, y2 = ay, ay + dy
-
-    elseif handle == 4 then
-      x1, x2 = ax + dx, ax
-
-      if self.restrict_ratio then
-        y1, y2 = ay - dy/2, ay + dy/2
-      end
-
-    elseif handle == 6 then
-      x1, x2 = ax, ax + dx
-
-      if self.restrict_ratio then
-        y1, y2 = ay - dy/2, ay + dy/2
-      end
-
-
-    elseif handle == 7 then
-      x1, x2 = ax + dx, ax
-      y1, y2 = ay + dy, ay
-
-    elseif handle == 8 then
-      y1, y2 = ay + dy, ay
-
-      if self.restrict_ratio then
-        x1, x2 = ax - dx/2, ax + dx/2
-      end
-
-    elseif handle == 9 then
-      x1, x2 = ax, ax + dx
-      y1, y2 = ay + dy, ay
-    end
-
-
-    if self.dragging == 5 then
-      -- On moving the entire box, we have to figure out how much to "offset" every corner if we go over the edge
-      local x_min = math.max(0, 0-x1)
-      local y_min = math.max(0, 0-y1)
-
-      local x_max = math.max(0, x2-vw)
-      local y_max = math.max(0, y2-vh)
-
-      x1 = x1 + x_min - x_max
-      y1 = y1 + y_min - y_max
-      x2 = x2 + x_min - x_max
-      y2 = y2 + y_min - y_max
-    elseif not self.restrict_ratio then
-      -- This is already done for restricted ratios, hence the if
-
-      -- Constrict the crop to video space
-      -- Since one corner/edge is moved at a time, we can just minmax this
-      x1, x2 = math.max(0, x1), math.min(vw, x2)
-      y1, y2 = math.max(0, y1), math.min(vh, y2)
-    end
-  end -- /drag
-
-  if self.dragging > 0 and self.options.even_dimensions then
-    local w, h = x2 - x1, y2 - y1
-    local even_w = w - (w % 2)
-    local even_h = h - (h % 2)
-
-    if handle == 1 or handle == 2 or handle == 3 then
-      y2 = y1 + even_h
-    elseif handle == 7 or handle == 8 or handle == 9 then
-      y1 = y2 - even_h
-    end
-    if handle == 1 or handle == 4 or handle == 7 then
-      x1 = x2 - even_w
-    elseif handle == 3 or handle == 6 or handle == 9 then
-      x2 = x1 + even_w
-    end
-  end
-
-  local fx1, fx2 = order_pair(math.floor(x1), math.floor(x2))
-  local fy1, fy2 = order_pair(math.floor(y1), math.floor(y2))
-
-  -- msg.info(fx1, fy1, fx2, fy2, handle)
-
-  return { {x=fx1, y=fy1}, {x=fx2, y=fy2} }, handle
-end
-
-
-function order_pair( a, b )
-  if a < b then
-    return a, b
-  else
-    return b, a
-  end
-end
-
-
-function ASSCropper:render()
-  -- For debugging
-  local ass_txt = self:get_render_ass()
-
-  local ds = self.display_state
-  mp.set_osd_ass(ds.screen.width, ds.screen.height, ass_txt)
-end
-
-
-function ASSCropper:get_render_ass(dim_only)
-  if not self.display_state.video_ready then
-    msg.info("No video info on display_state")
-    return ""
-  end
-
-  line_color = self.options.color_invert and 20 or 220
-  local guide_format = string.format("{\\3a&HFF&\\3a&H%02X&\\3c&H%02X%02X%02X&\\bord1}", 128, line_color, line_color, line_color)
-
-  ass = assdraw.ass_new()
-  if self.current_crop then
-    local temp_crop, drawn_handle = self:offset_crop_by_drag()
-    local v_hb = self:get_hitboxes(temp_crop)
-    -- Map coords to screen
-    local s_hb = {}
-    for index, coords in pairs(v_hb) do
-      local x1, y1 = self.display_state:video_to_screen(coords[1], coords[2])
-      local x2, y2 = self.display_state:video_to_screen(coords[3], coords[4])
-      s_hb[index] = {x1, y1, x2, y2}
-    end
-
-    -- Full crop
-    local v_crop = v_hb[10] -- Video-space
-    local s_crop = s_hb[10] -- Screen-space
-
-
-    -- Inverse clipping for the crop box
-    ass:new_event()
-    ass:append(string.format("{\\iclip(%d,%d,%d,%d)}", s_crop[1], s_crop[2], s_crop[3], s_crop[4]))
-
-    -- Dim overlay
-    local format_dim = string.format("{\\bord0\\1a&H%02X&\\1c&H%02X%02X%02X&}", self.overlay_transparency, self.overlay_lightness, self.overlay_lightness, self.overlay_lightness)
-    ass:pos(0,0)
-    ass:draw_start()
-    ass:append(format_dim)
-    ass:rect_cw(0, 0, self.display_state.screen.width, self.display_state.screen.height)
-    ass:draw_stop()
-
-    if dim_only then -- Early out with just the dim outline
-      return ass.text
-    end
-
-    if draw_text then
-      -- Text on end
-      ass:new_event()
-      ass:pos(ce_x, ce_y)
-      -- Text align
-      local txt_a = ((ce_x > cs_x) and 3 or 1) + ((ce_y > cs_y) and 0 or 6)
-      ass:an( txt_a )
-      ass:append("{\\fs20\\shad0\\be0\\bord2}")
-      ass:append(string.format("%dx%d", math.abs(ce_x-cs_x), math.abs(ce_y-cs_y)) )
-    end
-
-
-    local box_format = string.format("{\\1a&HFF&\\3a&H%02X&\\3c&H%02X%02X%02X&\\bord1}", 0, line_color, line_color, line_color)
-    local handle_hilight_format = string.format("{\\1a&H%02X&\\3a&H%02X&\\3c&H%02X%02X%02X&\\bord0}", 230, 0, line_color, line_color, line_color)
-    local handle_drag_format = string.format("{\\1a&H%02X&\\3a&H%02X&\\3c&H%02X%02X%02X&\\bord1}", 200, 0, line_color, line_color, line_color)
-
-    -- Main crop box
-    ass:new_event()
-    ass:pos(0,0)
-    ass:append( box_format )
-    ass:draw_start()
-    ass:rect_cw(s_crop[1], s_crop[2], s_crop[3], s_crop[4])
-    ass:draw_stop()
-
-    -- Guide grid, 3x3
-    if self.options.guide_type then
-      ass:new_event()
-      ass:pos(0,0)
-      ass:append( guide_format )
-      ass:draw_start()
-
-      local w = (s_crop[3] - s_crop[1])
-      local h = (s_crop[4] - s_crop[2])
-
-      local w_3rd = w / 3
-      local h_3rd = h / 3
-      local w_2 = w / 2
-      local h_2 = h / 2
-      if self.options.guide_type == 1 then
-        -- 3x3 grid
-        ass:move_to(s_crop[1] + w_3rd, s_crop[2])
-        ass:line_to(s_crop[1] + w_3rd, s_crop[4])
-
-        ass:move_to(s_crop[1] + w_3rd*2, s_crop[2])
-        ass:line_to(s_crop[1] + w_3rd*2, s_crop[4])
-
-        ass:move_to(s_crop[1], s_crop[2] + h_3rd)
-        ass:line_to(s_crop[3], s_crop[2] + h_3rd)
-
-        ass:move_to(s_crop[1], s_crop[2] + h_3rd*2)
-        ass:line_to(s_crop[3], s_crop[2] + h_3rd*2)
-
-      elseif self.options.guide_type == 2 then
-        -- Top to bottom
-        ass:move_to(s_crop[1] + w_2, s_crop[2])
-        ass:line_to(s_crop[1] + w_2, s_crop[4])
-
-        -- Left to right
-        ass:move_to(s_crop[1], s_crop[2] + h_2)
-        ass:line_to(s_crop[3], s_crop[2] + h_2)
-      end
-      ass:draw_stop()
-    end
-
-    if self.dragging > 0 and drawn_handle ~= 5 then
-      -- While dragging, draw only the dragging handle
-      ass:new_event()
-      ass:append( handle_drag_format )
-      ass:pos(0,0)
-      ass:draw_start()
-      ass:rect_cw(s_hb[drawn_handle][1], s_hb[drawn_handle][2], s_hb[drawn_handle][3], s_hb[drawn_handle][4])
-      ass:draw_stop()
-    elseif self.dragging == 0 then
-      local hit_index = self:hit_test(s_hb, self.mouse_screen)
-      if hit_index > 0 and hit_index ~= 5 then
-        -- Hilight handle
-        ass:new_event()
-        ass:append( handle_hilight_format )
-        ass:pos(0,0)
-        ass:draw_start()
-        ass:rect_cw(s_hb[hit_index][1], s_hb[hit_index][2], s_hb[hit_index][3], s_hb[hit_index][4])
-        ass:draw_stop()
-      end
-
-      ass:new_event()
-      ass:pos(0,0)
-      ass:append( box_format )
-      ass:draw_start()
-
-      -- Draw corner handles
-      for k, v in pairs({1, 3, 7, 9}) do
-        ass:rect_cw(s_hb[v][1], s_hb[v][2], s_hb[v][3], s_hb[v][4])
-      end
-      ass:draw_stop()
-    end
-
-    if true or draw_text then
-
-      local br_pos = {s_crop[3] - 2, s_crop[4] + 2}
-      local br_align = 9
-      if br_pos[2] >= self.display_state.screen.height - 20 then
-        br_pos[2] = br_pos[2] - 4
-        br_align = 3
-      end
-
-      ass:new_event()
-      ass:pos(unpack(br_pos))
-      ass:an( br_align )
-      ass:append("{\\fs20\\shad0\\be0\\bord2}")
-      ass:append(string.format("%dx%d", v_crop[3] - v_crop[1], v_crop[4] - v_crop[2]) )
-
-      local tl_pos = {s_crop[1] + 2, s_crop[2] - 2}
-      local tl_align = 1
-      if tl_pos[2] < 20 then
-        tl_pos[2] = tl_pos[2] + 4
-        tl_align = 7
-      end
-
-      ass:new_event()
-      ass:pos(unpack(tl_pos))
-      ass:an( tl_align )
-      ass:append("{\\fs20\\shad0\\be0\\bord2}")
-      ass:append(string.format("%d,%d", v_crop[1], v_crop[2]))
-    end
-
-    ass:draw_stop()
-  end
-
-  -- Crosshair for mouse
-  if self.options.draw_mouse and not dim_only then
-    ass:new_event()
-    ass:pos(0,0)
-    ass:append( guide_format )
-    ass:draw_start()
-
-    ass:move_to(self.mouse_screen.x, 0)
-    ass:line_to(self.mouse_screen.x, self.display_state.screen.height)
-
-    ass:move_to(0, self.mouse_screen.y)
-    ass:line_to(self.display_state.screen.width, self.mouse_screen.y)
-
-    ass:draw_stop()
-  end
-
-  if self.options.draw_help and not dim_only then
-    ass:new_event()
-    ass:pos(self.display_state.screen.width - 5, 5)
-    local text_align = 9
-    ass:append( string.format("{\\fs%d\\an%d\\bord2}", self.text_size, text_align) )
-
-    local fmt_key = function( key, text ) return string.format("[{\\c&HBEBEBE&}%s{\\c} %s]", key:upper(), text) end
-
-    local crosshair_txt = self.options.draw_mouse and "Hide" or "Show";
-    lines = {
-      fmt_key("ENTER", "Accept crop") .. " " .. fmt_key("ESC", "Cancel crop") .. " " .. fmt_key("D", "Autodetect crop"),
-      fmt_key("C", crosshair_txt .. " crosshair") .. " " .. fmt_key("X", "Cycle guides") .. " " .. fmt_key("Z", "Invert color"),
-      fmt_key("SHIFT-Drag", "Constrain ratio")
-    }
-
-    local full_line = nil
-    for i, line in pairs(lines) do
-      if line ~= nil then
-        full_line = full_line and (full_line .. "\\N" .. line) or line
-      end
-    end
-    ass:append(full_line)
-  end
-
-  return ass.text
-end
diff --git a/src/display_state.lua b/src/display_state.lua
deleted file mode 100644
index 462e7be..0000000
--- a/src/display_state.lua
+++ /dev/null
@@ -1,201 +0,0 @@
-local DisplayState = {}
-DisplayState.__index = DisplayState
-
-setmetatable(DisplayState, {
-  __call = function (cls, ...) return cls.new(...) end
-})
-
-function DisplayState.new()
-  local self = setmetatable({}, DisplayState)
-
-  self:reset()
-
-  return self
-end
-
-function DisplayState:reset()
-  self.screen = {} -- Display (window, fullscreen) size
-  self.video  = {} -- Video size
-  self.scale  = {} -- video / screen
-  self.bounds = {} -- Video rect within display
-
-  self.screen_ready = false
-  self.video_ready = false
-
-  -- Stores internal display state (panscan, align, zoom etc)
-  self.current_state = nil
-end
-
-function DisplayState:setup_events()
-  mp.register_event("file-loaded", function() self:event_file_loaded() end)
-end
-
-function DisplayState:event_file_loaded()
-  self:reset()
-  self:recalculate_bounds(true)
-end
-
--- Turns screen-space XY to video XY (can go negative)
-function DisplayState:screen_to_video(x, y)
-  local nx = (x - self.bounds.left) * self.scale.x
-  local ny = (y - self.bounds.top ) * self.scale.y
-  return nx, ny
-end
-
--- Turns video-space XY to screen XY
-function DisplayState:video_to_screen(x, y)
-  local nx = (x / self.scale.x) + self.bounds.left
-  local ny = (y / self.scale.y) + self.bounds.top
-  return nx, ny
-end
-
-function DisplayState:_collect_display_state()
-  local screen_w, screen_h, screen_aspect = mp.get_osd_size()
-
-  local state = {
-    screen_w = screen_w,
-    screen_h = screen_h,
-    screen_aspect = screen_aspect,
-
-    video_w = mp.get_property_native("dwidth"),
-    video_h = mp.get_property_native("dheight"),
-
-    video_w_raw = mp.get_property_native("video-out-params/w"),
-    video_h_raw = mp.get_property_native("video-out-params/h"),
-
-    panscan = mp.get_property_native("panscan"),
-    video_zoom = mp.get_property_native("video-zoom"),
-    video_unscaled = mp.get_property_native("video-unscaled"),
-
-    video_align_x = mp.get_property_native("video-align-x"),
-    video_align_y = mp.get_property_native("video-align-y"),
-
-    video_pan_x = mp.get_property_native("video-pan-x"),
-    video_pan_y = mp.get_property_native("video-pan-y"),
-
-    fullscreen = mp.get_property_native("fullscreen"),
-    keepaspect = mp.get_property_native("keepaspect"),
-    keepaspect_window = mp.get_property_native("keepaspect-window")
-  }
-
-  return state
-end
-
-function DisplayState:_state_changed(state)
-  if self.current_state == nil then return true end
-
-  for k in pairs(state) do
-    if state[k] ~= self.current_state[k] then return true end
-  end
-  return false
-end
-
-
-function DisplayState:recalculate_bounds(forced)
-  local new_state = self:_collect_display_state()
-  if not (forced or self:_state_changed(new_state)) then
-    -- Early out
-    return self.screen_ready
-  end
-  self.current_state = new_state
-
-  -- Store screen dimensions
-  self.screen.width  = new_state.screen_w
-  self.screen.height = new_state.screen_h
-  self.screen.ratio  = new_state.screen_w / new_state.screen_h
-  self.screen_ready = true
-
-  -- Video dimensions
-  if new_state.video_w and new_state.video_h then
-    self.video.width  = new_state.video_w
-    self.video.height = new_state.video_h
-    self.video.ratio  = new_state.video_w / new_state.video_h
-
-    -- This magic has been adapted from mpv's own video/out/aspect.c
-
-    if new_state.keepaspect then
-      local scaled_w, scaled_h = self:_aspect_calc_panscan(new_state)
-      local video_left, video_right = self:_split_scaling(new_state.screen_w, scaled_w, new_state.video_zoom, new_state.video_align_x, new_state.video_pan_x)
-      local video_top, video_bottom = self:_split_scaling(new_state.screen_h, scaled_h, new_state.video_zoom, new_state.video_align_y, new_state.video_pan_y)
-      self.bounds = {
-        left = video_left,
-        right = video_right,
-
-        top = video_top,
-        bottom = video_bottom,
-
-        width = video_right - video_left,
-        height = video_bottom - video_top,
-      }
-    else
-      self.bounds = {
-        left = 0,
-        top = 0,
-        right = self.screen.width,
-        bottom = self.screen.height,
-
-        width = self.screen.width,
-        height = self.screen.height,
-      }
-    end
-
-    self.scale.x = new_state.video_w_raw / self.bounds.width
-    self.scale.y = new_state.video_h_raw / self.bounds.height
-
-    self.video_ready = true
-  end
-
-  return self.screen_ready
-end
-
-
-function DisplayState:_aspect_calc_panscan(state)
-  -- From video/out/aspect.c
-  local f_width = state.screen_w
-  local f_height = (state.screen_w / state.video_w) * state.video_h
-
-  if f_height > state.screen_h or f_height < state.video_h_raw then
-    local tmp_w = (state.screen_h / state.video_h) * state.video_w
-    if tmp_w <= state.screen_w then
-      f_height = state.screen_h
-      f_width = tmp_w
-    end
-  end
-
-  local vo_panscan_area = state.screen_h - f_height
-
-  local f_w = f_width / f_height
-  local f_h = 1
-  if (vo_panscan_area == 0) then
-    vo_panscan_area = state.screen_w - f_width
-    f_w = 1
-    f_h = f_height / f_width
-  end
-
-  if state.video_unscaled then
-    vo_panscan_area = 0
-    if state.video_unscaled ~= "downscale-big" or ((state.video_w <= state.screen_w) and (state.video_h <= state.screen_h)) then
-      f_width = state.video_w
-      f_height = state.video_h
-    end
-  end
-
-  local scaled_w = math.floor( f_width + vo_panscan_area * state.panscan * f_w )
-  local scaled_h = math.floor( f_height + vo_panscan_area * state.panscan * f_h )
-  return scaled_w, scaled_h
-end
-
-function DisplayState:_split_scaling(dst_size, scaled_src_size, zoom, align, pan)
-  -- From video/out/aspect.c as well
-  scaled_src_size = math.floor(scaled_src_size * 2^zoom)
-  align = (align + 1) / 2
-
-  local dst_start = (dst_size - scaled_src_size) * align + pan * scaled_src_size
-  local dst_end = dst_start + scaled_src_size
-
-  -- We don't actually want these - we want to go out of bounds!
-  -- dst_start = math.max(0, dst_start)
-  -- dst_end = math.min(dst_size, dst_end)
-
-  return math.floor(dst_start), math.floor(dst_end)
-end
diff --git a/src/helpers.lua b/src/helpers.lua
deleted file mode 100644
index c1b740e..0000000
--- a/src/helpers.lua
+++ /dev/null
@@ -1,317 +0,0 @@
-local assdraw = require 'mp.assdraw'
-local msg = require 'mp.msg'
-local opt = require 'mp.options'
-local utils = require 'mp.utils'
-
--- Determine platform --
-ON_WINDOWS = (package.config:sub(1,1) ~= '/')
-
--- Some helper functions needed to parse the options --
-function isempty(v) return (v == false) or (v == nil) or (v == "") or (v == 0) or (type(v) == "table" and next(v) == nil) end
-
-function divmod (a, b)
-  return math.floor(a / b), a % b
-end
-
--- Better modulo
-function bmod( i, N )
-  return (i % N + N) % N
-end
-
-function join_paths(...)
-  local sep = ON_WINDOWS and "\\" or "/"
-  local result = "";
-  for i, p in pairs({...}) do
-    if p ~= "" then
-      result = (result ~= "") and (result:gsub("[\\"..sep.."]$", "") .. sep .. p) or p
-    end
-  end
-  return result
-end
-
--- /some/path/file.ext -> /some/path, file.ext
-function split_path( path )
-  local sep = ON_WINDOWS and "\\" or "/"
-  local first_index, last_index = path:find('^.*' .. sep)
-
-  if last_index == nil then
-    return "", path
-  else
-    local dir = path:sub(0, last_index-1)
-    local file = path:sub(last_index+1, -1)
-
-    return dir, file
-  end
-end
-
-function is_local_path( path )
-  local tmp, is_win  = path:gsub("^[A-Z]:\\", "")
-  local tmp, is_unix = path:gsub("^/", "")
-  return (is_win > 0) or (is_unix > 0)
-end
-
-function Set(source)
-  local set = {}
-  for _, l in ipairs(source) do set[l] = true end
-  return set
-end
-
----------------------------
--- More helper functions --
----------------------------
-
--- Removes all keys from a table, without destroying the reference to it
-function clear_table(target)
-  for key, value in pairs(target) do
-    target[key] = nil
-  end
-end
-function shallow_copy(target)
-  local copy = {}
-  for k, v in pairs(target) do
-    copy[k] = v
-  end
-  return copy
-end
-
--- Rounds to given decimals. eg. round_dec(3.145, 0) => 3
-function round_dec(num, idp)
-  local mult = 10^(idp or 0)
-  return math.floor(num * mult + 0.5) / mult
-end
-
-function file_exists(name)
-  local f = io.open(name, "rb")
-  if f ~= nil then
-    local ok, err, code = f:read(1)
-    io.close(f)
-    return code == nil
-  else
-    return false
-  end
-end
-
-function path_exists(name)
-  local f = io.open(name, "rb")
-  if f ~= nil then
-    io.close(f)
-    return true
-  else
-    return false
-  end
-end
-
-function create_directories(path)
-  local cmd
-  if ON_WINDOWS then
-    cmd = { args = {"cmd", "/c", "mkdir", path} }
-  else
-    cmd = { args = {"mkdir", "-p", path} }
-  end
-  utils.subprocess(cmd)
-end
-
--- Find an executable in PATH or CWD with the given name
-function find_executable(name)
-  local delim = ON_WINDOWS and ";" or ":"
-
-  local pwd = os.getenv("PWD") or utils.getcwd()
-  local path = os.getenv("PATH")
-
-  local env_path = pwd .. delim .. path -- Check CWD first
-
-  local result, filename
-  for path_dir in env_path:gmatch("[^"..delim.."]+") do
-    filename = join_paths(path_dir, name)
-    if file_exists(filename) then
-      result = filename
-      break
-    end
-  end
-
-  return result
-end
-
-local ExecutableFinder = { path_cache = {} }
--- Searches for an executable and caches the result if any
-function ExecutableFinder:get_executable_path( name, raw_name )
-  name = ON_WINDOWS and not raw_name and (name .. ".exe") or name
-
-  if self.path_cache[name] == nil then
-    self.path_cache[name] = find_executable(name) or false
-  end
-  return self.path_cache[name]
-end
-
--- Format seconds to HH.MM.SS.sss
-function format_time(seconds, sep, decimals)
-  decimals = decimals == nil and 3 or decimals
-  sep = sep and sep or "."
-  local s = seconds
-  local h, s = divmod(s, 60*60)
-  local m, s = divmod(s, 60)
-
-  local second_format = string.format("%%0%d.%df", 2+(decimals > 0 and decimals+1 or 0), decimals)
-
-  return string.format("%02d"..sep.."%02d"..sep..second_format, h, m, s)
-end
-
--- Format seconds to 1h 2m 3.4s
-function format_time_hms(seconds, sep, decimals, force_full)
-  decimals = decimals == nil and 1 or decimals
-  sep = sep ~= nil and sep or " "
-
-  local s = seconds
-  local h, s = divmod(s, 60*60)
-  local m, s = divmod(s, 60)
-
-  if force_full or h > 0 then
-    return string.format("%dh"..sep.."%dm"..sep.."%." .. tostring(decimals) .. "fs", h, m, s)
-  elseif m > 0 then
-    return string.format("%dm"..sep.."%." .. tostring(decimals) .. "fs", m, s)
-  else
-    return string.format("%." .. tostring(decimals) .. "fs", s)
-  end
-end
-
--- Writes text on OSD and console
-function log_info(txt, timeout)
-  timeout = timeout or 1.5
-  msg.info(txt)
-  mp.osd_message(txt, timeout)
-end
-
--- Join table items, ala ({"a", "b", "c"}, "=", "-", ", ") => "=a-, =b-, =c-"
-function join_table(source, before, after, sep)
-  before = before or ""
-  after = after or ""
-  sep = sep or ", "
-  local result = ""
-  for i, v in pairs(source) do
-    if not isempty(v) then
-      local part = before .. v .. after
-      if i == 1 then
-        result = part
-      else
-        result = result .. sep .. part
-      end
-    end
-  end
-  return result
-end
-
-function wrap(s, char)
-  char = char or "'"
-  return char .. s .. char
-end
--- Wraps given string into 'string' and escapes any 's in it
-function escape_and_wrap(s, char, replacement)
-  char = char or "'"
-  replacement = replacement or "\\" .. char
-  return wrap(string.gsub(s, char, replacement), char)
-end
--- Escapes single quotes in a string and wraps the input in single quotes
-function escape_single_bash(s)
-  return escape_and_wrap(s, "'", "'\\''")
-end
-
--- Returns (a .. b) if b is not empty or nil
-function joined_or_nil(a, b)
-  return not isempty(b) and (a .. b) or nil
-end
-
--- Put items from one table into another
-function extend_table(target, source)
-  for i, v in pairs(source) do
-    table.insert(target, v)
-  end
-end
-
--- Creates a handle and filename for a temporary random file (in current directory)
-function create_temporary_file(base, mode, suffix)
-  local handle, filename
-  suffix = suffix or ""
-  while true do
-    filename = base .. tostring(math.random(1, 5000)) .. suffix
-    handle = io.open(filename, "r")
-    if not handle then
-      handle = io.open(filename, mode)
-      break
-    end
-    io.close(handle)
-  end
-  return handle, filename
-end
-
-
-function get_processor_count()
-  local proc_count
-
-  if ON_WINDOWS then
-    proc_count = tonumber(os.getenv("NUMBER_OF_PROCESSORS"))
-  else
-    local cpuinfo_handle = io.open("/proc/cpuinfo")
-    if cpuinfo_handle ~= nil then
-      local cpuinfo_contents = cpuinfo_handle:read("*a")
-      local _, replace_count = cpuinfo_contents:gsub('processor', '')
-      proc_count = replace_count
-    end
-  end
-
-  if proc_count and proc_count > 0 then
-      return proc_count
-  else
-    return nil
-  end
-end
-
-function substitute_values(string, values)
-  local substitutor = function(match)
-    if match == "%" then
-       return "%"
-    else
-      -- nil is discarded by gsub
-      return values[match]
-    end
-  end
-
-  local substituted = string:gsub('%%(.)', substitutor)
-  return substituted
-end
-
--- ASS HELPERS --
-function round_rect_top( ass, x0, y0, x1, y1, r )
-  local c = 0.551915024494 * r -- circle approximation
-  ass:move_to(x0 + r, y0)
-  ass:line_to(x1 - r, y0) -- top line
-  if r > 0 then
-      ass:bezier_curve(x1 - r + c, y0, x1, y0 + r - c, x1, y0 + r) -- top right corner
-  end
-  ass:line_to(x1, y1) -- right line
-  ass:line_to(x0, y1) -- bottom line
-  ass:line_to(x0, y0 + r) -- left line
-  if r > 0 then
-      ass:bezier_curve(x0, y0 + r - c, x0 + r - c, y0, x0 + r, y0) -- top left corner
-  end
-end
-
-function round_rect(ass, x0, y0, x1, y1, rtl, rtr, rbr, rbl)
-    local c = 0.551915024494
-    ass:move_to(x0 + rtl, y0)
-    ass:line_to(x1 - rtr, y0) -- top line
-    if rtr > 0 then
-        ass:bezier_curve(x1 - rtr + rtr*c, y0, x1, y0 + rtr - rtr*c, x1, y0 + rtr) -- top right corner
-    end
-    ass:line_to(x1, y1 - rbr) -- right line
-    if rbr > 0 then
-        ass:bezier_curve(x1, y1 - rbr + rbr*c, x1 - rbr + rbr*c, y1, x1 - rbr, y1) -- bottom right corner
-    end
-    ass:line_to(x0 + rbl, y1) -- bottom line
-    if rbl > 0 then
-        ass:bezier_curve(x0 + rbl - rbl*c, y1, x0, y1 - rbl + rbl*c, x0, y1 - rbl) -- bottom left corner
-    end
-    ass:line_to(x0, y0 + rtl) -- left line
-    if rtl > 0 then
-        ass:bezier_curve(x0, y0 + rtl - rtl*c, x0 + rtl - rtl*c, y0, x0 + rtl, y0) -- top left corner
-    end
-end
diff --git a/src/main.lua b/src/main.lua
index 0162feb..2f06966 100644
--- a/src/main.lua
+++ b/src/main.lua
@@ -42,13 +42,13 @@ function expand_output_path(cropbox)
     local playback_time = mp.get_property_native("playback-time")
     local duration = mp.get_property_native("duration")
 
-    local filename_without_ext, extension = filename:match("^(.+)%.(.-)$")
+    local filename_without_ext, extension = split_extension(filename)
 
     local properties = {
       path = mp.get_property_native("path"), -- Original path
 
       filename = filename_without_ext, -- Filename without extension
-      file_ext = extension or "",            -- Original extension without leading dot
+      file_ext = extension,            -- Original extension without leading dot (or empty string)
 
       pos = mp.get_property_native("playback-time"),
 
diff --git a/src/option_parser.lua b/src/option_parser.lua
deleted file mode 100644
index 20a975e..0000000
--- a/src/option_parser.lua
+++ /dev/null
@@ -1,287 +0,0 @@
-local OptionParser = {}
-OptionParser.__index = OptionParser
-
-setmetatable(OptionParser, {
-  __call = function (cls, ...) return cls.new(...) end
-})
-
-function OptionParser.new(identifier)
-  local self = setmetatable({}, OptionParser)
-
-  self.identifier = identifier
-  self.config_file = self:_get_config_file(identifier)
-
-  self.config_lines = {}
-  self.OVERRIDE_START = "# Script-saved overrides below this line. Edits will be lost!"
-
-  -- All the options contained, as a list
-  self.options_list = {}
-  -- All the options contained, as a table with keys
-  self.options = {}
-
-  --[[ Example option:
-  {
-    index = 1, -- Added automatically
-    type  = "string",
-    key   = "some_option",
-    default = "default value",
-    name  = "Some option",
-    description  = "Describes the option",
-
-    -- Current value
-    value = "current value",
-    -- Value loaded from .conf, or nil
-    loaded = "current value"
-  }
-  ]]--
-
-
-  -- Easy lookups
-  self.values = setmetatable({}, {
-    __index = function(t, name)
-      local option = self.options[name]
-      return option ~= nil and option.value or nil
-    end,
-    __newindex = function(t, name, value)
-      local option = self.options[name]
-      if option then
-        option.value = value
-      end
-    end
-  })
-
-  self.defaults = setmetatable({}, {
-    __index = function(t, name)
-      local option = self.options[name]
-      return option ~= nil and option.default or nil
-    end
-  })
-
-  -- Hacky way to run after the script is initialized and options (hopefully) added
-  mp.add_timeout(0, function()
-    -- Handle a '--script-opts identifier-example-config=example.conf' to save an example config to a file
-    local example_dump_filename = mp.get_opt(self.identifier .. "-example-config")
-    if example_dump_filename then
-      self:save_example_options(example_dump_filename)
-
-      if mp.get_property_native("options/idle") then
-        msg.info("Exiting.")
-        mp.commandv("quit")
-      end
-    end
-  end)
-
-  return self
-end
-
-function OptionParser:add_option(key, default, description, pad_before)
-  if self.options[key] ~= nil then
-    -- Already exists!
-    return nil
-  end
-
-  local option_index = #self.options_list + 1
-  local option_type = type(default)
-
-  local option = {
-    index = option_index,
-    type = option_type, key = key,
-    default = default,
-    -- name = name,
-    description = description,
-    pad_before = pad_before,
-
-    value = default,
-    loaded = nil
-  }
-
-  self.options_list[option_index] = option
-  if key then
-    self.options[key] = option
-  end
-
-  return option
-end
-
-function OptionParser:add_options(list_of_options)
-  for i, option_args in ipairs(list_of_options) do
-    self:add_option(unpack(option_args))
-  end
-end
-
-
-function OptionParser:restore_defaults()
-  for key, option in pairs(self.options) do
-    option.value = option.default
-  end
-end
-
-function OptionParser:_get_config_file(identifier)
-  local config_filename = "script-opts/" .. identifier .. ".conf"
-  local config_file = mp.find_config_file(config_filename)
-
-  if not config_file then
-    config_filename = "lua-settings/" .. identifier .. ".conf"
-    config_file = mp.find_config_file(config_filename)
-
-    if config_file then
-      msg.warn("lua-settings/ is deprecated, use directory script-opts/")
-    end
-  end
-
-  return config_file
-end
-
-function OptionParser:value_to_string(value)
-  if type(value) == "boolean" then
-    if value then value = "yes" else value = "no" end
-  end
-  return tostring(value)
-end
-
-function OptionParser:string_to_value(option_type, value)
-  if option_type == "boolean" then
-    if value == "yes" or value == "true" then
-      value = true
-    elseif value == "no" or value == "false" then
-      value = false
-    else
-      -- can't parse as boolean
-      value = nil
-    end
-  elseif option_type == "number" then
-    value = tonumber(value)
-    if value == nil then
-      -- Can't parse as number
-    end
-  end
-  return value
-end
-
-function OptionParser:_trim(text)
-  return (text:gsub("^%s*(.-)%s*$", "%1"))
-end
-
-function OptionParser:load_options()
-  if not self.config_file then return end
-  local file = io.open(self.config_file, 'r')
-  if not file then return end
-
-  local override_reached = false
-  local line_index = 1
-
-  for line in file:lines() do
-    if line == self.OVERRIDE_START then
-      override_reached = true
-    elseif line:find("#") == 1 then
-      -- Skip comments
-    else
-      local key, value = line:match("^(..-)=(.+)$")
-      if key then
-        key = self:_trim(key)
-        value = self:_trim(value)
-
-        local option = self.options[key]
-        if not option then
-          msg.warn(("%s:%d ignoring unknown key '%s'"):format(self.config_file, line_index, key))
-        else
-          local parsed_value = self:string_to_value(option.type, value)
-
-          if parsed_value == nil then
-            msg.error(("%s:%d error parsing value '%s' for key '%s' (as %s)"):format(self.config_file, line_index, value, key, option.type))
-          else
-            option.value = parsed_value
-            if not override_reached then
-              option.loaded = parsed_value
-            end
-          end
-        end
-      end
-    end
-
-    if not override_reached then
-      -- Store original lines
-      self.config_lines[line_index] = line
-    end
-
-    line_index = line_index + 1
-  end
-
-  file:close()
-end
-
-function OptionParser:save_options()
-  if not self.config_file then return end
-
-  -- Check if we have overriden values
-  local override_lines = {}
-  for option_index, option in ipairs(self.options_list) do
-    -- If value is different from default AND loaded value, store it in array
-    if option.key and option.value ~= option.default and (option.loaded == nil or option.value ~= option.loaded) then
-      table.insert(override_lines, ('%s=%s'):format(option.key, self:value_to_string(option.value)))
-    end
-  end
-
-  -- Don't rewrite unless we have any reason to
-  if #override_lines > 0 then
-    local file = io.open(self.config_file, 'w')
-    if not file then return end
-
-    if #self.config_lines > 0 then
-      -- Write original config lines
-      for line_index, line in ipairs(self.config_lines) do
-        file:write(line .. '\n')
-      end
-
-      -- Add a newline before the override comment if needed
-      if self.config_lines[#self.config_lines] ~= '' then
-        file:write('\n')
-      end
-    end
-
-    file:write(self.OVERRIDE_START .. '\n')
-    for override_line_index, override_line in ipairs(override_lines) do
-      file:write(override_line .. '\n')
-    end
-
-    file:close()
-  end
-
-end
-
-function OptionParser:get_default_config_lines()
-  local example_config_lines = {}
-
-  for option_index, option in ipairs(self.options_list) do
-    if option.pad_before then
-      table.insert(example_config_lines, '')
-    end
-
-    if option.description then
-      for description_line in option.description:gmatch('[^\r\n]+') do
-        table.insert(example_config_lines, ('# ' .. description_line))
-      end
-    end
-    if option.key then
-      table.insert(example_config_lines, ('%s=%s'):format(option.key, self:value_to_string(option.default)) )
-    end
-  end
-  return example_config_lines
-end
-
-function OptionParser:explain_options()
-  local example_config_lines = self:get_default_config_lines()
-  msg.info(table.concat(example_config_lines, '\n'))
-end
-
-function OptionParser:save_example_options(filename)
-  local file = io.open(filename, "w")
-  if not file then
-    msg.error("Unable to open file '" .. filename .. "' for writing")
-  else
-    local example_config_lines = self:get_default_config_lines()
-    file:write(table.concat(example_config_lines, '\n'))
-    file:close()
-    msg.info("Wrote example config to file '" .. filename .. "'")
-  end
-end
diff --git a/src/property_expander.lua b/src/property_expander.lua
deleted file mode 100644
index d1a7f40..0000000
--- a/src/property_expander.lua
+++ /dev/null
@@ -1,182 +0,0 @@
-local PropertyExpander = {}
-PropertyExpander.__index = PropertyExpander
-
-setmetatable(PropertyExpander, {
-  __call = function (cls, ...) return cls.new(...) end
-})
-
-function PropertyExpander.new(property_source)
-  local self = setmetatable({}, PropertyExpander)
-  self.sentinel = {}
-
-  -- property_source is a table which defines the following functions:
-  -- get_raw_property(name, def) - returns a raw property or def
-  -- get_property(name) - returns a string
-  -- get_property_osd(name) - returns an OSD formatted string (whatever that'll mean)
-  self.property_source = property_source
-  return self
-end
-
-
--- Formats seconds to H:M:S based on a %h-%m-%s format
-function PropertyExpander:_format_time(seconds, time_format)
-  -- In case "seconds" is not a number, give it back
-  if type(seconds) ~= "number" then
-    return seconds
-  end
-
-  time_format = time_format or "%02h.%02m.%02.3s"
-
-  local types = { h='d', m='d', s='f', S='f', M='d' }
-  local values = {
-    h=math.floor(seconds / 3600),
-    m=math.floor(seconds / 60),
-    s=(seconds % 60),
-    S=seconds,
-    M=math.floor((seconds % 1)*1000)
-  }
-
-  local substitutor = function(sub_format, char)
-    local v = values[char]
-    local t = types[char]
-    if t == nil then return nil end
-
-    sub_format = '%' .. sub_format .. types[char]
-    return v and sub_format:format(v) or nil
-  end
-
-  return time_format:gsub('%%([%-%+ #0]*%d*.?%d*)([%a%%])', substitutor)
-end
-
--- Format a date
-function PropertyExpander:_format_date(seconds, date_format)
-  -- In case "seconds" is not nil or a number, give it back
-  if type(seconds) ~= "number" and type(seconds) ~= "nil" then
-    return seconds
-  end
-
-  --[[
-    As stated by Lua docs:
-    %a  abbreviated weekday name (e.g., Wed)
-    %A  full weekday name (e.g., Wednesday)
-    %b  abbreviated month name (e.g., Sep)
-    %B  full month name (e.g., September)
-    %c  date and time (e.g., 09/16/98 23:48:10)
-    %d  day of the month (16) [01-31]
-    %H  hour, using a 24-hour clock (23) [00-23]
-    %I  hour, using a 12-hour clock (11) [01-12]
-    %M  minute (48) [00-59]
-    %m  month (09) [01-12]
-    %p  either "am" or "pm" (pm)
-    %S  second (10) [00-61]
-    %w  weekday (3) [0-6 = Sunday-Saturday]
-    %x  date (e.g., 09/16/98)
-    %X  time (e.g., 23:48:10)
-    %Y  full year (1998)
-    %y  two-digit year (98) [00-99]
-    %%  the character `%´
-  ]]--
-  date_format = date_format or "%Y-%m-%d %H-%M-%S"
-  return os.date(date_format, seconds)
-end
-
-
-function PropertyExpander:expand(format_string)
-  local substitutor = function(match)
-    local command, inner = match:sub(3, -2):match('^([%?!~^%%#&]?)(.+)$')
-    local colon_index = inner:find(':')
-
-    local property_name = inner
-    local secondary = ""
-    local has_colon = colon_index and true or false
-
-    if colon_index then
-      property_name = inner:sub(1, colon_index-1)
-      secondary = inner:sub(colon_index+1, -1)
-    end
-
-
-    local raw_property_value = self.property_source:get_raw_property(property_name, self.sentinel)
-    local property_exists = raw_property_value ~= self.sentinel
-
-    if command == '' then
-      -- Return the property value if it's not nil, else the (expanded) secondary
-      return property_exists and self.property_source:get_property(property_name) or self:expand(secondary)
-
-
-    elseif command == '?' then
-      -- Return (expanded) secondary if property is truthy (sentinel is falsey)
-      if not isempty(raw_property_value) then return self:expand(secondary) else return '' end
-
-    elseif command == '!' then
-      -- Return (expanded) secondary if property is falsey
-      if isempty(raw_property_value) then return self:expand(secondary) else return '' end
-
-
-    elseif command == '^' then
-      -- Return (expanded) secondary if property does not exist
-      return not property_exists and self:expand(secondary) or ""
-
-
-    elseif command == '%' then
-      -- Return the value formatted using the secondary string
-      return secondary:format(raw_property_value)
-
-    elseif command == '#' then
-      -- Format a number to HMS
-      return self:_format_time(raw_property_value, has_colon and secondary or nil)
-
-    elseif command == '&' then
-      -- Format a date
-      return self:_format_date(nil, has_colon and secondary or nil)
-
-
-    elseif command == '@' then
-      -- Format the value for OSD - mostly useful for latching onto mpv's properties
-      return property_exists and self.property_source:get_property_osd(property_name) or self:expand(secondary)
-    end
-
-  end
-
-  -- Lua patterns are generally a pain, but %b is comfy!
-  return format_string:gsub('%$%b{}', substitutor)
-end
-
-
-local MPVPropertySource = {}
-MPVPropertySource.__index = MPVPropertySource
-
-setmetatable(MPVPropertySource, {
-  __call = function (cls, ...) return cls.new(...) end
-})
-
-function MPVPropertySource.new(values)
-  local self = setmetatable({}, MPVPropertySource)
-  self.values = values
-
-  return self
-end
-
-function MPVPropertySource:get_raw_property(name, default)
-  if name:find('mpv/') ~= nil then
-    return mp.get_property_native(name:sub(5), default)
-  end
-  local v = self.values[name]
-  if v ~= nil then return v else return default end
-end
-
-function MPVPropertySource:get_property(name, default)
-  if name:find('mpv/') ~= nil then
-    return mp.get_property(name:sub(5), default)
-  end
-  local v = self.values[name]
-  if v ~= nil then return tostring(v) else return default end
-end
-
-function MPVPropertySource:get_property_osd(name, default)
-  if name:find('mpv/') ~= nil then
-    return mp.get_property_osd(name:sub(5), default)
-  end
-  local v = self.values[name]
-  if v ~= nil then return tostring(v) else return default end
-end