diff --git a/README.org b/README.org
index 3e30728..cc6d74d 100644
--- a/README.org
+++ b/README.org
@@ -182,10 +182,10 @@ boot.supportedFilesystems = [ "ntfs" ];
 services.xserver = {
   enable = true;
   autorun = false;
-  windowManager.awesome = {
-    enable = true;
-    package = pkgs.awesome;
-  };
+  # windowManager.awesome = {
+  #   enable = true;
+  #   package = pkgs.awesome;
+  # };
   displayManager = {
     startx.enable = true;
     sddm = {
@@ -213,11 +213,11 @@ services.greetd = {
   enable = true;
   settings = rec {
     initial_session = {
-      command = "/home/chris/bin/hyprland";
+      command = "dbus-run-session startplasma-wayland";
       user = "chris";
     };
     default_session = {
-      command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time -r --window-padding 2 --cmd /home/chris/bin/hyprland";
+      command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time -r --window-padding 2 --cmd 'dbus-run-session startplasma-wayland'";
       user = "greeter";
     };
     plasma_session = {
@@ -431,7 +431,9 @@ feh
 tagutil
 python310Packages.mutagen
 python310Packages.audiotools
-# mpv
+(mpv.override {scripts = with pkgs.mpvScripts; [ mpris youtube-quality sponsorblock ];})
+ani-cli
+mov-cli
 nerdfonts
 # latte-dock
 plasma-browser-integration
@@ -1993,7 +1995,24 @@ Kohlin's hardware
 ** Home
 I also use home-manager for managing dotfiles. This means that everything is contained in this folder and then tangled out to their respective places when rebuilding the system.
 
-#+begin_src nix :tangle user/home.nix
+*** MPV
+Here is my mpv config
+
+#+NAME: mpv
+#+begin_src nix
+# programs.mpv = {
+#   enable = true;
+#   scripts = with pkgs.mpvScripts; [ mpris thumbnail youtube-quality sponsorblock ];
+# };
+
+home.file.".config/mpv" = {
+  source = ../mpv;
+  recursive = true;
+};
+#+end_src
+
+*** General
+#+begin_src nix :tangle user/home.nix :noweb yes
 { config, lib, pkgs, ... }:
 
 {
@@ -2234,6 +2253,8 @@ I also use home-manager for managing dotfiles. This means that everything is con
     plugins = [ pkgs.obs-studio-plugins.obs-move-transition ];
   };
 
+  <<mpv>>
+
   services.nextcloud-client = {
     enable = true;
     startInBackground = true;
@@ -2374,45 +2395,6 @@ I also use home-manager for managing dotfiles. This means that everything is con
     source = ../qutebrowser/qsettings;
   };
 
-  programs.mpv = {
-    enable = true;
-    scripts = with pkgs.mpvScripts; [ mpris thumbnail youtube-quality sponsorblock];
-    config = {
-      osc = false;
-      vo = "gpu";
-      af = "scaletempo2";
-      autofit = "4000x2900";
-      geometry = "50%:50%";
-      hwdec = "auto";
-      rtsp-transport = "udp";
-      speed = 1.95;
-      ytdl-format = "bestvideo[height<=?720][fps<=?30]+bestaudio/best";
-    };
-    profiles = {
-      fast = {
-        speed = 1.95;
-      };
-      slow = {
-        speed = 1;
-      };
-      wc = {
-        speed = 1;
-        osd-level = 0;
-        osc = false;
-        load-scripts = false;
-        profile = "low-latency";
-        demuxer-lavf-format = "video4linux2";
-        demuxer-lavf-o-set = "input_format=mjpeg,video_size=1920x1080,framerate=60";
-        fps = 60;
-      };
-    };
-  };
-
-  home.file.".config/mpv/scripts" = {
-    source = ../mpv/scripts;
-    recursive = true;
-  };
-
   home.file.".config/imv" = {
     source = ../imv;
     recursive = true;
diff --git a/mpv/mpv.conf b/mpv/mpv.conf
index c986a19..07c94e9 100644
--- a/mpv/mpv.conf
+++ b/mpv/mpv.conf
@@ -2,7 +2,7 @@
 osc=no
 vo=gpu
 af=scaletempo2
-autofit=90%x90%
+autofit=2800x1800
 geometry=50%:50%
 # input-ipc-server="/tmp/mpvsocket"
 hwdec=auto
diff --git a/mpv/script-opts/thumbfast.conf b/mpv/script-opts/thumbfast.conf
index 1a02a5d..612039c 100644
--- a/mpv/script-opts/thumbfast.conf
+++ b/mpv/script-opts/thumbfast.conf
@@ -13,16 +13,16 @@ max_width=200
 overlay_id=42
 
 # Spawn thumbnailer on file load for faster initial thumbnails
-spawn_first=no
+spawn_first=yes
 
 # Enable on network playback
-network=no
+network=yes
 
 # Enable on audio playback
 audio=no
 
 # Enable hardware decoding
-hwdec=no
+hwdec=yes
 
 # Windows only: use native Windows API to write to pipe (requires LuaJIT)
 direct_io=no
diff --git a/mpv/scripts/morden-ui.lua b/mpv/scripts/morden-ui.lua
index c764f7a..c34b1d3 100644
--- a/mpv/scripts/morden-ui.lua
+++ b/mpv/scripts/morden-ui.lua
@@ -1,9 +1,6 @@
--- mpv-osc-modern by maoiscat
+-- by maoiscat
 -- email:valarmor@163.com
--- https://github.com/maoiscat/mpv-osc-modern
-
--- fork by cyl0
--- https://github.com/cyl0/ModernX/
+-- https://github.com/maoiscat/mpv-osc-morden
 
 local assdraw = require 'mp.assdraw'
 local msg = require 'mp.msg'
@@ -18,118 +15,67 @@ local utils = require 'mp.utils'
 local user_opts = {
     showwindowed = true,        -- show OSC when windowed?
     showfullscreen = true,      -- show OSC when fullscreen?
-    idlescreen = true,          -- draw logo and text when idle
-    scalewindowed = 1.0,        -- scaling of the controller when windowed
-    scalefullscreen = 1.0,      -- scaling of the controller when fullscreen
-    scaleforcedwindow = 2.0,    -- scaling when rendered on a forced window
-    vidscale = true,            -- scale the controller with the video?
-    hidetimeout = 1500,         -- duration in ms until the OSC hides if no
+    scalewindowed = 1,          -- scaling of the controller when windowed
+    scalefullscreen = 1,        -- scaling of the controller when fullscreen
+    scaleforcedwindow = 2,      -- scaling when rendered on a forced window
+    vidscale = false,           -- scale the controller with the video?
+    hidetimeout = 1000,         -- duration in ms until the OSC hides if no
                                 -- mouse movement. enforced non-negative for the
                                 -- user, but internally negative is 'always-on'.
-    fadeduration = 250,         -- duration of fade out in ms, 0 = no fade
-    minmousemove = 1,           -- minimum amount of pixels the mouse has to
+    fadeduration = 500,         -- duration of fade out in ms, 0 = no fade
+    minmousemove = 3,           -- minimum amount of pixels the mouse has to
                                 -- move between ticks to make the OSC show up
     iamaprogrammer = false,     -- use native mpv values and disable OSC
                                 -- internal track list management (and some
                                 -- functions that depend on it)
-    font = 'mpv-osd-symbols',	-- default osc font
-    seekbarhandlesize = 1.0,	-- size ratio of the slider handle, range 0 ~ 1
-    seekrange = true,		-- show seekrange overlay
-    seekrangealpha = 64,      	-- transparency of seekranges
+    font = 'mpv-osd-symbols',    -- default osc font
+    seekrange = true,            -- show seekrange overlay
+    seekrangealpha = 128,          -- transparency of seekranges
     seekbarkeyframes = true,    -- use keyframes when dragging the seekbar
-    showjump = true,            -- show "jump forward/backward 5 seconds" buttons 
-                                -- shift+left-click to step 1 frame and 
-                                -- right-click to jump 1 minute
-    jumpamount = 5,             -- change the jump amount (in seconds by default)
-    jumpiconnumber = true,      -- show different icon when jumpamount is 5, 10, or 30
-    jumpmode = 'exact',         -- seek mode for jump buttons. e.g.
-                                -- 'exact', 'relative+keyframes', etc.
     title = '${media-title}',   -- string compatible with property-expansion
                                 -- to be shown as OSC title
-    showtitle = true,		-- show title in OSC
-    showonpause = true,         -- whether to disable the hide timeout on pause
-    timetotal = true,          	-- display total time instead of remaining time?
-    timems = false,             -- Display time down to millliseconds by default
+    showtitle = true,            -- show title and no hide timeout on pause
+    timetotal = true,              -- display total time instead of remaining time?
     visibility = 'auto',        -- only used at init to set visibility_mode(...)
     windowcontrols = 'auto',    -- whether to show window controls
-    greenandgrumpy = false,     -- disable santa hat
-    language = 'eng',		-- eng=English, chs=Chinese
     volumecontrol = true,       -- whether to show mute button and volumne slider
-    keyboardnavigation = false, -- enable directional keyboard navigation
-    chapter_fmt = "Chapter: %s", -- chapter print format for seekbar-hover. "no" to disable
-}
-
--- Icons for jump button depending on jumpamount 
-local jumpicons = { 
-    [5] = {'\239\142\177', '\239\142\163'}, 
-    [10] = {'\239\142\175', '\239\142\161'}, 
-    [30] = {'\239\142\176', '\239\142\162'}, 
-    default = {'\239\142\178	', '\239\142\178'}, -- second icon is mirrored in layout() 
-} 
-
-local icons = {
-  previous = '\239\142\181',
-  next = '\239\142\180',
-  play = '\239\142\170',
-  pause = '\239\142\167',
-  backward = '\239\142\160',
-  forward = '\239\142\159',
-  audio = '\239\142\183',
-  volume = '\239\142\188',
-  volume_mute = '\239\142\187',
-  sub = '\239\143\147',
-  minimize = '\239\133\172',
-  fullscreen = '\239\133\173',  
-  info = '',
+    processvolume = true,		-- volue slider show processd volume
+    language = 'eng',            -- eng=English, chs=Chinese
+    thumbpad = 4,               -- thumbnail border size
 }
 
 -- Localization
 local language = {
-	['eng'] = {
-	    welcome = '{\\fs24\\1c&H0&\\1c&HFFFFFF&}Drop files or URLs to play here.',  -- this text appears when mpv starts
-		off = 'OFF',
-		na = 'n/a',
-		none = 'none',
-		video = 'Video',
-		audio = 'Audio',
-		subtitle = 'Subtitle',
-		available = 'Available ',
-		track = ' Tracks:',
-		playlist = 'Playlist',
-		nolist = 'Empty playlist.',
-		chapter = 'Chapter',
-		nochapter = 'No chapters.',
-	},
-	['chs'] = {
-		welcome = '{\\1c&H00\\bord0\\fs30\\fn微软雅黑 light\\fscx125}MPV{\\fscx100} 播放器',  -- this text appears when mpv starts
-		off = '关闭',
-		na = 'n/a',
-		none = '无',
-		video = '视频',
-		audio = '音频',
-		subtitle = '字幕',
-		available = '可选',
-		track = '：',
-		playlist = '播放列表',
-		nolist = '无列表信息',
-		chapter = '章节',
-		nochapter = '无章节信息',
-	},
-	['pl'] = {
-	    welcome = '{\\fs24\\1c&H0&\\1c&HFFFFFF&}Upuść plik lub łącze URL do odtworzenia.',  -- this text appears when mpv starts
-		off = 'WYŁ.',
-		na = 'n/a',
-		none = 'nic',
-		video = 'Wideo',
-		audio = 'Ścieżka audio',
-		subtitle = 'Napisy',
-		available = 'Dostępne ',
-		track = ' Ścieżki:',
-		playlist = 'Lista odtwarzania',
-		nolist = 'Lista odtwarzania pusta.',
-		chapter = 'Rozdział',
-		nochapter = 'Brak rozdziałów.',
-	}
+    ['eng'] = {
+        welcome = '{\\fs24\\1c&H0&\\3c&HFFFFFF&}Drop files or URLs to play here.',  -- this text appears when mpv starts
+        off = 'OFF',
+        na = 'n/a',
+        none = 'none',
+        video = 'Video',
+        audio = 'Audio',
+        subtitle = 'Subtitle',
+        available = 'Available ',
+        track = ' Tracks:',
+        playlist = 'Playlist',
+        nolist = 'Empty playlist.',
+        chapter = 'Chapter',
+        nochapter = 'No chapters.',
+    },
+    ['chs'] = {
+        welcome = '{\\1c&H00\\bord0\\fs30\\fn微软雅黑 light\\fscx125}MPV{\\fscx100} 播放器',  -- this text appears when mpv starts
+        off = '关闭',
+        na = 'n/a',
+        none = '无',
+        video = '视频',
+        audio = '音频',
+        subtitle = '字幕',
+        available = '可选',
+        track = '：',
+        playlist = '播放列表',
+        nolist = '无列表信息',
+        chapter = '章节',
+        nochapter = '无章节信息',
+    }
 }
 -- read options from config and command-line
 opt.read_options(user_opts, 'osc', function(list) update_options(list) end)
@@ -144,21 +90,19 @@ local osc_param = { -- calculated by osc_init()
 }
 
 local osc_styles = {
-    TransBg = '{\\blur100\\bord150\\1c&H000000&\\3c&H000000&}',
+    TransBg = '{\\blur100\\bord140\\1c&H000000&\\3c&H000000&}',
     SeekbarBg = '{\\blur0\\bord0\\1c&HFFFFFF&}',
     SeekbarFg = '{\\blur1\\bord1\\1c&HE39C42&}',
     VolumebarBg = '{\\blur0\\bord0\\1c&H999999&}',
     VolumebarFg = '{\\blur1\\bord1\\1c&HFFFFFF&}',
     Ctrl1 = '{\\blur0\\bord0\\1c&HFFFFFF&\\3c&HFFFFFF&\\fs36\\fnmaterial-design-iconic-font}',
     Ctrl2 = '{\\blur0\\bord0\\1c&HFFFFFF&\\3c&HFFFFFF&\\fs24\\fnmaterial-design-iconic-font}',
-    Ctrl2Flip = '{\\blur0\\bord0\\1c&HFFFFFF&\\3c&HFFFFFF&\\fs24\\fnmaterial-design-iconic-font\\fry180',
     Ctrl3 = '{\\blur0\\bord0\\1c&HFFFFFF&\\3c&HFFFFFF&\\fs24\\fnmaterial-design-iconic-font}',
     Time = '{\\blur0\\bord0\\1c&HFFFFFF&\\3c&H000000&\\fs17\\fn' .. user_opts.font .. '}',
     Tooltip = '{\\blur1\\bord0.5\\1c&HFFFFFF&\\3c&H000000&\\fs18\\fn' .. user_opts.font .. '}',
-    Title = '{\\blur1\\bord0.5\\1c&HFFFFFF&\\3c&H0\\fs38\\q2\\fn' .. user_opts.font .. '}',
+    Title = '{\\blur1\\bord0.5\\1c&HFFFFFF&\\3c&H0\\fs48\\q2\\fn' .. user_opts.font .. '}',
     WinCtrl = '{\\blur1\\bord0.5\\1c&HFFFFFF&\\3c&H0\\fs20\\fnmpv-osd-symbols}',
     elementDown = '{\\1c&H999999&}',
-    elementHighlight = '{\\blur1\\bord1\\1c&HFFC033&}',
 }
 
 -- internal states, do not touch
@@ -192,10 +136,9 @@ local state = {
     maximized = false,
     osd = mp.create_osd_overlay('ass-events'),
     mute = false,
-    lastvisibility = user_opts.visibility,	-- save last visibility on pause if showonpause
-    fulltime = user_opts.timems,
-    highlight_element = 'cy_audio',
-    chapter_list = {},                      -- sorted by time
+    lastvisibility = user_opts.visibility,		-- save last visibility on pause if showtitle
+    sys_volume,									--system volume
+    proc_volume,								--processed volume
 }
 
 local thumbfast = {
@@ -208,67 +151,6 @@ local thumbfast = {
 local window_control_box_width = 138
 local tick_delay = 0.03
 
-local is_december = os.date("*t").month == 12
-
---- Automatically disable OSC
-local builtin_osc_enabled = mp.get_property_native('osc')
-if builtin_osc_enabled then
-    mp.set_property_native('osc', false)
-end
-
---
-
-
--- WindowControl helpers
-function window_controls_enabled()
-    val = user_opts.windowcontrols
-    if val == 'auto' then
-        return (not state.border) or state.fullscreen
-    else
-        return val ~= 'no'
-    end
-end
-
-
-
-function build_keyboard_controls()
-
-    -- prepare the main button row
-    local bottom_button_line = {}
-    table.insert(bottom_button_line, 'cy_audio')
-    table.insert(bottom_button_line, 'cy_sub')
-    table.insert(bottom_button_line, 'pl_prev')
-    table.insert(bottom_button_line, 'skipback')
-    if user_opts.showjump then
-        table.insert(bottom_button_line, 'jumpback')
-    end
-    table.insert(bottom_button_line, 'playpause')
-    if user_opts.showjump then
-        table.insert(bottom_button_line, 'jumpfrwd')
-    end
-    table.insert(bottom_button_line, 'skipfrwd')
-    table.insert(bottom_button_line, 'pl_next')
-    table.insert(bottom_button_line, 'tog_info')
-    table.insert(bottom_button_line, 'tog_fs')
-
-    -- build up the main mapping object
-    local mapping = {}
-    if window_controls_enabled() then
-        table.insert(mapping, {
-            'minimize',
-            'maximize',
-            'close'
-        })
-    end
-    table.insert(mapping, {
-        'seekbar'
-    })
-    table.insert(mapping, bottom_button_line)
-
-    return mapping
-end
-
-
 --
 -- Helperfunctions
 --
@@ -433,7 +315,7 @@ function ass_append_alpha(ass, alpha, modifier)
 end
 
 function ass_draw_cir_cw(ass, x, y, r)
-	ass:round_rect_cw(x-r, y-r, x+r, y+r, r)
+    ass:round_rect_cw(x-r, y-r, x+r, y+r, r)
 end
 
 function ass_draw_rr_h_cw(ass, x0, y0, x1, y1, r1, hexagon, r2)
@@ -452,7 +334,14 @@ function ass_draw_rr_h_ccw(ass, x0, y0, x1, y1, r1, hexagon, r2)
     end
 end
 
-
+-- set volume
+function set_volume(val)
+	if user_opts.processvolume then
+		val = 10*math.sqrt(val)
+	end
+	mp.commandv('set', 'volume', val)
+	mp.commandv('add', 'volume', 0)		--this prevent volume exceeds limit
+end
 --
 -- Tracklist Management
 --
@@ -524,7 +413,7 @@ function set_track(type, next)
 
     mp.commandv('set', type, new_track_mpv)
 
---	if (new_track_osc == 0) then
+--    if (new_track_osc == 0) then
 --        show_message(nicetypes[type] .. ' Track: none')
 --    else
 --        show_message(nicetypes[type]  .. ' Track: '
@@ -546,6 +435,16 @@ function get_track(type)
     return 0
 end
 
+-- WindowControl helpers
+function window_controls_enabled()
+    val = user_opts.windowcontrols
+    if val == 'auto' then
+        return (not state.border) or state.fullscreen
+    else
+        return val ~= 'no'
+    end
+end
+
 --
 -- Element Management
 --
@@ -603,15 +502,15 @@ function prepare_elements()
             --draw static slider parts
             local slider_lo = element.layout.slider
             -- calculate positions of min and max points
-			element.slider.min.ele_pos = user_opts.seekbarhandlesize * elem_geo.h / 2
-			element.slider.max.ele_pos = elem_geo.w - element.slider.min.ele_pos
+            element.slider.min.ele_pos = elem_geo.h / 2
+            element.slider.max.ele_pos = elem_geo.w - element.slider.min.ele_pos
             element.slider.min.glob_pos = element.hitbox.x1 + element.slider.min.ele_pos
             element.slider.max.glob_pos = element.hitbox.x1 + element.slider.max.ele_pos
 
             static_ass:draw_start()
-			-- a hack which prepares the whole slider area to allow center placements such like an=5
-			static_ass:rect_cw(0, 0, elem_geo.w, elem_geo.h)
-			static_ass:rect_ccw(0, 0, elem_geo.w, elem_geo.h)
+            -- a hack which prepares the whole slider area to allow center placements such like an=5
+            static_ass:rect_cw(0, 0, elem_geo.w, elem_geo.h)
+            static_ass:rect_ccw(0, 0, elem_geo.w, elem_geo.h)
             -- marker nibbles
             if not (element.slider.markerF == nil) and (slider_lo.gap > 0) then
                 local markers = element.slider.markerF()
@@ -628,7 +527,7 @@ function prepare_elements()
                             --bottom
                             if (slider_lo.nibbles_bottom) then
                                 static_ass:move_to(s - 3, elem_geo.h - slider_lo.gap + 5)
-								static_ass:line_to(s, elem_geo.h - slider_lo.gap + 1)
+                                static_ass:line_to(s, elem_geo.h - slider_lo.gap + 1)
                                 static_ass:line_to(s + 3, elem_geo.h - slider_lo.gap + 5)
                             end
                         else -- draw 2x1px nibbles
@@ -654,47 +553,13 @@ function prepare_elements()
             element.layout.alpha[1] = 136
             element.eventresponder = nil
         end
-        -- gray out the element if it is toggled off
-        if (element.off) then
-            element.layout.alpha[1] = 136
-        end
-
     end
 end
 
 --
 -- Element Rendering
 --
-
--- returns nil or a chapter element from the native property chapter-list
-function get_chapter(possec)
-    local cl = state.chapter_list  -- sorted, get latest before possec, if any
-
-    for n=#cl,1,-1 do
-        if possec >= cl[n].time then
-            return cl[n]
-        end
-    end
-end
-
 function render_elements(master_ass)
-    -- when the slider is dragged or hovered and we have a target chapter name
-    -- then we use it instead of the normal title. we calculate it before the
-    -- render iterations because the title may be rendered before the slider.
-    state.forced_title = nil
-    if thumbfast.disabled then
-        local se, ae = state.slider_element, elements[state.active_element]
-        if user_opts.chapter_fmt ~= "no" and se and (ae == se or (not ae and mouse_hit(se))) then
-            local dur = mp.get_property_number("duration", 0)
-            if dur > 0 then
-                local possec = get_slider_value(se) * dur / 100 -- of mouse pos
-                local ch = get_chapter(possec)
-                if ch and ch.title and ch.title ~= "" then
-                    state.forced_title = string.format(user_opts.chapter_fmt, ch.title)
-                end
-            end
-        end
-    end
 
     for n=1, #elements do
         local element = elements[n]
@@ -721,10 +586,6 @@ function render_elements(master_ass)
             end
         end
 
-        if user_opts.keyboardnavigation and state.highlight_element == element.name then
-            style_ass:append(osc_styles.elementHighlight)
-        end
-        
         local elem_ass = assdraw.ass_new()
         elem_ass:merge(style_ass)
         
@@ -740,26 +601,26 @@ function render_elements(master_ass)
             local s_max = element.slider.max.value
             -- draw pos marker
             local pos = element.slider.posF()
-            local seekRanges = element.slider.seekRangesF()
-			local rh = user_opts.seekbarhandlesize * elem_geo.h / 2 -- Handle radius
+            local seekRanges
+            local rh = elem_geo.h / 2 -- Handle radius
             local xp
             
             if pos then
                 xp = get_slider_ele_pos_for(element, pos)
-				ass_draw_cir_cw(elem_ass, xp, elem_geo.h/2, rh)
-				elem_ass:rect_cw(0, slider_lo.gap, xp, elem_geo.h - slider_lo.gap)
+                ass_draw_cir_cw(elem_ass, xp, elem_geo.h/2, rh)
+                elem_ass:rect_cw(0, slider_lo.gap, xp, elem_geo.h - slider_lo.gap)
             end
-
+			if element.slider.seekRangesF ~= nil then seekRanges = element.slider.seekRangesF() end
             if seekRanges then
-				elem_ass:draw_stop()
-				elem_ass:merge(element.style_ass)
-				ass_append_alpha(elem_ass, element.layout.alpha, user_opts.seekrangealpha)
-				elem_ass:merge(element.static_ass)
+                elem_ass:draw_stop()
+                elem_ass:merge(element.style_ass)
+                ass_append_alpha(elem_ass, element.layout.alpha, user_opts.seekrangealpha)
+                elem_ass:merge(element.static_ass)
 
                 for _,range in pairs(seekRanges) do
                     local pstart = get_slider_ele_pos_for(element, range['start'])
                     local pend = get_slider_ele_pos_for(element, range['end'])
-					elem_ass:rect_cw(pstart - rh, slider_lo.gap, pend + rh, elem_geo.h - slider_lo.gap)
+                    elem_ass:rect_cw(pstart - rh, slider_lo.gap, pend + rh, elem_geo.h - slider_lo.gap)
                 end
             end
 
@@ -802,21 +663,20 @@ function render_elements(master_ass)
                     elem_ass:append(slider_lo.tooltip_style)
                     ass_append_alpha(elem_ass, slider_lo.alpha, 0)
                     elem_ass:append(tooltiplabel)
-                    
+
                     -- thumbnail
-                    if not thumbfast.disabled then
+                    if element.thumbnail and not thumbfast.disabled then
                         local osd_w = mp.get_property_number("osd-width")
                         if osd_w then
                             local r_w, r_h = get_virt_scale_factor()
 
-                            local tooltip_font_size = 18
-                            local thumbPad = 4
+                            local thumbPad = user_opts.thumbpad
                             local thumbMarginX = 18 / r_w
-                            local thumbMarginY = tooltip_font_size + thumbPad + 2 / r_h
+                            local thumbMarginY = 30
                             local tooltipBgColor = "FFFFFF"
                             local tooltipBgAlpha = 80
                             local thumbX = math.min(osd_w - thumbfast.width - thumbMarginX, math.max(thumbMarginX, tx / r_w - thumbfast.width / 2))
-                            local thumbY = (ty - thumbMarginY) / r_h - thumbfast.height
+                            local thumbY = ((ty - thumbMarginY) / r_h - thumbfast.height)
 
                             thumbX = math.floor(thumbX + 0.5)
                             thumbY = math.floor(thumbY + 0.5)
@@ -833,27 +693,10 @@ function render_elements(master_ass)
                                 thumbX,
                                 thumbY
                             )
-
-                            local se, ae = state.slider_element, elements[state.active_element]
-                            if user_opts.chapter_fmt ~= "no" and se and (ae == se or (not ae and mouse_hit(se))) then
-                                local dur = mp.get_property_number("duration", 0)
-                                if dur > 0 then
-                                    local possec = get_slider_value(se) * dur / 100 -- of mouse pos
-                                    local ch = get_chapter(possec)
-                                    if ch and ch.title and ch.title ~= "" then
-                                        elem_ass:new_event()
-                                        elem_ass:pos((thumbX + thumbfast.width / 2) * r_w, thumbY * r_h - tooltip_font_size)
-                                        elem_ass:an(an)
-                                        elem_ass:append(slider_lo.tooltip_style)
-                                        ass_append_alpha(elem_ass, slider_lo.alpha, 0)
-                                        elem_ass:append(string.format(user_opts.chapter_fmt, ch.title))
-                                    end
-                                end
-                            end
                         end
                     end
                 else
-                    if thumbfast.available then
+                    if element.thumbnail and thumbfast.available then
                         mp.commandv("script-message-to", "thumbfast", "clear")
                     end
                 end
@@ -867,19 +710,18 @@ function render_elements(master_ass)
             elseif not (element.content == nil) then
                 buttontext = element.content -- text objects
             end
-			
-			buttontext = buttontext:gsub(':%((.?.?.?)%) unknown ', ':%(%1%)')  --gsub('%) unknown %(\'', '')
+            
+            buttontext = buttontext:gsub(':%((.?.?.?)%) unknown ', ':%(%1%)')  --gsub('%) unknown %(\'', '')
 
             local maxchars = element.layout.button.maxchars
             -- 认为1个中文字符约等于1.5个英文字符
-            -- local charcount = buttontext:len()-  (buttontext:len()-select(2, buttontext:gsub('[^\128-\193]', '')))/1.5
             local charcount = (buttontext:len() + select(2, buttontext:gsub('[^\128-\193]', ''))*2) / 3
             if not (maxchars == nil) and (charcount > maxchars) then
                 local limit = math.max(0, maxchars - 3)
                 if (charcount > limit) then
                     while (charcount > limit) do
                         buttontext = buttontext:gsub('.[\128-\191]*$', '')
-						charcount = (buttontext:len() + select(2, buttontext:gsub('[^\128-\193]', ''))*2) / 3
+                        charcount = (buttontext:len() + select(2, buttontext:gsub('[^\128-\193]', ''))*2) / 3
                     end
                     buttontext = buttontext .. '...'
                 end
@@ -888,7 +730,7 @@ function render_elements(master_ass)
             elem_ass:append(buttontext)
             
             -- add tooltip
-			if not (element.tooltipF == nil) and element.enabled then
+            if not (element.tooltipF == nil) and element.enabled then
                 if mouse_hit(element) then
                     local tooltiplabel = element.tooltipF
                     local an = 1
@@ -896,23 +738,23 @@ function render_elements(master_ass)
                     local tx = get_virt_mouse_pos()
                     
                     if ty < osc_param.playresy / 2 then
-						ty = element.hitbox.y2
-						an = 7
-					end
+                        ty = element.hitbox.y2
+                        an = 7
+                    end
 
                     -- tooltip label
                     if type(element.tooltipF) == 'function' then
-						tooltiplabel = element.tooltipF()
-					else
-						tooltiplabel = element.tooltipF
-					end
+                        tooltiplabel = element.tooltipF()
+                    else
+                        tooltiplabel = element.tooltipF
+                    end
                     elem_ass:new_event()
                     elem_ass:pos(tx, ty)
                     elem_ass:an(an)
                     elem_ass:append(element.tooltip_style)
                     elem_ass:append(tooltiplabel)
                 end
-			end
+            end
         end
 
         master_ass:merge(elem_ass)
@@ -1047,7 +889,6 @@ end
 function new_element(name, type)
     elements[name] = {}
     elements[name].type = type
-    elements[name].name = name
 
     -- add default stuff
     elements[name].eventresponder = {}
@@ -1190,8 +1031,8 @@ layouts = function ()
 
     local osc_geo = {w, h}
 
-	osc_geo.w = osc_param.playresx
-	osc_geo.h = 180
+    osc_geo.w = osc_param.playresx
+    osc_geo.h = 180
 
     -- origin of the controllers, left/bottom corner
     local posX = 0
@@ -1203,31 +1044,32 @@ layouts = function ()
     add_area('input', get_hitbox_coords(posX, posY, 1, osc_geo.w, 104))
 
     -- area for show/hide
-    add_area('showhide', 0, 0, osc_param.playresx, osc_param.playresy)
-
+    add_area('showhide', 0, osc_param.playresy-200, osc_param.playresx, osc_param.playresy)
+    add_area('showhide_wc', osc_param.playresx*0.67, 0, osc_param.playresx, 48)
+    
     -- fetch values
     local osc_w, osc_h=
         osc_geo.w, osc_geo.h
 
-	--
+    --
     -- Controller Background
     --
-	local lo
+    local lo
 
-	new_element('TransBg', 'box')
-	lo = add_layout('TransBg')
-	lo.geometry = {x = posX, y = posY, an = 7, w = osc_w, h = 1}
-	lo.style = osc_styles.TransBg
-	lo.layer = 10
-	lo.alpha[3] = 0
-	
+    new_element('TransBg', 'box')
+    lo = add_layout('TransBg')
+    lo.geometry = {x = posX, y = posY, an = 7, w = osc_w, h = 1}
+    lo.style = osc_styles.TransBg
+    lo.layer = 10
+    lo.alpha[3] = 0
+    
     --
     -- Alignment
     --
-	local refX = osc_w / 2
-	local refY = posY
-	local geo
-	
+    local refX = osc_w / 2
+    local refY = posY
+    local geo
+    
     --
     -- Seekbar
     --
@@ -1241,14 +1083,10 @@ layouts = function ()
 
     lo = add_layout('seekbar')
     lo.geometry = {x = refX, y = refY - 96 , an = 5, w = osc_geo.w - 50, h = 16}
-	lo.style = osc_styles.SeekbarFg
+    lo.style = osc_styles.SeekbarFg
     lo.slider.gap = 7
     lo.slider.tooltip_style = osc_styles.Tooltip
     lo.slider.tooltip_an = 2
-
-    local showjump = user_opts.showjump
-    local offset = showjump and 60 or 0
-    
     --
     -- Volumebar
     --
@@ -1266,60 +1104,45 @@ layouts = function ()
     lo.slider.gap = 3
     lo.slider.tooltip_style = osc_styles.Tooltip
     lo.slider.tooltip_an = 2
-
-	-- buttons
+        
+    -- buttons
     lo = add_layout('pl_prev')
-    lo.geometry = {x = refX - 120 - offset, y = refY - 40 , an = 5, w = 30, h = 24}
+    lo.geometry = {x = refX - 120, y = refY - 40 , an = 5, w = 30, h = 24}
     lo.style = osc_styles.Ctrl2
 
-	lo = add_layout('skipback')
-    lo.geometry = {x = refX - 60 - offset, y = refY - 40 , an = 5, w = 30, h = 24}
+    lo = add_layout('skipback')
+    lo.geometry = {x = refX - 60, y = refY - 40 , an = 5, w = 30, h = 24}
     lo.style = osc_styles.Ctrl2
 
-
-    if showjump then
-        lo = add_layout('jumpback')
-        lo.geometry = {x = refX - 60, y = refY - 40 , an = 5, w = 30, h = 24}
-        lo.style = osc_styles.Ctrl2
-    end
-			
+            
     lo = add_layout('playpause')
     lo.geometry = {x = refX, y = refY - 40 , an = 5, w = 45, h = 45}
-    lo.style = osc_styles.Ctrl1	
-
-    if showjump then
-        lo = add_layout('jumpfrwd')
-        lo.geometry = {x = refX + 60, y = refY - 40 , an = 5, w = 30, h = 24}
-
-        -- HACK: jumpfrwd's icon must be mirrored for nonstandard # of seconds
-        -- as the font only has an icon without a number for rewinding
-        lo.style = (user_opts.jumpiconnumber and jumpicons[user_opts.jumpamount] ~= nil) and osc_styles.Ctrl2 or osc_styles.Ctrl2Flip
-    end
+    lo.style = osc_styles.Ctrl1    
 
     lo = add_layout('skipfrwd')
-    lo.geometry = {x = refX + 60 + offset, y = refY - 40 , an = 5, w = 30, h = 24}
-    lo.style = osc_styles.Ctrl2	
+    lo.geometry = {x = refX + 60, y = refY - 40 , an = 5, w = 30, h = 24}
+    lo.style = osc_styles.Ctrl2    
 
     lo = add_layout('pl_next')
-    lo.geometry = {x = refX + 120 + offset, y = refY - 40 , an = 5, w = 30, h = 24}
+    lo.geometry = {x = refX + 120, y = refY - 40 , an = 5, w = 30, h = 24}
     lo.style = osc_styles.Ctrl2
 
 
-	-- Time
+    -- Time
     lo = add_layout('tc_left')
     lo.geometry = {x = 25, y = refY - 84, an = 7, w = 64, h = 20}
-    lo.style = osc_styles.Time	
-	
+    lo.style = osc_styles.Time    
+    
 
     lo = add_layout('tc_right')
     lo.geometry = {x = osc_geo.w - 25 , y = refY -84, an = 9, w = 64, h = 20}
-    lo.style = osc_styles.Time	
+    lo.style = osc_styles.Time    
 
     lo = add_layout('cy_audio')
-	lo.geometry = {x = 37, y = refY - 40, an = 5, w = 24, h = 24}
+    lo.geometry = {x = 37, y = refY - 40, an = 5, w = 24, h = 24}
     lo.style = osc_styles.Ctrl3
     lo.visible = (osc_param.playresx >= 540)
-	
+    
     lo = add_layout('cy_sub')
     lo.geometry = {x = 87, y = refY - 40, an = 5, w = 24, h = 24}
     lo.style = osc_styles.Ctrl3
@@ -1330,12 +1153,12 @@ layouts = function ()
     lo.style = osc_styles.Ctrl3
     lo.visible = (osc_param.playresx >= 650)
 
-	lo = add_layout('tog_fs')
+    lo = add_layout('tog_fs')
     lo.geometry = {x = osc_geo.w - 37, y = refY - 40, an = 5, w = 24, h = 24}
     lo.style = osc_styles.Ctrl3
-    lo.visible = (osc_param.playresx >= 540)    
+    lo.visible = (osc_param.playresx >= 540)
 
-	lo = add_layout('tog_info')
+    lo = add_layout('tog_info')
     lo.geometry = {x = osc_geo.w - 87, y = refY - 40, an = 5, w = 24, h = 24}
     lo.style = osc_styles.Ctrl3
     lo.visible = (osc_param.playresx >= 600)
@@ -1344,8 +1167,8 @@ layouts = function ()
     lo = add_layout('title')
     lo.geometry = geo
     lo.style = string.format('%s{\\clip(%f,%f,%f,%f)}', osc_styles.Title,
-								geo.x, geo.y - geo.h, geo.x + geo.w , geo.y)
-	lo.alpha[3] = 0
+                                geo.x, geo.y - geo.h, geo.x + geo.w , geo.y)
+    lo.alpha[3] = 0
     lo.button.maxchars = geo.w / 23
 end
 
@@ -1364,7 +1187,6 @@ function update_options(list)
     validate_user_opts()
     request_tick()
     visibility_mode(user_opts.visibility, true)
-    update_duration_watch()
     request_init()
 end
 
@@ -1414,7 +1236,7 @@ function osc_init()
     -- prev
     ne = new_element('pl_prev', 'button')
 
-    ne.content = icons.previous
+    ne.content = '\xEF\x8E\xB5'
     ne.enabled = (pl_pos > 1) or (loop ~= 'no')
     ne.eventresponder['mbtn_left_up'] =
         function ()
@@ -1426,7 +1248,7 @@ function osc_init()
     --next
     ne = new_element('pl_next', 'button')
 
-    ne.content = icons.next
+    ne.content = '\xEF\x8E\xB4'
     ne.enabled = (have_pl and (pl_pos < pl_count)) or (loop ~= 'no')
     ne.eventresponder['mbtn_left_up'] =
         function ()
@@ -1441,10 +1263,10 @@ function osc_init()
     ne = new_element('playpause', 'button')
 
     ne.content = function ()
-        if mp.get_property('pause') == 'yes' then
-            return (icons.play)
+        if mp.get_property('pause') == 'no' then
+            return ('\xEF\x8E\xA7')
         else
-            return (icons.pause)
+            return ('\xEF\x8E\xAA')
         end
     end
     ne.eventresponder['mbtn_left_up'] =
@@ -1452,92 +1274,33 @@ function osc_init()
     --ne.eventresponder['mbtn_right_up'] =
     --    function () mp.commandv('script-binding', 'open-file-dialog') end
 
-    if user_opts.showjump then
-        local jumpamount = user_opts.jumpamount
-        local jumpmode = user_opts.jumpmode
-        local icons = jumpicons.default
-        if user_opts.jumpiconnumber then
-            icons = jumpicons[jumpamount] or jumpicons.default
-        end
-
-        --jumpback
-        ne = new_element('jumpback', 'button')
-
-        ne.softrepeat = true
-        ne.content = icons[1]
-        ne.eventresponder['mbtn_left_down'] =
-            --function () mp.command('seek -5') end
-            function () mp.commandv('seek', -jumpamount, jumpmode) end
-        ne.eventresponder['shift+mbtn_left_down'] =
-            function () mp.commandv('frame-back-step') end
-        ne.eventresponder['mbtn_right_down'] =
-            --function () mp.command('seek -60') end
-            function () mp.commandv('seek', -60, jumpmode) end
-        ne.eventresponder['enter'] =
-            --function () mp.command('seek -5') end
-            function () mp.commandv('seek', -jumpamount, jumpmode) end
-
-
-        --jumpfrwd
-        ne = new_element('jumpfrwd', 'button')
-
-        ne.softrepeat = true
-        ne.content = icons[2]
-        ne.eventresponder['mbtn_left_down'] =
-            --function () mp.command('seek +5') end
-            function () mp.commandv('seek', jumpamount, jumpmode) end
-        ne.eventresponder['shift+mbtn_left_down'] =
-            function () mp.commandv('frame-step') end
-        ne.eventresponder['mbtn_right_down'] =
-            --function () mp.command('seek +60') end
-            function () mp.commandv('seek', 60, jumpmode) end
-        ne.eventresponder['enter'] =
-            --function () mp.command('seek +5') end
-            function () mp.commandv('seek', jumpamount, jumpmode) end
-    end
-    
-
     --skipback
     ne = new_element('skipback', 'button')
 
     ne.softrepeat = true
-    ne.content = icons.backward
-    ne.enabled = (have_ch) -- disables button when no chapters available.
+    ne.content = '\xEF\x8E\xA0'
     ne.eventresponder['mbtn_left_down'] =
         --function () mp.command('seek -5') end
-        --function () mp.commandv('seek', -5, 'relative', 'keyframes') end
-        function () mp.commandv("add", "chapter", -1) end
-    --ne.eventresponder['shift+mbtn_left_down'] =
-        --function () mp.commandv('frame-back-step') end
+        function () mp.commandv('seek', -5, 'relative', 'keyframes') end
+    ne.eventresponder['shift+mbtn_left_down'] =
+        function () mp.commandv('frame-back-step') end
     ne.eventresponder['mbtn_right_down'] =
-        function () show_message(get_chapterlist()) end
         --function () mp.command('seek -60') end
-        --function () mp.commandv('seek', -60, 'relative', 'keyframes') end
-    ne.eventresponder['enter'] =
-        --function () mp.command('seek -5') end
-        --function () mp.commandv('seek', -5, 'relative', 'keyframes') end
-        function () mp.commandv("add", "chapter", -1) end
+        function () mp.commandv('seek', -60, 'relative', 'keyframes') end
 
     --skipfrwd
     ne = new_element('skipfrwd', 'button')
 
     ne.softrepeat = true
-    ne.content = icons.forward
-    ne.enabled = (have_ch) -- disables button when no chapters available.
+    ne.content = '\xEF\x8E\x9F'
     ne.eventresponder['mbtn_left_down'] =
         --function () mp.command('seek +5') end
-        --function () mp.commandv('seek', 5, 'relative', 'keyframes') end
-        function () mp.commandv("add", "chapter", 1) end
-    --ne.eventresponder['shift+mbtn_left_down'] =
-        --function () mp.commandv('frame-step') end
+        function () mp.commandv('seek', 5, 'relative', 'keyframes') end
+    ne.eventresponder['shift+mbtn_left_down'] =
+        function () mp.commandv('frame-step') end
     ne.eventresponder['mbtn_right_down'] =
-        function () show_message(get_chapterlist()) end
         --function () mp.command('seek +60') end
-        --function () mp.commandv('seek', 60, 'relative', 'keyframes') end
-    ne.eventresponder['enter'] =
-        --function () mp.command('seek +5') end
-        --function () mp.commandv('seek', 5, 'relative', 'keyframes') end
-        function () mp.commandv("add", "chapter", 1) end
+        function () mp.commandv('seek', 60, 'relative', 'keyframes') end
 
     --
     update_tracklist()
@@ -1545,24 +1308,23 @@ function osc_init()
     --cy_audio
     ne = new_element('cy_audio', 'button')
     ne.enabled = (#tracks_osc.audio > 0)
-    ne.off = (get_track('audio') == 0)
     ne.visible = (osc_param.playresx >= 540)
-    ne.content = icons.audio
+    ne.content = '\xEF\x8E\xB7'
     ne.tooltip_style = osc_styles.Tooltip
     ne.tooltipF = function ()
-		local msg = texts.off
+        local msg = texts.off
         if not (get_track('audio') == 0) then
             msg = (texts.audio .. ' [' .. get_track('audio') .. ' ∕ ' .. #tracks_osc.audio .. '] ')
-            local prop = mp.get_property('current-tracks/audio/title') --('current-tracks/audio/lang')
+            local prop = mp.get_property('current-tracks/audio/lang')
             if not prop then
-				prop = texts.na
-			end
-			msg = msg .. '[' .. prop .. ']'
-			prop = mp.get_property('current-tracks/audio/lang') --('current-tracks/audio/title')
-			if prop then
-				msg = msg .. ' ' .. prop
-			end
-			return msg
+                prop = texts.na
+            end
+            msg = msg .. '[' .. prop .. ']'
+            prop = mp.get_property('current-tracks/audio/title')
+            if prop then
+                msg = msg .. ' ' .. prop
+            end
+            return msg
         end
         return msg
     end
@@ -1570,32 +1332,29 @@ function osc_init()
         function () set_track('audio', 1) end
     ne.eventresponder['mbtn_right_up'] =
         function () set_track('audio', -1) end
-    ne.eventresponder['shift+mbtn_left_down'] =
+    ne.eventresponder['mbtn_mid_up'] =
         function () show_message(get_tracklist('audio')) end
-    ne.eventresponder['enter'] =
-        function () set_track('audio', 1); show_message(get_tracklist('audio')) end
                 
     --cy_sub
     ne = new_element('cy_sub', 'button')
     ne.enabled = (#tracks_osc.sub > 0)
-    ne.off = (get_track('sub') == 0)
     ne.visible = (osc_param.playresx >= 600)
-    ne.content = icons.sub
+    ne.content = '\xEF\x8F\x93'
     ne.tooltip_style = osc_styles.Tooltip
     ne.tooltipF = function ()
-		local msg = texts.off
+        local msg = texts.off
         if not (get_track('sub') == 0) then
             msg = (texts.subtitle .. ' [' .. get_track('sub') .. ' ∕ ' .. #tracks_osc.sub .. '] ')
             local prop = mp.get_property('current-tracks/sub/lang')
             if not prop then
-				prop = texts.na
-			end
-			msg = msg .. '[' .. prop .. ']'
-			prop = mp.get_property('current-tracks/sub/title')
-			if prop then
-				msg = msg .. ' ' .. prop
-			end
-			return msg
+                prop = texts.na
+            end
+            msg = msg .. '[' .. prop .. ']'
+            prop = mp.get_property('current-tracks/sub/title')
+            if prop then
+                msg = msg .. ' ' .. prop
+            end
+            return msg
         end
         return msg
     end
@@ -1603,36 +1362,30 @@ function osc_init()
         function () set_track('sub', 1) end
     ne.eventresponder['mbtn_right_up'] =
         function () set_track('sub', -1) end
-    ne.eventresponder['shift+mbtn_left_down'] =
+    ne.eventresponder['mbtn_mid_up'] =
         function () show_message(get_tracklist('sub')) end
-    ne.eventresponder['enter'] =
-        function () set_track('sub', 1); show_message(get_tracklist('sub')) end
-    
+        
     -- vol_ctrl
     ne = new_element('vol_ctrl', 'button')
     ne.enabled = (get_track('audio')>0)
     ne.visible = (osc_param.playresx >= 650) and user_opts.volumecontrol
     ne.content = function ()
         if (state.mute) then
-            return (icons.volume_mute)
+            return ('\xEF\x8E\xBB')
         else
-            return (icons.volume)
+            return ('\xEF\x8E\xBC')
         end
     end
     ne.eventresponder['mbtn_left_up'] =
         function () mp.commandv('cycle', 'mute') end
-    ne.eventresponder["wheel_up_press"] =
-        function () mp.commandv("osd-auto", "add", "volume", 5) end
-    ne.eventresponder["wheel_down_press"] =
-        function () mp.commandv("osd-auto", "add", "volume", -5) end
-    
+        
     --tog_fs
     ne = new_element('tog_fs', 'button')
     ne.content = function ()
         if (state.fullscreen) then
-            return (icons.minimize)
+            return ('\xEF\x85\xAC')
         else
-            return (icons.fullscreen)
+            return ('\xEF\x85\xAD')
         end
     end
     ne.visible = (osc_param.playresx >= 540)
@@ -1641,7 +1394,7 @@ function osc_init()
 
     --tog_info
     ne = new_element('tog_info', 'button')
-    ne.content = icons.info
+    ne.content = ''
     ne.visible = (osc_param.playresx >= 600)
     ne.eventresponder['mbtn_left_up'] =
         function () mp.commandv('script-binding', 'stats/display-stats-toggle') end
@@ -1649,13 +1402,12 @@ function osc_init()
     -- title
     ne = new_element('title', 'button')
     ne.content = function ()
-        local title = state.forced_title or
-                      mp.command_native({"expand-text", user_opts.title})
+        local title = mp.command_native({'expand-text', user_opts.title})
         if state.paused then
-			title = title:gsub('\\n', ' '):gsub('\\$', ''):gsub('{','\\{')
-		else
-			title = title:gsub('\\n', ' '):gsub('\\$', ''):gsub('{','\\{') --title = ' '
-		end
+            title = title:gsub('\\n', ' '):gsub('\\$', ''):gsub('{','\\{')
+        else
+            title = ' '
+        end
         return not (title == '') and title or ' '
     end
     ne.visible = osc_param.playresy >= 320 and user_opts.showtitle
@@ -1664,7 +1416,7 @@ function osc_init()
     ne = new_element('seekbar', 'slider')
 
     ne.enabled = not (mp.get_property('percent-pos') == nil)
-    state.slider_element = ne.enabled and ne or nil  -- used for forced_title
+    ne.thumbnail = true
     ne.slider.markerF = function ()
         local duration = mp.get_property_number('duration', nil)
         if not (duration == nil) then
@@ -1683,7 +1435,23 @@ function osc_init()
     ne.slider.tooltipF = function (pos)
         local duration = mp.get_property_number('duration', nil)
         if not ((duration == nil) or (pos == nil)) then
-            possec = duration * (pos / 100)
+            local possec = duration * (pos / 100)
+			local chapters = mp.get_property_native('chapter-list', {})
+			if #chapters > 0 then
+				local ch = #chapters
+				local i
+				for i = 1, #chapters do
+					if chapters[i].time / duration * 100 >= pos then
+						ch = i - 1
+						break
+					end
+				end
+				if ch == 0 then
+					return string.format('[%s] [0/%d]', mp.format_time(possec), #chapters)
+				elseif chapters[ch].title then 
+					return string.format('[%s] [%d/%d][%s]', mp.format_time(possec), ch, #chapters, chapters[ch].title)
+				end
+			end
             return mp.format_time(possec)
         else
             return ''
@@ -1716,7 +1484,7 @@ function osc_init()
     end
     ne.eventresponder['mouse_move'] = --keyframe seeking when mouse is dragged
         function (element)
-			if not element.state.mbtnleft then return end -- allow drag for mbtnleft only!
+            if not element.state.mbtnleft then return end -- allow drag for mbtnleft only!
             -- mouse move events may pile up during seeking and may still get
             -- sent when the user is done seeking, so we need to throw away
             -- identical seeks
@@ -1734,30 +1502,30 @@ function osc_init()
         end
     ne.eventresponder['mbtn_left_down'] = --exact seeks on single clicks
         function (element)
-			mp.commandv('seek', get_slider_value(element), 'absolute-percent', 'exact')
-			element.state.mbtnleft = true
-		end
-	ne.eventresponder['mbtn_left_up'] =
-		function (element) element.state.mbtnleft = false end
+            mp.commandv('seek', get_slider_value(element), 'absolute-percent', 'exact')
+            element.state.mbtnleft = true
+        end
+    ne.eventresponder['mbtn_left_up'] =
+        function (element) element.state.mbtnleft = false end
     ne.eventresponder['mbtn_right_down'] = --seeks to chapter start
         function (element)
-			local duration = mp.get_property_number('duration', nil)
-			if not (duration == nil) then
-				local chapters = mp.get_property_native('chapter-list', {})
-				if #chapters > 0 then
-					local pos = get_slider_value(element)
-					local ch = #chapters
-					for n = 1, ch do
-						if chapters[n].time / duration * 100 >= pos then
-							ch = n - 1
-							break
-						end
-					end
-					mp.commandv('set', 'chapter', ch - 1)
-					--if chapters[ch].title then show_message(chapters[ch].time) end
-				end
-			end
-		end
+            local duration = mp.get_property_number('duration', nil)
+            if not (duration == nil) then
+                local chapters = mp.get_property_native('chapter-list', {})
+                if #chapters > 0 then
+                    local pos = get_slider_value(element)
+                    local ch = #chapters
+                    for n = 1, ch do
+                        if chapters[n].time / duration * 100 >= pos then
+                            ch = n - 1
+                            break
+                        end
+                    end
+                    mp.commandv('set', 'chapter', ch - 1)
+                    --if chapters[ch].title then show_message(chapters[ch].time) end
+                end
+            end
+        end
     ne.eventresponder['reset'] =
         function (element) element.state.lastseek = nil end
 
@@ -1765,77 +1533,69 @@ function osc_init()
     ne = new_element('volumebar', 'slider')
     ne.visible = (osc_param.playresx >= 700) and user_opts.volumecontrol
     ne.enabled = (get_track('audio')>0)
-    ne.slider.markerF = function ()
-        return {}
-    end
-    ne.slider.seekRangesF = function()
-      return nil
-    end
+    ne.slider.tooltipF = 
+		function (pos)
+			local refpos = state.proc_volume
+			if refpos > 100 then refpos = 100 end
+			if pos+3 >= refpos and pos-3 <= refpos then
+				return string.format('%d', state.proc_volume)
+			else
+				return ''
+			end
+		end
+    ne.slider.markerF = nil
+    ne.slider.seekRangesF = nil
     ne.slider.posF =
         function ()
-            local val = mp.get_property_number('volume', nil)
-            return val*val/100
+            return state.proc_volume
         end
     ne.eventresponder['mouse_move'] =
         function (element)
-            if not element.state.mbtnleft then return end -- allow drag for mbtnleft only!
+            if not element.state.mbtnleft then return end
             local seekto = get_slider_value(element)
             if (element.state.lastseek == nil) or
                 (not (element.state.lastseek == seekto)) then
-                    mp.commandv('set', 'volume', 10*math.sqrt(seekto))
+                    set_volume(seekto)
                     element.state.lastseek = seekto
             end
         end
     ne.eventresponder['mbtn_left_down'] = --exact seeks on single clicks
         function (element)
             local seekto = get_slider_value(element)
-            mp.commandv('set', 'volume', 10*math.sqrt(seekto))
+            set_volume(seekto)
             element.state.mbtnleft = true
         end
     ne.eventresponder['mbtn_left_up'] =
-        function (element) element.state.mbtnleft = false end
+        function (element)
+			element.state.mbtnleft = false
+		end
     ne.eventresponder['reset'] =
         function (element) element.state.lastseek = nil end
-    ne.eventresponder["wheel_up_press"] =
-        function () mp.commandv("osd-auto", "add", "volume", 5) end
-    ne.eventresponder["wheel_down_press"] =
-        function () mp.commandv("osd-auto", "add", "volume", -5) end
-    
+    ne.eventresponder['wheel_up_press'] =
+        function (element)
+			set_volume(state.proc_volume+5)
+		end
+    ne.eventresponder['wheel_down_press'] =
+        function (element)
+			set_volume(state.proc_volume-5)
+		end
     -- tc_left (current pos)
     ne = new_element('tc_left', 'button')
-    ne.content = function ()
-	if (state.fulltime) then
-		return (mp.get_property_osd('playback-time/full'))
-	else
-		return (mp.get_property_osd('playback-time'))
-	end
-    end
-    ne.eventresponder["mbtn_left_up"] = function ()
-        state.fulltime = not state.fulltime
-        request_init()
-    end
+    ne.content = function () return (mp.get_property_osd('playback-time')) end
+
     -- tc_right (total/remaining time)
     ne = new_element('tc_right', 'button')
     ne.content = function ()
         if (mp.get_property_number('duration', 0) <= 0) then return '--:--:--' end
         if (state.rightTC_trem) then
-		if (state.fulltime) then
-			return ('-'..mp.get_property_osd('playtime-remaining/full'))
-		else
-			return ('-'..mp.get_property_osd('playtime-remaining'))
-		end
+            return ('-'..mp.get_property_osd('playtime-remaining'))
         else
-		if (state.fulltime) then
-			return (mp.get_property_osd('duration/full'))
-		else
-			return (mp.get_property_osd('duration'))
-		end
-			
+            return (mp.get_property_osd('duration'))
         end
     end
     ne.eventresponder['mbtn_left_up'] =
         function () state.rightTC_trem = not state.rightTC_trem end
-
+        
     -- load layout
     layouts()
 
@@ -1866,10 +1626,6 @@ function show_osc()
     state.showtime = mp.get_time()
 
     osc_visible(true)
-    
-    if user_opts.keyboardnavigation == true then
-        osc_enable_key_bindings()
-    end
 
     if (user_opts.fadeduration > 0) then
         state.anitype = nil
@@ -1883,9 +1639,6 @@ function hide_osc()
         -- no-op and won't render again to remove the osc, so do that manually.
         state.osc_visible = false
         render_wipe()
-        if user_opts.keyboardnavigation == true then
-            osc_disable_key_bindings()
-        end
     elseif (user_opts.fadeduration > 0) then
         if not(state.osc_visible == false) then
             state.anitype = 'out'
@@ -1905,16 +1658,15 @@ end
 
 function pause_state(name, enabled)
     state.paused = enabled
-    mp.add_timeout(0.1, function() state.osd:update() end) 
-    if user_opts.showonpause then
-		if enabled then
-			state.lastvisibility = user_opts.visibility
-			visibility_mode("always", true)
-			show_osc()
-		else
-			visibility_mode(state.lastvisibility, true)
-		end
-	end
+    if user_opts.showtitle then
+        if enabled then
+            state.lastvisibility = user_opts.visibility
+            visibility_mode('always', true)
+            show_osc()
+        else
+            visibility_mode(state.lastvisibility, true)
+        end
+    end
     request_tick()
 end
 
@@ -1987,14 +1739,7 @@ function render()
     end
 
     -- init management
-    if state.active_element then
-        -- mouse is held down on some element - keep ticking and igore initReq
-        -- till it's released, or else the mouse-up (click) will misbehave or
-        -- get ignored. that's because osc_init() recreates the osc elements,
-        -- but mouse handling depends on the elements staying unmodified
-        -- between mouse-down and mouse-up (using the index active_element).
-        request_tick()
-    elseif state.initREQ then
+    if state.initREQ then
         osc_init()
         state.initREQ = false
 
@@ -2210,76 +1955,60 @@ function process_event(source, what)
         if element_has_action(elements[n], action) then
             elements[n].eventresponder[action](elements[n])
         end
+        request_tick()
     end
-
-    -- ensure rendering after any (mouse) event - icons could change etc
-    request_tick()
 end
 
-local logo_lines = {
-    -- White border
-    "{\\c&HE5E5E5&\\p6}m 895 10 b 401 10 0 410 0 905 0 1399 401 1800 895 1800 1390 1800 1790 1399 1790 905 1790 410 1390 10 895 10 {\\p0}",
-    -- Purple fill
-    "{\\c&H682167&\\p6}m 925 42 b 463 42 87 418 87 880 87 1343 463 1718 925 1718 1388 1718 1763 1343 1763 880 1763 418 1388 42 925 42{\\p0}",
-    -- Darker fill
-    "{\\c&H430142&\\p6}m 1605 828 b 1605 1175 1324 1456 977 1456 631 1456 349 1175 349 828 349 482 631 200 977 200 1324 200 1605 482 1605 828{\\p0}",
-    -- White fill
-    "{\\c&HDDDBDD&\\p6}m 1296 910 b 1296 1131 1117 1310 897 1310 676 1310 497 1131 497 910 497 689 676 511 897 511 1117 511 1296 689 1296 910{\\p0}",
-    -- Triangle
-    "{\\c&H691F69&\\p6}m 762 1113 l 762 708 b 881 776 1000 843 1119 911 1000 978 881 1046 762 1113{\\p0}",
-}
+function show_logo()
+    local osd_w, osd_h, osd_aspect = mp.get_osd_size()
+    osd_w, osd_h = 360*osd_aspect, 360
+    local logo_x, logo_y = osd_w/2, osd_h/2-20
+    local ass = assdraw.ass_new()
+    ass:new_event()
+    ass:pos(logo_x, logo_y)
+    ass:append('{\\1c&H8E348D&\\3c&H0&\\3a&H60&\\blur1\\bord0.5}')
+    ass:draw_start()
+    ass_draw_cir_cw(ass, 0, 0, 100)
+    ass:draw_stop()
+    
+    ass:new_event()
+    ass:pos(logo_x, logo_y)
+    ass:append('{\\1c&H632462&\\bord0}')
+    ass:draw_start()
+    ass_draw_cir_cw(ass, 6, -6, 75)
+    ass:draw_stop()
 
-local santa_hat_lines = {
-    -- Pompoms
-    "{\\c&HC0C0C0&\\p6}m 500 -323 b 491 -322 481 -318 475 -311 465 -312 456 -319 446 -318 434 -314 427 -304 417 -297 410 -290 404 -282 395 -278 390 -274 387 -267 381 -265 377 -261 379 -254 384 -253 397 -244 409 -232 425 -228 437 -228 446 -218 457 -217 462 -216 466 -213 468 -209 471 -205 477 -203 482 -206 491 -211 499 -217 508 -222 532 -235 556 -249 576 -267 584 -272 584 -284 578 -290 569 -305 550 -312 533 -309 523 -310 515 -316 507 -321 505 -323 503 -323 500 -323{\\p0}",
-    "{\\c&HE0E0E0&\\p6}m 315 -260 b 286 -258 259 -240 246 -215 235 -210 222 -215 211 -211 204 -188 177 -176 172 -151 170 -139 163 -128 154 -121 143 -103 141 -81 143 -60 139 -46 125 -34 129 -17 132 -1 134 16 142 30 145 56 161 80 181 96 196 114 210 133 231 144 266 153 303 138 328 115 373 79 401 28 423 -24 446 -73 465 -123 483 -174 487 -199 467 -225 442 -227 421 -232 402 -242 384 -254 364 -259 342 -250 322 -260 320 -260 317 -261 315 -260{\\p0}",
-    -- Main cap
-    "{\\c&H0000F0&\\p6}m 1151 -523 b 1016 -516 891 -458 769 -406 693 -369 624 -319 561 -262 526 -252 465 -235 479 -187 502 -147 551 -135 588 -111 1115 165 1379 232 1909 761 1926 800 1952 834 1987 858 2020 883 2053 912 2065 952 2088 1000 2146 962 2139 919 2162 836 2156 747 2143 662 2131 615 2116 567 2122 517 2120 410 2090 306 2089 199 2092 147 2071 99 2034 64 1987 5 1928 -41 1869 -86 1777 -157 1712 -256 1629 -337 1578 -389 1521 -436 1461 -476 1407 -509 1343 -507 1284 -515 1240 -519 1195 -521 1151 -523{\\p0}",
-    -- Cap shadow
-    "{\\c&H0000AA&\\p6}m 1657 248 b 1658 254 1659 261 1660 267 1669 276 1680 284 1689 293 1695 302 1700 311 1707 320 1716 325 1726 330 1735 335 1744 347 1752 360 1761 371 1753 352 1754 331 1753 311 1751 237 1751 163 1751 90 1752 64 1752 37 1767 14 1778 -3 1785 -24 1786 -45 1786 -60 1786 -77 1774 -87 1760 -96 1750 -78 1751 -65 1748 -37 1750 -8 1750 20 1734 78 1715 134 1699 192 1694 211 1689 231 1676 246 1671 251 1661 255 1657 248 m 1909 541 b 1914 542 1922 549 1917 539 1919 520 1921 502 1919 483 1918 458 1917 433 1915 407 1930 373 1942 338 1947 301 1952 270 1954 238 1951 207 1946 214 1947 229 1945 239 1939 278 1936 318 1924 356 1923 362 1913 382 1912 364 1906 301 1904 237 1891 175 1887 150 1892 126 1892 101 1892 68 1893 35 1888 2 1884 -9 1871 -20 1859 -14 1851 -6 1854 9 1854 20 1855 58 1864 95 1873 132 1883 179 1894 225 1899 273 1908 362 1910 451 1909 541{\\p0}",
-    -- Brim and tip pompom
-    "{\\c&HF8F8F8&\\p6}m 626 -191 b 565 -155 486 -196 428 -151 387 -115 327 -101 304 -47 273 2 267 59 249 113 219 157 217 213 215 265 217 309 260 302 285 283 373 264 465 264 555 257 608 252 655 292 709 287 759 294 816 276 863 298 903 340 972 324 1012 367 1061 394 1125 382 1167 424 1213 462 1268 482 1322 506 1385 546 1427 610 1479 662 1510 690 1534 725 1566 752 1611 796 1664 830 1703 880 1740 918 1747 986 1805 1005 1863 991 1897 932 1916 880 1914 823 1945 777 1961 725 1979 673 1957 622 1938 575 1912 534 1862 515 1836 473 1790 417 1755 351 1697 305 1658 266 1633 216 1593 176 1574 138 1539 116 1497 110 1448 101 1402 77 1371 37 1346 -16 1295 15 1254 6 1211 -27 1170 -62 1121 -86 1072 -104 1027 -128 976 -133 914 -130 851 -137 794 -162 740 -181 679 -168 626 -191 m 2051 917 b 1971 932 1929 1017 1919 1091 1912 1149 1923 1214 1970 1254 2000 1279 2027 1314 2066 1325 2139 1338 2212 1295 2254 1238 2281 1203 2287 1158 2282 1116 2292 1061 2273 1006 2229 970 2206 941 2167 938 2138 918{\\p0}",
-}
+    ass:new_event()
+    ass:pos(logo_x, logo_y)
+    ass:append('{\\1c&HFFFFFF&\\bord0}')
+    ass:draw_start()
+    ass_draw_cir_cw(ass, -4, 4, 50)
+    ass:draw_stop()
+        
+    ass:new_event()
+    ass:pos(logo_x, logo_y)
+    ass:append('{\\1c&H632462&\\bord&}')
+    ass:draw_start()
+    ass:move_to(-20, -20)
+    ass:line_to(23.3, 5)
+    ass:line_to(-20, 30)
+    ass:draw_stop()
+    
+    ass:new_event()
+    ass:pos(logo_x, logo_y+110)
+    ass:an(8)
+    ass:append(texts.welcome)
+    set_osd(osd_w, osd_h, ass.text)
+end
 
 -- called by mpv on every frame
 function tick()
     if (not state.enabled) then return end
 
     if (state.idle) then
-	   
+        show_logo()
         -- render idle message
         msg.trace('idle message')
-        local _, _, display_aspect = mp.get_osd_size()
-        local display_h = 360
-        local display_w = display_h * display_aspect
-        -- logo is rendered at 2^(6-1) = 32 times resolution with size 1800x1800
-        local icon_x, icon_y = (display_w - 1800 / 32) / 2, 140
-        local line_prefix = ('{\\rDefault\\an7\\1a&H00&\\bord0\\shad0\\pos(%f,%f)}'):format(icon_x, icon_y)
-
-        local ass = assdraw.ass_new()
-        -- mpv logo
-        if user_opts.idlescreen then
-            for i, line in ipairs(logo_lines) do
-                ass:new_event()
-                ass:append(line_prefix .. line)
-            end
-        end
-
-        -- Santa hat
-        if is_december and user_opts.idlescreen and not user_opts.greenandgrumpy then
-            for i, line in ipairs(santa_hat_lines) do
-                ass:new_event()
-                ass:append(line_prefix .. line)
-            end
-        end
-   
-        if user_opts.idlescreen then
-            ass:new_event()
-            ass:pos(display_w / 2, icon_y + 65)
-            ass:an(8)
-            ass:append('Drop files or URLs to play here.')
-        end
-        set_osd(display_w, display_h, ass.text)
 
         if state.showhide_enabled then
             mp.disable_key_bindings('showhide')
@@ -2301,17 +2030,7 @@ function tick()
     state.tick_last_time = mp.get_time()
 
     if state.anitype ~= nil then
-        -- state.anistart can be nil - animation should now start, or it can
-        -- be a timestamp when it started. state.idle has no animation.
-        if not state.idle and
-           (not state.anistart or
-            mp.get_time() < 1 + state.anistart + user_opts.fadeduration/1000)
-        then
-            -- animating or starting, or still within 1s past the deadline
-            request_tick()
-        else
-            kill_animation()
-        end
+        request_tick()
     end
 end
 
@@ -2339,42 +2058,12 @@ function enable_osc(enable)
     end
 end
 
--- duration is observed for the sole purpose of updating chapter markers
--- positions. live streams with chapters are very rare, and the update is also
--- expensive (with request_init), so it's only observed when we have chapters
--- and the user didn't disable the livemarkers option (update_duration_watch).
-function on_duration() request_init() end
-
-local duration_watched = false
-function update_duration_watch()
-    local want_watch = user_opts.livemarkers and
-                       (mp.get_property_number("chapters", 0) or 0) > 0 and
-                       true or false  -- ensure it's a boolean
-
-    if (want_watch ~= duration_watched) then
-        if want_watch then
-            mp.observe_property("duration", nil, on_duration)
-        else
-            mp.unobserve_property(on_duration)
-        end
-        duration_watched = want_watch
-    end
-end
-
 validate_user_opts()
-update_duration_watch()
 
 mp.register_event('shutdown', shutdown)
 mp.register_event('start-file', request_init)
 mp.observe_property('track-list', nil, request_init)
 mp.observe_property('playlist', nil, request_init)
-mp.observe_property("chapter-list", "native", function(_, list)
-    list = list or {}  -- safety, shouldn't return nil
-    table.sort(list, function(a, b) return a.time < b.time end)
-    state.chapter_list = list
-    update_duration_watch()
-    request_init()
-end)
 
 mp.register_script_message('osc-message', show_message)
 mp.register_script_message('osc-chapterlist', function(dur)
@@ -2402,6 +2091,16 @@ mp.observe_property('mute', 'bool',
         state.mute = val
     end
 )
+mp.observe_property('volume', 'number',
+	function(name, val)
+		state.sys_volume = val
+		if user_opts.processvolume then
+			state.proc_volume = val*val/100
+		else
+			state.proc_volume = val
+		end
+	end
+)
 mp.observe_property('border', 'bool',
     function(name, val)
         state.border = val
@@ -2447,21 +2146,17 @@ do_enable_keybindings()
 
 --mouse input bindings
 mp.set_key_bindings({
-    {"mbtn_left",           function(e) process_event("mbtn_left", "up") end,
-                            function(e) process_event("mbtn_left", "down")  end},
-    {"shift+mbtn_left",     function(e) process_event("shift+mbtn_left", "up") end,
-                            function(e) process_event("shift+mbtn_left", "down")  end},
-    {"mbtn_right",          function(e) process_event("mbtn_right", "up") end,
-                            function(e) process_event("mbtn_right", "down")  end},
-    -- alias to shift_mbtn_left for single-handed mouse use
-    {"mbtn_mid",            function(e) process_event("shift+mbtn_left", "up") end,
-                            function(e) process_event("shift+mbtn_left", "down")  end},
-    {"wheel_up",            function(e) process_event("wheel_up", "press") end},
-    {"wheel_down",          function(e) process_event("wheel_down", "press") end},
-    {"mbtn_left_dbl",       "ignore"},
-    {"shift+mbtn_left_dbl", "ignore"},
-    {"mbtn_right_dbl",      "ignore"},
-}, "input", "force")
+    {'mbtn_left',           function(e) process_event('mbtn_left', 'up') end,
+                            function(e) process_event('mbtn_left', 'down')  end},
+    {'mbtn_right',          function(e) process_event('mbtn_right', 'up') end,
+                            function(e) process_event('mbtn_right', 'down')  end},
+    {'mbtn_mid',            function(e) process_event('mbtn_mid', 'up') end,
+                            function(e) process_event('mbtn_mid', 'down')  end},
+    {'wheel_up',            function(e) process_event('wheel_up', 'press') end},
+    {'wheel_down',          function(e) process_event('wheel_down', 'press') end},
+    {'mbtn_left_dbl',       'ignore'},
+    {'mbtn_right_dbl',      'ignore'},
+}, 'input', 'force')
 mp.enable_key_bindings('input')
 
 mp.set_key_bindings({
@@ -2490,16 +2185,6 @@ end
 -- mode can be auto/always/never/cycle
 -- the modes only affect internal variables and not stored on its own.
 function visibility_mode(mode, no_osd)
-    if mode == "cycle" then
-        if not state.enabled then
-            mode = "auto"
-        elseif user_opts.visibility ~= "always" then
-            mode = "always"
-        else
-            mode = "never"
-        end
-    end
-
     if mode == 'auto' then
         always_on(false)
         enable_osc(true)
@@ -2509,13 +2194,12 @@ function visibility_mode(mode, no_osd)
     elseif mode == 'never' then
         enable_osc(false)
     else
-        msg.warn('Ignoring unknown visibility mode \"' .. mode .. '\"')
+        msg.warn('Ignoring unknown visibility mode \'' .. mode .. '\'')
         return
     end
-
-	user_opts.visibility = mode
-    utils.shared_script_property_set("osc-visibility", mode)
-
+    
+    user_opts.visibility = mode
+    
     if not no_osd and tonumber(mp.get_property('osd-level')) >= 1 then
         mp.osd_message('OSC visibility: ' .. mode)
     end
@@ -2529,201 +2213,6 @@ function visibility_mode(mode, no_osd)
     request_tick()
 end
 
-
--- KeyboardControl
---
-
-local osc_key_bindings = {}
-
-function osc_kb_control_up()
-    visibility_mode('always', true)
-    local keyboard_controls = build_keyboard_controls()
-    local rows = {}
-    local active_row_index = 0
-    local active_row_name = nil
-
-    local row_index = -1
-    for row_name, row_controls in pairs(keyboard_controls) do
-        row_index = row_index + 1
-        rows[row_index] = row_name
-        for i, control in pairs(row_controls) do
-            if control == state.highlight_element then
-                active_row_index = row_index
-                active_row_name = row_name
-            end
-        end
-    end
-
-    if active_row_index - 1 < 0 then
-        return
-    end
-
-    local next_row_index = active_row_index - 1
-
-    local new_active_row_name = rows[next_row_index]
-    local new_active_row = keyboard_controls[new_active_row_name]
-
-    for i, control in pairs(new_active_row) do
-        state.highlight_element = control
-        return
-    end
-end
-
-function osc_kb_control_down()
-    visibility_mode('always', true)
-    local keyboard_controls = build_keyboard_controls()
-    local rows = {}
-    local active_row_index = 0
-    local active_row_name = nil
-
-    local row_index = -1
-    for row_name, row_controls in pairs(keyboard_controls) do
-        row_index = row_index + 1
-        rows[row_index] = row_name
-        for i, control in pairs(row_controls) do
-            if control == state.highlight_element then
-                active_row_index = row_index
-                active_row_name = row_name
-            end
-        end
-    end
-
-    if active_row_index + 1 > #rows then
-        return
-    end
-
-    local next_row_index = active_row_index + 1
-
-    local new_active_row_name = rows[next_row_index]
-    local new_active_row = keyboard_controls[new_active_row_name]
-
-    for i, control in pairs(new_active_row) do
-        state.highlight_element = control
-        return
-    end
-
-end
-
-function osc_kb_control_left()
-    visibility_mode('always', true)
-    local keyboard_controls = build_keyboard_controls()
-    
-    local active_control_name = nil
-    for row_name, row_controls in pairs(keyboard_controls) do
-        local controls = {}
-        local controls_index = -1
-        for i, control in pairs(row_controls) do
-            controls_index = controls_index + 1
-            controls[controls_index] = control
-            if control == state.highlight_element then
-                active_control_index = controls_index
-                active_control_name = control
-            end
-        end
-
-        if active_control_name == 'seekbar' then
-            mp.commandv('seek', -5, 'exact', 'keyframes')
-            return
-        end
-
-        if active_control_name then
-            if active_control_index - 1 < 0 then
-                return
-            end
-        
-            local next_control_index = active_control_index - 1
-            state.highlight_element = controls[next_control_index]
-            return
-        end
-    end
-
-end
-
-function osc_kb_control_right()
-    visibility_mode('always', true)
-    local keyboard_controls = build_keyboard_controls()
-    
-    local active_control_name = nil
-    for row_name, row_controls in pairs(keyboard_controls) do
-        local controls = {}
-        local controls_index = -1
-        for i, control in pairs(row_controls) do
-            controls_index = controls_index + 1
-            controls[controls_index] = control
-            if control == state.highlight_element then
-                active_control_index = controls_index
-                active_control_name = control
-            end
-        end
-
-        if active_control_name == 'seekbar' then
-            mp.commandv('seek', 5, 'exact', 'keyframes')
-            return
-        end
-
-        if active_control_name then
-            if active_control_index + 1 > #controls then
-                return
-            end
-        
-            local next_control_index = active_control_index + 1
-            state.highlight_element = controls[next_control_index]
-            return
-        end
-    end
-
-end
-
-function osc_kb_control_back()
-    visibility_mode('auto', true)
-end
-
-function osc_kb_control_enter()
-    visibility_mode('always', true)
-    for n = 1, #elements do
-        if elements[n].name == state.highlight_element then
-            
-            local action = 'enter'
-            if element_has_action(elements[n], action) then
-                elements[n].eventresponder[action](elements[n])
-                return
-            end
-
-            local action = 'mbtn_left_up'
-            if element_has_action(elements[n], action) then
-                elements[n].eventresponder[action](elements[n])
-                return
-            end
-        end
-    end
-
-end
-
-function osc_add_key_binding(key, name, fn, flags)
-	osc_key_bindings[#osc_key_bindings + 1] = name
-	mp.add_forced_key_binding(key, name, fn, flags)
-end
-
--- This is based on code from https://github.com/darsain/uosc
-function osc_enable_key_bindings()
-	osc_key_bindings = {}
-	-- The `mp.set_key_bindings()` method would be easier here, but that
-	-- doesn't support 'repeatable' flag, so we are stuck with this monster.
-	osc_add_key_binding('up',              'osc-kb-control-prev1',        osc_kb_control_up, 'repeatable')
-	osc_add_key_binding('down',            'osc-kb-control-next1',        osc_kb_control_down, 'repeatable')
-	osc_add_key_binding('left',            'osc-kb-control-left1',        osc_kb_control_left, 'repeatable')
-	osc_add_key_binding('right',           'osc-kb-control-right1',      osc_kb_control_right, 'repeatable')
-	osc_add_key_binding('enter',      'osc-kb-control-select-alt3', osc_kb_control_enter, 'repeatable')
-	osc_add_key_binding('esc',        'osc-kb-control-close',       osc_kb_control_back, 'repeatable')
-end
-
-function osc_disable_key_bindings()
-	for _, name in ipairs(osc_key_bindings) do mp.remove_key_binding(name) end
-	osc_key_bindings = {}
-end
-
-
-
 visibility_mode(user_opts.visibility, true)
 mp.register_script_message('osc-visibility', visibility_mode)
 mp.add_key_binding(nil, 'visibility', function() visibility_mode('cycle') end)
diff --git a/mpv/scripts/youtube-quality.lua b/mpv/scripts/youtube-quality.lua
deleted file mode 100644
index dabd4f2..0000000
--- a/mpv/scripts/youtube-quality.lua
+++ /dev/null
@@ -1,275 +0,0 @@
--- youtube-quality.lua
---
--- Change youtube video quality on the fly.
---
--- Diplays a menu that lets you switch to different ytdl-format settings while
--- you're in the middle of a video (just like you were using the web player).
---
--- Bound to ctrl-f by default.
-
-local mp = require 'mp'
-local utils = require 'mp.utils'
-local msg = require 'mp.msg'
-local assdraw = require 'mp.assdraw'
-
-local opts = {
-    --key bindings
-    toggle_menu_binding = "ctrl+f",
-    up_binding = "k",
-    down_binding = "j",
-    select_binding = "ENTER",
-
-    --formatting / cursors
-    selected_and_active     = "▶ - ",
-    selected_and_inactive   = "● - ",
-    unselected_and_active   = "▷ - ",
-    unselected_and_inactive = "○ - ",
-
-	--font size scales by window, if false requires larger font and padding sizes
-	scale_playlist_by_window=false,
-
-    --playlist ass style overrides inside curly brackets, \keyvalue is one field, extra \ for escape in lua
-    --example {\\fnUbuntu\\fs10\\b0\\bord1} equals: font=Ubuntu, size=10, bold=no, border=1
-    --read http://docs.aegisub.org/3.2/ASS_Tags/ for reference of tags
-    --undeclared tags will use default osd settings
-    --these styles will be used for the whole playlist. More specific styling will need to be hacked in
-    --
-    --(a monospaced font is recommended but not required)
-    style_ass_tags = "{\\fnmonospace}",
-
-    --paddings for top left corner
-    text_padding_x = 5,
-    text_padding_y = 5,
-
-    --other
-    menu_timeout = 10,
-
-    --use youtube-dl to fetch a list of available formats (overrides quality_strings)
-    fetch_formats = true,
-
-    --default menu entries
-    quality_strings=[[
-    [
-    {"4320p" : "bestvideo[height<=?4320p]+bestaudio/best"},
-    {"2160p" : "bestvideo[height<=?2160]+bestaudio/best"},
-    {"1440p" : "bestvideo[height<=?1440]+bestaudio/best"},
-    {"1080p" : "bestvideo[height<=?1080]+bestaudio/best"},
-    {"720p" : "bestvideo[height<=?720]+bestaudio/best"},
-    {"480p" : "bestvideo[height<=?480]+bestaudio/best"},
-    {"360p" : "bestvideo[height<=?360]+bestaudio/best"},
-    {"240p" : "bestvideo[height<=?240]+bestaudio/best"},
-    {"144p" : "bestvideo[height<=?144]+bestaudio/best"}
-    ]
-    ]],
-}
-(require 'mp.options').read_options(opts, "youtube-quality")
-opts.quality_strings = utils.parse_json(opts.quality_strings)
-
-local destroyer = nil
-
-
-function show_menu()
-    local selected = 1
-    local active = 0
-    local current_ytdl_format = mp.get_property("ytdl-format")
-    msg.verbose("current ytdl-format: "..current_ytdl_format)
-    local num_options = 0
-    local options = {}
-
-
-    if opts.fetch_formats then
-        options, num_options = download_formats()
-    end
-
-    if next(options) == nil then
-        for i,v in ipairs(opts.quality_strings) do
-            num_options = num_options + 1
-            for k,v2 in pairs(v) do
-                options[i] = {label = k, format=v2}
-                if v2 == current_ytdl_format then
-                    active = i
-                    selected = active
-                end
-            end
-        end
-    end
-
-    --set the cursor to the currently format
-    for i,v in ipairs(options) do
-        if v.format == current_ytdl_format then
-            active = i
-            selected = active
-            break
-        end
-    end
-
-    function selected_move(amt)
-        selected = selected + amt
-        if selected < 1 then selected = num_options
-        elseif selected > num_options then selected = 1 end
-        timeout:kill()
-        timeout:resume()
-        draw_menu()
-    end
-    function choose_prefix(i)
-        if     i == selected and i == active then return opts.selected_and_active 
-        elseif i == selected then return opts.selected_and_inactive end
-
-        if     i ~= selected and i == active then return opts.unselected_and_active
-        elseif i ~= selected then return opts.unselected_and_inactive end
-        return "> " --shouldn't get here.
-    end
-
-    function draw_menu()
-        local ass = assdraw.ass_new()
-
-        ass:pos(opts.text_padding_x, opts.text_padding_y)
-        ass:append(opts.style_ass_tags)
-
-        for i,v in ipairs(options) do
-            ass:append(choose_prefix(i)..v.label.."\\N")
-        end
-
-		local w, h = mp.get_osd_size()
-		if opts.scale_playlist_by_window then w,h = 0, 0 end
-		mp.set_osd_ass(w, h, ass.text)
-    end
-
-    function destroy()
-        timeout:kill()
-        mp.set_osd_ass(0,0,"")
-        mp.remove_key_binding("move_up")
-        mp.remove_key_binding("move_down")
-        mp.remove_key_binding("select")
-        mp.remove_key_binding("escape")
-        destroyer = nil
-    end
-    timeout = mp.add_periodic_timer(opts.menu_timeout, destroy)
-    destroyer = destroy
-
-    mp.add_forced_key_binding(opts.up_binding,     "move_up",   function() selected_move(-1) end, {repeatable=true})
-    mp.add_forced_key_binding(opts.down_binding,   "move_down", function() selected_move(1)  end, {repeatable=true})
-    mp.add_forced_key_binding(opts.select_binding, "select",    function()
-        destroy()
-        mp.set_property("ytdl-format", options[selected].format)
-        reload_resume()
-    end)
-    mp.add_forced_key_binding(opts.toggle_menu_binding, "escape", destroy)
-
-    draw_menu()
-    return 
-end
-
-local ytdl = {
-    path = "youtube-dl",
-    searched = false,
-    blacklisted = {}
-}
-
-format_cache={}
-function download_formats()
-    local function exec(args)
-        local ret = utils.subprocess({args = args})
-        return ret.status, ret.stdout, ret
-    end
-
-    local function table_size(t)
-        s = 0
-        for i,v in ipairs(t) do
-            s = s+1
-        end
-        return s
-    end
-
-    local url = mp.get_property("path")
-
-    url = string.gsub(url, "ytdl://", "") -- Strip possible ytdl:// prefix.
-
-    -- don't fetch the format list if we already have it
-    if format_cache[url] ~= nil then 
-        local res = format_cache[url]
-        return res, table_size(res)
-    end
-    mp.osd_message("fetching available formats with youtube-dl...", 60)
-
-    if not (ytdl.searched) then
-        local ytdl_mcd = mp.find_config_file("youtube-dl")
-        if not (ytdl_mcd == nil) then
-            msg.verbose("found youtube-dl at: " .. ytdl_mcd)
-            ytdl.path = ytdl_mcd
-        end
-        ytdl.searched = true
-    end
-
-    local command = {ytdl.path, "--no-warnings", "--no-playlist", "-J"}
-    table.insert(command, url)
-    local es, json, result = exec(command)
-
-    if (es < 0) or (json == nil) or (json == "") then
-        mp.osd_message("fetching formats failed...", 1)
-        msg.error("failed to get format list: " .. err)
-        return {}, 0
-    end
-
-    local json, err = utils.parse_json(json)
-
-    if (json == nil) then
-        mp.osd_message("fetching formats failed...", 1)
-        msg.error("failed to parse JSON data: " .. err)
-        return {}, 0
-    end
-
-    res = {}
-    msg.verbose("youtube-dl succeeded!")
-    for i,v in ipairs(json.formats) do
-        if v.vcodec ~= "none" then
-            local fps = v.fps and v.fps.."fps" or ""
-            local resolution = string.format("%sx%s", v.width, v.height)
-            local l = string.format("%-9s %-5s (%-4s / %s)", resolution, fps, v.ext, v.vcodec)
-            local f = string.format("%s+bestaudio/best", v.format_id)
-            table.insert(res, {label=l, format=f, width=v.width })
-        end
-    end
-
-    table.sort(res, function(a, b) return a.width > b.width end)
-
-    mp.osd_message("", 0)
-    format_cache[url] = res
-    return res, table_size(res)
-end
-
-
--- register script message to show menu
-mp.register_script_message("toggle-quality-menu", 
-function()
-    if destroyer ~= nil then
-        destroyer()
-    else
-        show_menu()
-    end
-end)
-
--- keybind to launch menu
-mp.add_key_binding(opts.toggle_menu_binding, "quality-menu", show_menu)
-
--- special thanks to reload.lua (https://github.com/4e6/mpv-reload/)
-function reload_resume()
-    local playlist_pos = mp.get_property_number("playlist-pos")
-    local reload_duration = mp.get_property_native("duration")
-    local time_pos = mp.get_property("time-pos")
-
-    mp.set_property_number("playlist-pos", playlist_pos)
-
-    -- Tries to determine live stream vs. pre-recordered VOD. VOD has non-zero
-    -- duration property. When reloading VOD, to keep the current time position
-    -- we should provide offset from the start. Stream doesn't have fixed start.
-    -- Decent choice would be to reload stream from it's current 'live' positon.
-    -- That's the reason we don't pass the offset when reloading streams.
-    if reload_duration and reload_duration > 0 then
-        local function seeker()
-            mp.commandv("seek", time_pos, "absolute")
-            mp.unregister_event(seeker)
-        end
-        mp.register_event("file-loaded", seeker)
-    end
-end
diff --git a/scripts/kderofi-rbw b/scripts/kderofi-rbw
index e3436c2..3c03710 100755
--- a/scripts/kderofi-rbw
+++ b/scripts/kderofi-rbw
@@ -69,16 +69,16 @@ fi
 case ${option} in
     Password )
 	echo "${SECRET}"
-	ydotool type --key-delay 1ms $(rbw get "${SECRET}")
+	ydotool type --key-delay 0ms $(rbw get "${SECRET}")
 	;;
     User )
 	echo "$(rbw get --full "${SECRET}" | rg Username: | awk '{print $2}')"
-	ydotool type --key-delay 1ms "$(rbw get --full "${SECRET}" | rg Username: | awk '{print $2}')"
+	ydotool type --key-delay 0ms "$(rbw get --full "${SECRET}" | rg Username: | awk '{print $2}')"
 	;;
     "User and password" )
-	ydotool type --key-delay 1ms $(rbw get --full "${SECRET}" | rg Username: | awk '{print $2}')
+	ydotool type --key-delay 0ms $(rbw get --full "${SECRET}" | rg Username: | awk '{print $2}')
 	ydotool key 15:1 15:0
-	ydotool type --key-delay 1ms $(rbw get "${SECRET}")
+	ydotool type --key-delay 0ms $(rbw get "${SECRET}")
 	;;
     "QR-Code" )
 	if [[ $SECRET =~ wifi$ ]]; then
@@ -93,7 +93,7 @@ case ${option} in
 	fi
 	;;
     OTP )
-	ydotool type --key-delay 1ms $(rbw code "${SECRET}")
+	ydotool type --key-delay 0ms $(rbw code "${SECRET}")
 	;;
 esac
 
diff --git a/system/kaladin/configuration.nix b/system/kaladin/configuration.nix
index e956b33..34c2802 100644
--- a/system/kaladin/configuration.nix
+++ b/system/kaladin/configuration.nix
@@ -95,10 +95,10 @@
   services.xserver = {
     enable = true;
     autorun = false;
-    windowManager.awesome = {
-      enable = true;
-      package = pkgs.awesome;
-    };
+    # windowManager.awesome = {
+    #   enable = true;
+    #   package = pkgs.awesome;
+    # };
     displayManager = {
       startx.enable = true;
       sddm = {
@@ -126,11 +126,11 @@
     enable = true;
     settings = rec {
       initial_session = {
-        command = "/home/chris/bin/hyprland";
+        command = "dbus-run-session startplasma-wayland";
         user = "chris";
       };
       default_session = {
-        command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time -r --window-padding 2 --cmd /home/chris/bin/hyprland";
+        command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time -r --window-padding 2 --cmd 'dbus-run-session startplasma-wayland'";
         user = "greeter";
       };
       plasma_session = {
@@ -308,7 +308,9 @@
     tagutil
     python310Packages.mutagen
     python310Packages.audiotools
-    # mpv
+    (mpv.override {scripts = with pkgs.mpvScripts; [ mpris youtube-quality sponsorblock ];})
+    ani-cli
+    mov-cli
     nerdfonts
     # latte-dock
     plasma-browser-integration
diff --git a/system/syl/configuration.nix b/system/syl/configuration.nix
index b127b5a..acafaa9 100644
--- a/system/syl/configuration.nix
+++ b/system/syl/configuration.nix
@@ -88,10 +88,10 @@
   services.xserver = {
     enable = true;
     autorun = false;
-    windowManager.awesome = {
-      enable = true;
-      package = pkgs.awesome;
-    };
+    # windowManager.awesome = {
+    #   enable = true;
+    #   package = pkgs.awesome;
+    # };
     displayManager = {
       startx.enable = true;
       sddm = {
@@ -119,11 +119,11 @@
     enable = true;
     settings = rec {
       initial_session = {
-        command = "/home/chris/bin/hyprland";
+        command = "dbus-run-session startplasma-wayland";
         user = "chris";
       };
       default_session = {
-        command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time -r --window-padding 2 --cmd /home/chris/bin/hyprland";
+        command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time -r --window-padding 2 --cmd 'dbus-run-session startplasma-wayland'";
         user = "greeter";
       };
       plasma_session = {
@@ -327,7 +327,9 @@
     tagutil
     python310Packages.mutagen
     python310Packages.audiotools
-    # mpv
+    (mpv.override {scripts = with pkgs.mpvScripts; [ mpris youtube-quality sponsorblock ];})
+    ani-cli
+    mov-cli
     nerdfonts
     # latte-dock
     plasma-browser-integration
diff --git a/user/home.nix b/user/home.nix
index b15fb94..b362b8a 100644
--- a/user/home.nix
+++ b/user/home.nix
@@ -238,6 +238,16 @@
     plugins = [ pkgs.obs-studio-plugins.obs-move-transition ];
   };
 
+  # programs.mpv = {
+  #   enable = true;
+  #   scripts = with pkgs.mpvScripts; [ mpris thumbnail youtube-quality sponsorblock ];
+  # };
+  
+  home.file.".config/mpv" = {
+    source = ../mpv;
+    recursive = true;
+  };
+
   services.nextcloud-client = {
     enable = true;
     startInBackground = true;
@@ -378,45 +388,6 @@
     source = ../qutebrowser/qsettings;
   };
 
-  programs.mpv = {
-    enable = true;
-    scripts = with pkgs.mpvScripts; [ mpris thumbnail youtube-quality sponsorblock];
-    config = {
-      osc = false;
-      vo = "gpu";
-      af = "scaletempo2";
-      autofit = "4000x2900";
-      geometry = "50%:50%";
-      hwdec = "auto";
-      rtsp-transport = "udp";
-      speed = 1.95;
-      ytdl-format = "bestvideo[height<=?720][fps<=?30]+bestaudio/best";
-    };
-    profiles = {
-      fast = {
-        speed = 1.95;
-      };
-      slow = {
-        speed = 1;
-      };
-      wc = {
-        speed = 1;
-        osd-level = 0;
-        osc = false;
-        load-scripts = false;
-        profile = "low-latency";
-        demuxer-lavf-format = "video4linux2";
-        demuxer-lavf-o-set = "input_format=mjpeg,video_size=1920x1080,framerate=60";
-        fps = 60;
-      };
-    };
-  };
-
-  home.file.".config/mpv/scripts" = {
-    source = ../mpv/scripts;
-    recursive = true;
-  };
-
   home.file.".config/imv" = {
     source = ../imv;
     recursive = true;