diff --git a/media/overlays/gameboy/Thumbs.db b/media/overlays/gameboy/Thumbs.db
new file mode 100644
index 0000000000..ed1c05c723
Binary files /dev/null and b/media/overlays/gameboy/Thumbs.db differ
diff --git a/media/overlays/gba-grey/Thumbs.db b/media/overlays/gba-grey/Thumbs.db
new file mode 100644
index 0000000000..ec33c44ec2
Binary files /dev/null and b/media/overlays/gba-grey/Thumbs.db differ
diff --git a/media/overlays/genesis/Thumbs.db b/media/overlays/genesis/Thumbs.db
new file mode 100644
index 0000000000..2d2cec4285
Binary files /dev/null and b/media/overlays/genesis/Thumbs.db differ
diff --git a/media/overlays/genesis/genesis.cfg b/media/overlays/genesis/genesis.cfg
index fac0fb5c9e..7589ff2231 100644
--- a/media/overlays/genesis/genesis.cfg
+++ b/media/overlays/genesis/genesis.cfg
@@ -22,6 +22,7 @@ overlay3_range_mod = 1.5
 overlay3_alpha_mod = 2.0
 overlay4_overlay = quickmenu.png
 overlay4_name = "menu"
+overlay4_full_screen = true
 overlay5_full_screen = true
 overlay5_normalized = true
 overlay5_name = "hide"
@@ -57,12 +58,12 @@ overlay0_desc14 = "up|left,0.04375,0.67708333333,radial,0.03125,0.0520833333333"
 overlay0_desc15 = "down|right,0.19375,0.9270833333333,radial,0.03125,0.0520833333333"
 overlay0_desc16 = "nul,0.11845,0.80208333333,rect,0.127575,0.212625"
 overlay0_desc16_overlay = dpad.png
-overlay0_desc17 = "menu_toggle,0.50125,0.09708333333334,radial,0.025,0.04166666666"
+overlay0_desc17 = "menu_toggle,0.50125,0.11708333333334,radial,0.025,0.04166666666"
 overlay0_desc17_overlay = rgui.png
-overlay0_desc18 = "overlay_next,0.30125,0.09708333333334,radial,0.025,0.04166666666"
+overlay0_desc18 = "overlay_next,0.30125,0.11708333333334,radial,0.025,0.04166666666"
 overlay0_desc18_overlay = rotate.png
 overlay0_desc18_next_target = "6-button-portrait"
-overlay0_desc19 = "overlay_next,0.70125,0.09708333333334,radial,0.025,0.04166666666"
+overlay0_desc19 = "overlay_next,0.70125,0.11708333333334,radial,0.025,0.04166666666"
 overlay0_desc19_overlay = 3button.png
 overlay0_desc19_next_target = "3-button-landscape"
 
diff --git a/media/overlays/n64/3button.png b/media/overlays/n64/3button.png
new file mode 100644
index 0000000000..6656d96870
Binary files /dev/null and b/media/overlays/n64/3button.png differ
diff --git a/media/overlays/n64/6button.png b/media/overlays/n64/6button.png
new file mode 100644
index 0000000000..60d6f45836
Binary files /dev/null and b/media/overlays/n64/6button.png differ
diff --git a/media/overlays/n64/Thumbs.db b/media/overlays/n64/Thumbs.db
new file mode 100644
index 0000000000..e327fff793
Binary files /dev/null and b/media/overlays/n64/Thumbs.db differ
diff --git a/media/overlays/n64/a.png b/media/overlays/n64/a.png
new file mode 100644
index 0000000000..e9ad285549
Binary files /dev/null and b/media/overlays/n64/a.png differ
diff --git a/media/overlays/n64/analog-icon.png b/media/overlays/n64/analog-icon.png
new file mode 100644
index 0000000000..bdd57f504b
Binary files /dev/null and b/media/overlays/n64/analog-icon.png differ
diff --git a/media/overlays/n64/analog.png b/media/overlays/n64/analog.png
new file mode 100644
index 0000000000..03ea6a420a
Binary files /dev/null and b/media/overlays/n64/analog.png differ
diff --git a/media/overlays/n64/b.png b/media/overlays/n64/b.png
new file mode 100644
index 0000000000..748930a371
Binary files /dev/null and b/media/overlays/n64/b.png differ
diff --git a/media/overlays/n64/digital-icon.png b/media/overlays/n64/digital-icon.png
new file mode 100644
index 0000000000..a0437d3066
Binary files /dev/null and b/media/overlays/n64/digital-icon.png differ
diff --git a/media/overlays/n64/downc.png b/media/overlays/n64/downc.png
new file mode 100644
index 0000000000..2d22aff5a1
Binary files /dev/null and b/media/overlays/n64/downc.png differ
diff --git a/media/overlays/n64/dpad.png b/media/overlays/n64/dpad.png
new file mode 100644
index 0000000000..21400e2f73
Binary files /dev/null and b/media/overlays/n64/dpad.png differ
diff --git a/media/overlays/n64/l.png b/media/overlays/n64/l.png
new file mode 100644
index 0000000000..2a1621289a
Binary files /dev/null and b/media/overlays/n64/l.png differ
diff --git a/media/overlays/n64/leftc.png b/media/overlays/n64/leftc.png
new file mode 100644
index 0000000000..b2d0880068
Binary files /dev/null and b/media/overlays/n64/leftc.png differ
diff --git a/media/overlays/n64/n64.cfg b/media/overlays/n64/n64.cfg
new file mode 100644
index 0000000000..fe893198e5
--- /dev/null
+++ b/media/overlays/n64/n64.cfg
@@ -0,0 +1,199 @@
+overlays = 6
+
+overlay0_full_screen = true
+overlay0_normalized = true
+overlay0_name = "analog-landscape"
+overlay0_range_mod = 1.5
+overlay0_alpha_mod = 2.0
+overlay1_full_screen = true
+overlay1_normalized = true
+overlay1_name = "digital-landscape"
+overlay1_range_mod = 1.5
+overlay1_alpha_mod = 2.0
+overlay2_full_screen = true
+overlay2_normalized = true
+overlay2_name = "analog-portrait"
+overlay2_range_mod = 1.5
+overlay2_alpha_mod = 2.0
+overlay3_full_screen = true
+overlay3_normalized = true
+overlay3_name = "digital-portrait"
+overlay3_range_mod = 1.5
+overlay3_alpha_mod = 2.0
+overlay4_overlay = quickmenu.png
+overlay4_name = "menu"
+overlay4_full_screen = true
+overlay5_full_screen = true
+overlay5_normalized = true
+overlay5_name = "hide"
+overlay5_full_screen = true
+overlay5_range_mod = 1.5
+overlay5_alpha_mod = 2.0
+
+overlay0_descs = 14
+overlay0_desc0 = "start,0.498,0.8,radial,0.0375,0.0625"
+overlay0_desc0_overlay = start.png
+overlay0_desc1 = "select|b,0.88625,0.778333333333,radial,0.0325,0.05416666666667"
+overlay0_desc1_overlay = downc.png
+overlay0_desc2 = "a,0.80,0.914583333333,radial,0.0425,0.0708"
+overlay0_desc2_overlay = a.png
+overlay0_desc3 = "b,0.715,0.75516666667,radial,0.0425,0.0708"
+overlay0_desc3_overlay = b.png
+overlay0_desc4 = "select|x,0.88625,0.57,radial,0.03,0.05"
+overlay0_desc4_overlay = upc.png
+overlay0_desc5 = "select|y,0.8175,0.67,radial,0.03,0.05"
+overlay0_desc5_overlay = leftc.png
+overlay0_desc6 = "select|a,0.955,0.67,radial,0.03,0.05"
+overlay0_desc6_overlay = rightc.png
+overlay0_desc7 = "l2,0.0625,0.052083333333,rect,0.0625,0.052083333333"
+overlay0_desc7_overlay = z.png
+overlay0_desc8 = "r,0.9375,0.052083333333,rect,0.0625,0.052083333333"
+overlay0_desc8_overlay = r.png
+overlay0_desc9 = "overlay_next,0.5,0.94533333333,rect,0.0234375,0.04166666667"
+overlay0_desc9_overlay = next.png
+overlay0_desc9_next_target = "menu"
+overlay0_desc10 = "analog_left,0.11845,0.80208333333,radial,0.127575,0.212625"
+overlay0_desc10_overlay = analog.png
+overlay0_desc10_pct = 0.75
+overlay0_desc11 = "menu_toggle,0.5,0.11708333333334,radial,0.025,0.04166666666"
+overlay0_desc11_overlay = rgui.png
+overlay0_desc12 = "overlay_next,0.30125,0.11708333333334,radial,0.025,0.04166666666"
+overlay0_desc12_overlay = rotate.png
+overlay0_desc12_next_target = "analog-portrait"
+overlay0_desc13 = "overlay_next,0.70125,0.11708333333334,radial,0.025,0.04166666666"
+overlay0_desc13_overlay = digital-icon.png
+overlay0_desc13_next_target = "digital-landscape"
+
+overlay1_descs = 22
+overlay1_desc0 = "left,0.04375,0.80208333333,radial,0.0525,0.0875"
+overlay1_desc1 = "right,0.19375,0.80208333333,radial,0.0525,0.0875"
+overlay1_desc2 = "up,0.11845,0.67708333333,radial,0.0525,0.0875"
+overlay1_desc3 = "down,0.11845,0.92708333333,radial,0.0525,0.0875"
+overlay1_desc4 = "start,0.498,0.8,radial,0.0375,0.0625"
+overlay1_desc4_overlay = start.png
+overlay1_desc5 = "select|b,0.88625,0.778333333333,radial,0.0325,0.05416666666667"
+overlay1_desc5_overlay = downc.png
+overlay1_desc6 = "a,0.80,0.914583333333,radial,0.0425,0.0708"
+overlay1_desc6_overlay = a.png
+overlay1_desc7 = "b,0.715,0.75516666667,radial,0.0425,0.0708"
+overlay1_desc7_overlay = b.png
+overlay1_desc8 = "select|x,0.88625,0.57,radial,0.03,0.05"
+overlay1_desc8_overlay = upc.png
+overlay1_desc9 = "select|y,0.8175,0.67,radial,0.03,0.05"
+overlay1_desc9_overlay = leftc.png
+overlay1_desc10 = "select|a,0.955,0.67,radial,0.03,0.05"
+overlay1_desc10_overlay = rightc.png
+overlay1_desc11 = "overlay_next,0.5,0.94533333333,rect,0.0234375,0.04166666667"
+overlay1_desc11_overlay = next.png
+overlay1_desc11_next_target = "menu"
+overlay1_desc12 = "left|down,0.04375,0.9270833333333,radial,0.03125,0.0520833333333"
+overlay1_desc13 = "right|up,0.19375,0.67708333333,radial,0.03125,0.0520833333333"
+overlay1_desc14 = "up|left,0.04375,0.67708333333,radial,0.03125,0.0520833333333"
+overlay1_desc15 = "down|right,0.19375,0.9270833333333,radial,0.03125,0.0520833333333"
+overlay1_desc16 = "nul,0.11845,0.80208333333,rect,0.127575,0.212625"
+overlay1_desc16_overlay = dpad.png
+overlay1_desc17 = "menu_toggle,0.5,0.11708333333334,radial,0.025,0.04166666666"
+overlay1_desc17_overlay = rgui.png
+overlay1_desc18 = "overlay_next,0.30125,0.11708333333334,radial,0.025,0.04166666666"
+overlay1_desc18_overlay = rotate.png
+overlay1_desc18_next_target = "digital-portrait"
+overlay1_desc19 = "overlay_next,0.70125,0.11708333333334,radial,0.025,0.04166666666"
+overlay1_desc19_overlay = analog-icon.png
+overlay1_desc19_next_target = "analog-landscape"
+overlay1_desc20 = "l,0.0625,0.052083333333,rect,0.0625,0.052083333333"
+overlay1_desc20_overlay = l.png
+overlay1_desc21 = "r,0.9375,0.052083333333,rect,0.0625,0.052083333333"
+overlay1_desc21_overlay = r.png
+
+overlay2_descs = 14
+overlay2_desc0 = "start,0.495,0.68625,radial,0.0625,0.0375"
+overlay2_desc0_overlay = start.png
+overlay2_desc1 = "select|b,0.82,0.82,radial,0.04375,0.02625"
+overlay2_desc1_overlay = downc.png
+overlay2_desc2 = "b,0.5795833333333,0.815,radial,0.0708,0.0425"
+overlay2_desc2_overlay = b.png
+overlay2_desc3 = "a,0.7070833333333,0.89375,radial,0.0708,0.0425"
+overlay2_desc3_overlay = a.png
+overlay2_desc4 = "select|x,0.82,0.71,radial,0.04375,0.02625"
+overlay2_desc4_overlay = upc.png
+overlay2_desc5 = "select|y,0.720333333,0.765,radial,0.04375,0.02625"
+overlay2_desc5_overlay = leftc.png
+overlay2_desc6 = "select|a,0.92241666666667,0.765,radial,0.04375,0.02625"
+overlay2_desc6_overlay = rightc.png
+overlay2_desc7 = "overlay_next,0.50125,0.95833333333,rect,0.04166666666,0.0234375"
+overlay2_desc7_overlay = next.png
+overlay2_desc7_next_target = "menu"
+overlay2_desc8 = "analog_left,0.21875,0.87275,radial,0.21,0.13"
+overlay2_desc8_overlay = analog.png
+overlay2_desc8_pct = 0.75
+overlay2_desc9 = "menu_toggle,0.50125,0.57708333333334,radial,0.04166666666,0.025"
+overlay2_desc9_overlay = rgui.png
+overlay2_desc10 = "overlay_next,0.30125,0.57708333333334,radial,0.04166666666,0.025"
+overlay2_desc10_overlay = rotate.png
+overlay2_desc10_next_target = "analog-landscape"
+overlay2_desc11 = "overlay_next,0.70125,0.57708333333334,radial,0.04166666666,0.025"
+overlay2_desc11_overlay = digital-icon.png
+overlay2_desc11_next_target = "digital-portrait"
+overlay2_desc12 = "l2,0.0625,0.552083333333,rect,0.0925,0.032083333333"
+overlay2_desc12_overlay = z.png
+overlay2_desc13 = "r,0.9375,0.552083333333,rect,0.0925,0.032083333333"
+overlay2_desc13_overlay = r.png
+
+overlay3_descs = 22
+overlay3_desc0 = "left,0.09375,0.86875,radial,0.0875,0.0525"
+overlay3_desc1 = "right,0.34375,0.86875,radial,0.0875,0.0525"
+overlay3_desc2 = "up,0.21875,0.79375,radial,0.0875,0.0525"
+overlay3_desc3 = "down,0.21875,0.94375,radial,0.0875,0.0525"
+overlay3_desc4 = "start,0.495,0.68625,radial,0.0625,0.0375"
+overlay3_desc4_overlay = start.png
+overlay3_desc5 = "select|b,0.82,0.82,radial,0.04375,0.02625"
+overlay3_desc5_overlay = downc.png
+overlay3_desc6 = "b,0.5795833333333,0.815,radial,0.0708,0.0425"
+overlay3_desc6_overlay = b.png
+overlay3_desc7 = "a,0.7070833333333,0.89375,radial,0.0708,0.0425"
+overlay3_desc7_overlay = a.png
+overlay3_desc8 = "select|x,0.82,0.71,radial,0.04375,0.02625"
+overlay3_desc8_overlay = upc.png
+overlay3_desc9 = "select|y,0.720333333,0.765,radial,0.04375,0.02625"
+overlay3_desc9_overlay = leftc.png
+overlay3_desc10 = "select|a,0.92241666666667,0.765,radial,0.04375,0.02625"
+overlay3_desc10_overlay = rightc.png
+overlay3_desc11 = "overlay_next,0.50125,0.95833333333,radial,0.04166666666,0.0234375"
+overlay3_desc11_overlay = next.png
+overlay3_desc11_next_target = "menu"
+overlay3_desc12 = "left|down,0.09375,0.94375,radial,0.05208333333333,0.03125"
+overlay3_desc13 = "right|up,0.34375,0.79375,radial,0.05208333333333,0.03125"
+overlay3_desc14 = "up|left,0.09375,0.79375,radial,0.05208333333333,0.03125"
+overlay3_desc15 = "down|right,0.34375,0.94375,radial,0.05208333333333,0.03125"
+overlay3_desc16 = "nul,0.21875,0.87275,radial,0.21,0.13"
+overlay3_desc16_overlay = dpad.png
+overlay3_desc17 = "menu_toggle,0.50125,0.57708333333334,radial,0.04166666666,0.025"
+overlay3_desc17_overlay = rgui.png
+overlay3_desc18 = "overlay_next,0.30125,0.57708333333334,radial,0.04166666666,0.025"
+overlay3_desc18_overlay = rotate.png
+overlay3_desc18_next_target = "digital-landscape"
+overlay3_desc19 = "overlay_next,0.70125,0.57708333333334,radial,0.04166666666,0.025"
+overlay3_desc19_overlay = analog-icon.png
+overlay3_desc19_next_target = "analog-portrait"
+overlay3_desc20 = "l,0.0625,0.552083333333,rect,0.0925,0.032083333333"
+overlay3_desc20_overlay = l.png
+overlay3_desc21 = "r,0.9375,0.552083333333,rect,0.0925,0.032083333333"
+overlay3_desc21_overlay = r.png
+
+overlay4_descs = 11
+overlay4_desc0  = "load_state,292,53,rect,50,38"
+overlay4_desc1  = "save_state,505,53,rect,50,38"
+overlay4_desc2  = "state_slot_decrease,292,222,rect,50,38"
+overlay4_desc3  = "state_slot_increase,505,222,rect,50,38"
+overlay4_desc4  = "rewind,292,306,rect,50,38"
+overlay4_desc5  = "slowmotion,292,393,rect,50,38"
+overlay4_desc6  = "reset,505,393,rect,50,38"
+overlay4_desc7  = "toggle_fast_forward,505,306,rect,50,38"
+overlay4_desc8  = "shader_next,505,136,rect,50,38"
+overlay4_desc9  = "shader_prev,292,136,rect,50,38"
+overlay4_desc10 = "overlay_next,400,452,radial,22,22"
+overlay4_desc10_next_target = "hide"
+
+overlay5_descs = 1
+overlay5_desc0 = "overlay_next,0.5,0.94533333333,rect,0.0234375,0.04166666667"
+overlay5_desc0_overlay = next.png
\ No newline at end of file
diff --git a/media/overlays/n64/next.png b/media/overlays/n64/next.png
new file mode 100644
index 0000000000..a4a6e656a5
Binary files /dev/null and b/media/overlays/n64/next.png differ
diff --git a/media/overlays/n64/quickmenu.png b/media/overlays/n64/quickmenu.png
new file mode 100644
index 0000000000..225e99dbf4
Binary files /dev/null and b/media/overlays/n64/quickmenu.png differ
diff --git a/media/overlays/n64/r.png b/media/overlays/n64/r.png
new file mode 100644
index 0000000000..aa2d2f4d9d
Binary files /dev/null and b/media/overlays/n64/r.png differ
diff --git a/media/overlays/n64/rgui.png b/media/overlays/n64/rgui.png
new file mode 100644
index 0000000000..2f0295463c
Binary files /dev/null and b/media/overlays/n64/rgui.png differ
diff --git a/media/overlays/n64/rightc.png b/media/overlays/n64/rightc.png
new file mode 100644
index 0000000000..72b8c4d256
Binary files /dev/null and b/media/overlays/n64/rightc.png differ
diff --git a/media/overlays/n64/rotate.png b/media/overlays/n64/rotate.png
new file mode 100644
index 0000000000..d03619b570
Binary files /dev/null and b/media/overlays/n64/rotate.png differ
diff --git a/media/overlays/n64/start.png b/media/overlays/n64/start.png
new file mode 100644
index 0000000000..a2ce917381
Binary files /dev/null and b/media/overlays/n64/start.png differ
diff --git a/media/overlays/n64/upc.png b/media/overlays/n64/upc.png
new file mode 100644
index 0000000000..9a067d19a0
Binary files /dev/null and b/media/overlays/n64/upc.png differ
diff --git a/media/overlays/n64/z.png b/media/overlays/n64/z.png
new file mode 100644
index 0000000000..c9a0507e98
Binary files /dev/null and b/media/overlays/n64/z.png differ
diff --git a/media/overlays/nes/Thumbs.db b/media/overlays/nes/Thumbs.db
new file mode 100644
index 0000000000..385ada10a5
Binary files /dev/null and b/media/overlays/nes/Thumbs.db differ
diff --git a/media/overlays/psx-black/Thumbs.db b/media/overlays/psx-black/Thumbs.db
new file mode 100644
index 0000000000..01949a0f65
Binary files /dev/null and b/media/overlays/psx-black/Thumbs.db differ
diff --git a/media/overlays/snes/Thumbs.db b/media/overlays/snes/Thumbs.db
new file mode 100644
index 0000000000..e6c632f874
Binary files /dev/null and b/media/overlays/snes/Thumbs.db differ