Gamepads & keyboards cleanup (#154)

* Gamepads & keyboards cleanup

Moved all images into subfolders called 'img' and updated links within cfg files (All except "example" and "old"). This cleans up the file browser view in Retroarch.

Replaced double spaces with single spaces).
Removed unused quote marks from image link lines.
Moved name tags to the top of each overlay declaration.
Renamed folder containing SVGs from "vectors" to "src" (source).
Moved "new" N64 out of subfolder.
Added comments with overlay name separating each layout section.
Deleted leftover neo-ds-portrait.zip

* Gamepads & keyboards cleanup

Moved all images into subfolders called 'img' and updated links within cfg files (All except "example" and "old"). This cleans up the file browser view in Retroarch.

* Merged in concurrent Pulls

Merged in concurrent Pulls #153 and #155

* Merged & configured #153 and #155

Made changes to Pulls #153 and #155 to fit this pull (linking to img subfolders etc.)

---------

Co-authored-by: hizzlekizzle <[email protected]>

borders/animated-border/megadrive_animated_border.cfg

@@ -3,92 +3,81 @@
 # INFO/UPDATES> https://www.youtube.com/channel/UCNtiyiGXMO6ztv4Woh6jeFA
 # INSTRUCTIONAL VIDEO: https://youtu.be/gw38OqigS8o
 
-
 overlays = "2"
 
-overlay0_name = "overlay0"
+# 3-button
+overlay0_name = "3-button"
 overlay0_descs = "11"
 overlay0_alpha_mod = "0.000100"
 overlay0_full_screen = "true"
 overlay0_normalized = "true"
-overlay0_overlay = "main_retroarch.png"
+overlay0_overlay = img-md/main_retroarch.png
 
 overlay0_desc0 = "up,0.0688367,0.854447,rect,0.0235825,0.0298959"
-overlay0_desc0_overlay = "pad_up.png"
+overlay0_desc0_overlay = img-md/pad_up.png
 overlay0_desc1 = "down,0.0690572,0.908361,rect,0.0241755,0.0338905"
-overlay0_desc1_overlay = "pad_down.png"
+overlay0_desc1_overlay = img-md/pad_down.png
 overlay0_desc2 = "left,0.0523872,0.881796,rect,0.016966,0.0419466"
-overlay0_desc2_overlay = "pad_left.png"
+overlay0_desc2_overlay = img-md/pad_left.png
 overlay0_desc3 = "right,0.0852862,0.884808,rect,0.0165595,0.0414712"
-overlay0_desc3_overlay = "pad_right.png"
+overlay0_desc3_overlay = img-md/pad_right.png
 
 overlay0_desc4 = "menu_toggle,0.0683453,0.738806,rect,0.0142885,0.0122882"
 
 overlay0_desc5 = "start,0.928500,0.750500,rect,0.0231000,0.018000"
-overlay0_desc5_overlay = "button_start.png"
+overlay0_desc5_overlay = img-md/button_start.png
 
 overlay0_desc6 = "y,0.908299,0.929,radial,0.0150415,0.0259638"
-overlay0_desc6_overlay = "button_a.png"
+overlay0_desc6_overlay = img-md/button_a.png
 overlay0_desc7 = "b,0.930228,0.8822,radial,0.0150414,0.0259638"
-overlay0_desc7_overlay = "button_b.png"
+overlay0_desc7_overlay = img-md/button_b.png
 overlay0_desc8 = "a,0.952898,0.929,radial,0.0150414,0.0259638"
-overlay0_desc8_overlay = "button_c.png"
+overlay0_desc8_overlay = img-md/button_c.png
 
 overlay0_desc9 = "select,0.928700,0.806000,rect,0.007900,0.014300"
-overlay0_desc9_overlay = "button_mode.png"
+overlay0_desc9_overlay = img-md/button_mode.png
 
 overlay0_desc10 = "overlay_next,0.928700,0.806000,rect,0.007900,0.014300"
-overlay0_desc10_next_target = "overlay1"
+overlay0_desc10_next_target = "6-button"
 
-
-
-
-overlay1_name = "overlay1"
+#6-button
+overlay1_name = "6-button"
 overlay1_descs = "15"
 overlay1_alpha_mod = "0.000100"
 overlay1_full_screen = "true"
 overlay1_normalized = "true"
-overlay1_overlay = "main_retroarch.png"
+overlay1_overlay = img-md/main_retroarch.png
 
 overlay1_desc0 = "up,0.0688367,0.854447,rect,0.0235825,0.0298959"
-overlay1_desc0_overlay = "pad_up.png"
+overlay1_desc0_overlay = img-md/pad_up.png
 overlay1_desc1 = "down,0.0690572,0.908361,rect,0.0241755,0.0338905"
-overlay1_desc1_overlay = "pad_down.png"
+overlay1_desc1_overlay = img-md/pad_down.png
 overlay1_desc2 = "left,0.0523872,0.881796,rect,0.016966,0.0419466"
-overlay1_desc2_overlay = "pad_left.png"
+overlay1_desc2_overlay = img-md/pad_left.png
 overlay1_desc3 = "right,0.0852862,0.884808,rect,0.0165595,0.0414712"
-overlay1_desc3_overlay = "pad_right.png"
+overlay1_desc3_overlay = img-md/pad_right.png
+
 overlay1_desc4 = "menu_toggle,0.0683453,0.738806,rect,0.0142885,0.0122882"
 
 overlay1_desc5 = "6button_bg,0.93,0.900853,rect,0.0540000,0.080000"
-overlay1_desc5_overlay = "main_6btn_bg.png"
-
+overlay1_desc5_overlay = img-md/main_6btn_bg.png
 overlay1_desc6 = "y,0.8986,0.931,radial,0.0148,0.0263"
-overlay1_desc6_overlay = "button_a.png"
+overlay1_desc6_overlay = img-md/button_a.png
 overlay1_desc7 = "b,0.929500,0.931,radial,0.0148,0.0263"
-overlay1_desc7_overlay = "button_b.png"
+overlay1_desc7_overlay = img-md/button_b.png
 overlay1_desc8 = "a,0.960500,0.931,radial,0.0148,0.0263"
-overlay1_desc8_overlay = "button_c.png"
-
-
+overlay1_desc8_overlay = img-md/button_c.png
 overlay1_desc9 = "select,0.928700,0.806000,rect,0.007900,0.014300"
-overlay1_desc9_overlay = "button_mode_6b.png"
-
-overlay1_desc14 = "overlay_next,0.928700,0.806000,rect,0.007900,0.014300"
-overlay1_desc14_next_target = "overlay0"
-
+overlay1_desc9_overlay = img-md/button_mode_6b.png
 overlay1_desc10 = "l,0.9024,0.8805,radial,0.0102,0.0185"
-overlay1_desc10_overlay = "button_x.png"
+overlay1_desc10_overlay = img-md/button_x.png
 overlay1_desc11 = "x,0.9295,0.8805,radial,0.0102,0.0185"
-overlay1_desc11_overlay = "button_y.png"
+overlay1_desc11_overlay = img-md/button_y.png
 overlay1_desc12 = "r,0.9555,0.8805,radial,0.0102,0.0185"
-overlay1_desc12_overlay = "button_z.png"
+overlay1_desc12_overlay = img-md/button_z.png
 
 overlay1_desc13 = "start,0.9285,0.7505,rect,0.0232231,0.0177"
-overlay1_desc13_overlay = "button_start.png"
-
-
-
-
-
+overlay1_desc13_overlay = img-md/button_start.png
 
+overlay1_desc14 = "overlay_next,0.928700,0.806000,rect,0.007900,0.014300"
+overlay1_desc14_next_target = "3-button"

borders/animated-border/nes-border.cfg

@@ -1,54 +1,55 @@
-overlays = 1
-
-overlay0_full_screen = true
-overlay0_normalized = true
-overlay0_range_mod = 1.5
-overlay0_alpha_mod = 0.0001
-overlay0_overlay = background.png
-
-overlay0_descs = 11
-overlay0_desc0 = "left,0.038,0.601,rect,0.0125,0.0255"
-overlay0_desc0_overlay = l.png
-overlay0_desc1 = "right,0.09,0.601,rect,0.0125,0.0255"
-overlay0_desc1_overlay = r.png
-overlay0_desc2 = "up,0.0645,0.555,rect,0.0145,0.022"
-overlay0_desc2_overlay = u.png
-overlay0_desc3 = "down,0.0645,0.6495,rect,0.015,0.022"
-overlay0_desc3_overlay = d.png
-overlay0_desc4 = "start,0.965,0.5375,rect,0.02,0.0175"
-overlay0_desc4_overlay = s.png
-overlay0_desc6 = "null,0.9492,0.823,radial,0.03475,0.051"
-
-overlay0_desc5 = "a,0.965,0.685,radial,0.02,0.035"
-overlay0_desc5_overlay = b.png
-overlay0_desc7 = "b,0.91,0.685,radial,0.02,0.035"
-overlay0_desc7_overlay = b.png
-overlay0_desc9 = "nul,0.8385,0.941,radial,0.03475,0.051"
-overlay0_desc8 = "nul,0.855,0.845,radial,0.03475,0.051"
-overlay0_desc10 = "select,0.915,0.5375,rect,0.02,0.0175"
-overlay0_desc10_overlay = s.png
-
-overlay0_desc11 = "nul,0.48,0.95833333333,radial,0.025,0.04166666667"
-//overlay0_desc11_overlay = next.png
-
-overlay0_desc12 = "nul,0.04375,0.9270833333333,radial,0.03125,0.0520833333333"
-overlay0_desc13 = "nul,0.19375,0.67708333333,radial,0.03125,0.0520833333333"
-overlay0_desc14 = "nul,0.04375,0.67708333333,radial,0.03125,0.0520833333333"
-overlay0_desc15 = "nul,0.19375,0.9270833333333,radial,0.03125,0.0520833333333"
-overlay0_desc16 = "nul,0.11845,0.8021,radial,0.127575,0.212625"
-//overlay0_desc16_overlay = analog-background.png
-overlay0_desc17 = "nul,0.5,0.1,radial,0.025,0.04166666666"
-//overlay0_desc17_overlay = rgui.png
-overlay0_desc18 = "nul,0.3,0.1,radial,0.025,0.04166666666"
-//overlay0_desc18_overlay = rotate.png
-
-overlay0_desc19 = "nul,0.7,0.1,radial,0.025,0.04166666666"
-//overlay0_desc19_overlay = 4button.png
-
-overlay0_desc20 = "nul,0.0375,0.075,rect,0.025,0.055"
-//overlay0_desc20_overlay = coin.png
-overlay0_desc21 = "analog_left,0.095,0.84,radial,0.05,0.085"
-overlay0_desc21_alpha_mod = 1.0
-overlay0_desc21_overlay = balltop.png
-overlay0_desc21_pct = 0.75
+overlays = 1
+
+overlay0_name = "overlay0"
+overlay0_full_screen = true
+overlay0_normalized = true
+overlay0_range_mod = 1.5
+overlay0_alpha_mod = 0.0001
+overlay0_overlay = img-nes/background.png
+
+overlay0_descs = 11
+overlay0_desc0 = "left,0.038,0.601,rect,0.0125,0.0255"
+overlay0_desc0_overlay = img-nes/l.png
+overlay0_desc1 = "right,0.09,0.601,rect,0.0125,0.0255"
+overlay0_desc1_overlay = img-nes/r.png
+overlay0_desc2 = "up,0.0645,0.555,rect,0.0145,0.022"
+overlay0_desc2_overlay = img-nes/u.png
+overlay0_desc3 = "down,0.0645,0.6495,rect,0.015,0.022"
+overlay0_desc3_overlay = img-nes/d.png
+overlay0_desc4 = "start,0.965,0.5375,rect,0.02,0.0175"
+overlay0_desc4_overlay = img-nes/s.png
+
+overlay0_desc5 = "a,0.965,0.685,radial,0.02,0.035"
+overlay0_desc5_overlay = img-nes/b.png
+overlay0_desc6 = "nul,0.9492,0.823,radial,0.03475,0.051"
+overlay0_desc7 = "b,0.91,0.685,radial,0.02,0.035"
+overlay0_desc7_overlay = img-nes/b.png
+overlay0_desc8 = "nul,0.855,0.845,radial,0.03475,0.051"
+overlay0_desc9 = "nul,0.8385,0.941,radial,0.03475,0.051"
+overlay0_desc10 = "select,0.915,0.5375,rect,0.02,0.0175"
+overlay0_desc10_overlay = img-nes/s.png
+
+overlay0_desc11 = "nul,0.48,0.95833333333,radial,0.025,0.04166666667"
+//overlay0_desc11_overlay = img-nes/next.png
+
+overlay0_desc12 = "nul,0.04375,0.9270833333333,radial,0.03125,0.0520833333333"
+overlay0_desc13 = "nul,0.19375,0.67708333333,radial,0.03125,0.0520833333333"
+overlay0_desc14 = "nul,0.04375,0.67708333333,radial,0.03125,0.0520833333333"
+overlay0_desc15 = "nul,0.19375,0.9270833333333,radial,0.03125,0.0520833333333"
+overlay0_desc16 = "nul,0.11845,0.8021,radial,0.127575,0.212625"
+//overlay0_desc16_overlay = img-nes/analog-background.png
+overlay0_desc17 = "nul,0.5,0.1,radial,0.025,0.04166666666"
+//overlay0_desc17_overlay = img-nes/rgui.png
+overlay0_desc18 = "nul,0.3,0.1,radial,0.025,0.04166666666"
+//overlay0_desc18_overlay = img-nes/rotate.png
+
+overlay0_desc19 = "nul,0.7,0.1,radial,0.025,0.04166666666"
+//overlay0_desc19_overlay = img-nes/4button.png
+
+overlay0_desc20 = "nul,0.0375,0.075,rect,0.025,0.055"
+//overlay0_desc20_overlay = img-nes/coin.png
+overlay0_desc21 = "analog_left,0.095,0.84,radial,0.05,0.085"
+overlay0_desc21_alpha_mod = 1.0
+overlay0_desc21_overlay = img-nes/balltop.png
+overlay0_desc21_pct = 0.75
 overlay0_desc21_movable = true

borders/animated-border/psx_animated_border.cfg

@@ -7,57 +7,50 @@ overlay0_full_screen = "true"
 overlay0_normalized = "true"
 overlay0_name = "overlay0"
 overlay0_alpha_mod = "0.000100"
-overlay0_overlay = "main_body_lights.png"
+overlay0_overlay = img-psx/main_body_lights.png
 overlay0_descs = "19"
 
-
 overlay0_desc0 = "l3,0.0640,0.8910,rect,0.0355,0.0650"
-overlay0_desc0_overlay = "THUMB_BTN.png"  
+overlay0_desc0_overlay = img-psx/THUMB_BTN.png  
 overlay0_desc1 = "analog_left,0.0640,0.890041,radial,0.031633,0.0574116"
-overlay0_desc1_overlay = "ANALOG_THUMB.png"
+overlay0_desc1_overlay = img-psx/ANALOG_THUMB.png
 overlay0_desc1_movable = true
-
-
 overlay0_desc2 = "r3,0.9360,0.8910,rect,0.0355,0.0650"
-overlay0_desc2_overlay = "THUMB_BTN.png"
+overlay0_desc2_overlay = img-psx/THUMB_BTN.png
 overlay0_desc3 = "analog_right,0.9355,0.890041,radial,0.031633,0.0574115"
-overlay0_desc3_overlay = "ANALOG_THUMB.png"
+overlay0_desc3_overlay = img-psx/ANALOG_THUMB.png
 overlay0_desc3_movable = true
 
-
 overlay0_desc16 = "select,0.0650,0.742739,rect,0.0111173,0.0107283"
-overlay0_desc16_overlay = "SELECT.png"
-
+overlay0_desc16_overlay = img-psx/SELECT.png
 overlay0_desc17 = "start,0.9375,0.7418,rect,0.0118781,0.0113808"
-overlay0_desc17_overlay = "PLAY.png"
+overlay0_desc17_overlay = img-psx/PLAY.png
 
 overlay0_desc8 = "l,0.0625,0.304979,rect,0.0225078,0.0166699"
-overlay0_desc8_overlay = "L-R1.png"
+overlay0_desc8_overlay = img-psx/L-R1.png
 overlay0_desc9 = "l2,0.0625,0.369295,rect,0.0225078,0.0166699"
-overlay0_desc9_overlay = "L-R2.png"
-
+overlay0_desc9_overlay = img-psx/L-R2.png
 overlay0_desc10 = "r,0.9360,0.304979,rect,0.0225078,0.0166699"
-overlay0_desc10_overlay = "L-R1.png"
+overlay0_desc10_overlay = img-psx/L-R1.png
 overlay0_desc11 = "r2,0.9360,0.369295,rect,0.0225078,0.0166699"
-overlay0_desc11_overlay = "L-R2.png"
+overlay0_desc11_overlay = img-psx/L-R2.png
 
 overlay0_desc4 = "down,0.0660,0.60166,rect,0.0136772,0.0244764"
-overlay0_desc4_overlay = "DOWN.png"
+overlay0_desc4_overlay = img-psx/DOWN.png
 overlay0_desc5 = "up,0.0660,0.524896,rect,0.0122912,0.0250239"
-overlay0_desc5_overlay = "UP.png"
+overlay0_desc5_overlay = img-psx/UP.png
 overlay0_desc6 = "right,0.0870,0.562241,rect,0.0146459,0.0233932"
-overlay0_desc6_overlay = "RIGHT.png"
+overlay0_desc6_overlay = img-psx/RIGHT.png
 overlay0_desc7 = "left,0.0445,0.562241,rect,0.0140352,0.0207932"
-overlay0_desc7_overlay = "LEFT.png"
-
+overlay0_desc7_overlay = img-psx/LEFT.png
 
 overlay0_desc12 = "b,0.9375,0.6165,radial,0.0155,0.0272"
-overlay0_desc12_overlay = "CROSS.png"
+overlay0_desc12_overlay = img-psx/CROSS.png
 overlay0_desc13 = "x,0.9375,0.5100,radial,0.0155,0.0272"
-overlay0_desc13_overlay = "TRIANGLE.png"
+overlay0_desc13_overlay = img-psx/TRIANGLE.png
 overlay0_desc14 = "a,0.9665,0.564,radial,0.0155,0.0272"
-overlay0_desc14_overlay = "CIRCLE.png"
+overlay0_desc14_overlay = img-psx/CIRCLE.png
 overlay0_desc15 = "y,0.9075,0.564,radial,0.0155,0.0272"
-overlay0_desc15_overlay = "SQUARE.png"
+overlay0_desc15_overlay = img-psx/SQUARE.png
 
-overlay0_desc18 = "menu_toggle,0.063,0.142,radial,0.04,0.07"
+overlay0_desc18 = "menu_toggle,0.063,0.142,radial,0.04,0.07"

borders/animated-border/super_famicom_animated_border.cfg

@@ -2,7 +2,10 @@
 # BY FERCHO
 # 18 SEPTEMBER 2022
 # INFO AND UPDATES: https://www.youtube.com/channel/UCNtiyiGXMO6ztv4Woh6jeFA
+
 overlays = 4
+
+# BZL_LIGHT
 overlay0_name = "BZL_LIGHT"
 overlay0_full_screen = true
 overlay0_normalized = true
@@ -10,53 +13,55 @@ overlay0_alpha_mod = 0.000100
 overlay0_aspect_ratio = 1.7777778
 overlay0_descs = 27
 overlay0_desc0 = "BEZEL_LEFT,0.2535,0.5,rect,0.25,0.5"
-overlay0_desc0_overlay = BEZEL_LEFT.png
+overlay0_desc0_overlay = img-sfc/BEZEL_LEFT.png
 overlay0_desc1 = "BEZEL_RIGHT,0.7495,0.5,rect,0.25,0.5"
-overlay0_desc1_overlay = BEZEL_RIGHT.png
+overlay0_desc1_overlay = img-sfc/BEZEL_RIGHT.png
 overlay0_desc2 = "TOP_CENTER,0.5,0.009,rect,0.25,0.0085"
-overlay0_desc2_overlay = 0_CENTER_TOP.png
+overlay0_desc2_overlay = img-sfc/0_CENTER_TOP.png
 overlay0_desc3 = "BOTTOM_CENTER,0.5,0.992,rect,0.25,0.0088"
-overlay0_desc3_overlay = 0_CENTER_BOTTOM.png
+overlay0_desc3_overlay = img-sfc/0_CENTER_BOTTOM.png
 overlay0_desc4 = "0_LEFT,0.25,0.5,rect,0.25,0.5"
-overlay0_desc4_overlay = 0_LEFT.png
+overlay0_desc4_overlay = img-sfc/0_LEFT.png
 overlay0_desc5 = "0_RIGHT,0.75,0.5,rect,0.25,0.5"
-overlay0_desc5_overlay = 0_RIGHT.png
+overlay0_desc5_overlay = img-sfc/0_RIGHT.png
 overlay0_desc6 = "l,0.0695,0.2713,rect,0.0482,0.036"
-overlay0_desc6_overlay = 0_L_BTN.png
+overlay0_desc6_overlay = img-sfc/0_L_BTN.png
 overlay0_desc7 = "r,0.93055,0.2713,rect,0.0482,0.036"
-overlay0_desc7_overlay = 0_R_BTN.png
+overlay0_desc7_overlay = img-sfc/0_R_BTN.png
 overlay0_desc8 = "up,0.0642,0.417,rect,0.0165,0.025"
-overlay0_desc8_overlay = 0_PAD_UP.png
+overlay0_desc8_overlay = img-sfc/0_PAD_UP.png
 overlay0_desc9 = "right|up,0.0982,0.41221,radial,0.015,0.0248"
 overlay0_desc10 = "right,0.09588,0.47427,rect,0.01409,0.03273"
-overlay0_desc10_overlay = 0_PAD_RIGHT.png
+overlay0_desc10_overlay = img-sfc/0_PAD_RIGHT.png
 overlay0_desc11 = "right|down,0.0982,0.5368,radial,0.015,0.0248"
 overlay0_desc12 = "down,0.06432,0.526,rect,0.0169,0.032"
-overlay0_desc12_overlay = 0_PAD_DOWN.png
+overlay0_desc12_overlay = img-sfc/0_PAD_DOWN.png
 overlay0_desc13 = "left|down,0.0303,0.5368,radial,0.015,0.0248"
 overlay0_desc14 = "left,0.0318,0.477,rect,0.0145,0.0347"
-overlay0_desc14_overlay = 0_PAD_LEFT.png
+overlay0_desc14_overlay = img-sfc/0_PAD_LEFT.png
 overlay0_desc15 = "left|up,0.0303,0.41301,radial,0.015,0.0248"
 overlay0_desc16 = "x,0.93585,0.41660,radial,0.01815,0.03246"
-overlay0_desc16_overlay = BTN_X.png
+overlay0_desc16_overlay = img-sfc/BTN_X.png
 overlay0_desc17 = "y,0.90190,0.47195,radial,0.01815,0.03246"
-overlay0_desc17_overlay = BTN_Y.png
+overlay0_desc17_overlay = img-sfc/BTN_Y.png
 overlay0_desc18 = "b,0.93630,0.528,radial,0.01835,0.03277"
-overlay0_desc18_overlay = BTN_B.png
+overlay0_desc18_overlay = img-sfc/BTN_B.png
 overlay0_desc19 = "a,0.97043,0.4725,radial,0.01835,0.03277"
-overlay0_desc19_overlay = BTN_A.png
+overlay0_desc19_overlay = img-sfc/BTN_A.png
 overlay0_desc20 = "select,0.910935,0.66023,rect,0.0203,0.0343"
-overlay0_desc20_overlay = 0_DIAG_BTN.png
+overlay0_desc20_overlay = img-sfc/0_DIAG_BTN.png
 overlay0_desc21 = "start,0.96044,0.6602,rect,0.0203,0.0343"
-overlay0_desc21_overlay = 0_DIAG_BTN.png
+overlay0_desc21_overlay = img-sfc/0_DIAG_BTN.png
 overlay0_desc22 = "exit_emulator,0.064,0.85,rect,0.023,0.05"
 overlay0_desc23 = "reset,0.935,0.85,rect,0.023,0.05"
 overlay0_desc24 = "overlay_next,0.0875,0.6965,radial,0.0058,0.0102"
-overlay0_desc24_overlay = 0_BEZEL_LED.png
+overlay0_desc24_overlay = img-sfc/0_BEZEL_LED.png
 overlay0_desc24_next_target = "LIGHT"
 overlay0_desc25 = "menu_toggle,0.064,0.655,radial,0.012,0.022"
 overlay0_desc26 = "overlay_next,0.04,0.696,radial,0.009,0.017"
 overlay0_desc26_next_target = "BZL_DARK"
+
+# LIGHT
 overlay1_name = "LIGHT"
 overlay1_full_screen = true
 overlay1_normalized = true
@@ -64,41 +69,41 @@ overlay1_alpha_mod = 0.000100
 overlay1_aspect_ratio = 1.7777778
 overlay1_descs = 25
 overlay1_desc0 = "TOP_CENTER,0.5,0.009,rect,0.25,0.0085"
-overlay1_desc0_overlay = 0_CENTER_TOP.png
+overlay1_desc0_overlay = img-sfc/0_CENTER_TOP.png
 overlay1_desc1 = "BOTTOM_CENTER,0.5,0.992,rect,0.25,0.0088"
-overlay1_desc1_overlay = 0_CENTER_BOTTOM.png
+overlay1_desc1_overlay = img-sfc/0_CENTER_BOTTOM.png
 overlay1_desc2 = "0_LEFT,0.25,0.5,rect,0.25,0.5"
-overlay1_desc2_overlay = 0_LEFT.png
+overlay1_desc2_overlay = img-sfc/0_LEFT.png
 overlay1_desc3 = "0_RIGHT,0.75,0.5,rect,0.25,0.5"
-overlay1_desc3_overlay = 0_RIGHT.png
+overlay1_desc3_overlay = img-sfc/0_RIGHT.png
 overlay1_desc4 = "l,0.0695,0.2713,rect,0.0482,0.036"
-overlay1_desc4_overlay = 0_L_BTN.png
+overlay1_desc4_overlay = img-sfc/0_L_BTN.png
 overlay1_desc5 = "r,0.93055,0.2713,rect,0.0482,0.036"
-overlay1_desc5_overlay = 0_R_BTN.png
+overlay1_desc5_overlay = img-sfc/0_R_BTN.png
 overlay1_desc6 = "up,0.0642,0.417,rect,0.0165,0.025"
-overlay1_desc6_overlay = 0_PAD_UP.png
+overlay1_desc6_overlay = img-sfc/0_PAD_UP.png
 overlay1_desc7 = "right|up,0.0982,0.41221,radial,0.015,0.0248"
 overlay1_desc8 = "right,0.09588,0.47427,rect,0.01409,0.03273"
-overlay1_desc8_overlay = 0_PAD_RIGHT.png
+overlay1_desc8_overlay = img-sfc/0_PAD_RIGHT.png
 overlay1_desc9 = "right|down,0.0982,0.5368,radial,0.015,0.0248"
 overlay1_desc10 = "down,0.06432,0.526,rect,0.0169,0.032"
-overlay1_desc10_overlay = 0_PAD_DOWN.png
+overlay1_desc10_overlay = img-sfc/0_PAD_DOWN.png
 overlay1_desc11 = "left|down,0.0303,0.5368,radial,0.015,0.0248"
 overlay1_desc12 = "left,0.0318,0.477,rect,0.0145,0.0347"
-overlay1_desc12_overlay = 0_PAD_LEFT.png
+overlay1_desc12_overlay = img-sfc/0_PAD_LEFT.png
 overlay1_desc13 = "left|up,0.0303,0.41301,radial,0.015,0.0248"
 overlay1_desc14 = "x,0.93585,0.41660,radial,0.01815,0.03246"
-overlay1_desc14_overlay = BTN_X.png
+overlay1_desc14_overlay = img-sfc/BTN_X.png
 overlay1_desc15 = "y,0.90190,0.47195,radial,0.01815,0.03246"
-overlay1_desc15_overlay = BTN_Y.png
+overlay1_desc15_overlay = img-sfc/BTN_Y.png
 overlay1_desc16 = "b,0.93630,0.528,radial,0.01835,0.03277"
-overlay1_desc16_overlay = BTN_B.png
+overlay1_desc16_overlay = img-sfc/BTN_B.png
 overlay1_desc17 = "a,0.97043,0.4725,radial,0.01835,0.03277"
-overlay1_desc17_overlay = BTN_A.png
+overlay1_desc17_overlay = img-sfc/BTN_A.png
 overlay1_desc18 = "select,0.910935,0.66023,rect,0.0203,0.0343"
-overlay1_desc18_overlay = 0_DIAG_BTN.png
+overlay1_desc18_overlay = img-sfc/0_DIAG_BTN.png
 overlay1_desc19 = "start,0.96044,0.6602,rect,0.0203,0.0343"
-overlay1_desc19_overlay = 0_DIAG_BTN.png
+overlay1_desc19_overlay = img-sfc/0_DIAG_BTN.png
 overlay1_desc20 = "exit_emulator,0.064,0.85,rect,0.023,0.05"
 overlay1_desc21 = "reset,0.935,0.85,rect,0.023,0.05"
 overlay1_desc22 = "overlay_next,0.0875,0.6965,radial,0.0058,0.0102"
@@ -106,6 +111,8 @@ overlay1_desc22_next_target = "BZL_LIGHT"
 overlay1_desc23 = "menu_toggle,0.064,0.655,radial,0.012,0.022"
 overlay1_desc24 = "overlay_next,0.04,0.696,radial,0.009,0.017"
 overlay1_desc24_next_target = "DARK"
+
+# BZL_DARK
 overlay2_name = "BZL_DARK"
 overlay2_full_screen = true
 overlay2_normalized = true
@@ -113,53 +120,55 @@ overlay2_alpha_mod = 0.000100
 overlay2_aspect_ratio = 1.7777778
 overlay2_descs = 27
 overlay2_desc0 = "BEZEL_LEFT,0.2535,0.5,rect,0.25,0.5"
-overlay2_desc0_overlay = BEZEL_LEFT.png
+overlay2_desc0_overlay = img-sfc/BEZEL_LEFT.png
 overlay2_desc1 = "BEZEL_RIGHT,0.7495,0.5,rect,0.25,0.5"
-overlay2_desc1_overlay = BEZEL_RIGHT.png
+overlay2_desc1_overlay = img-sfc/BEZEL_RIGHT.png
 overlay2_desc2 = "TOP_CENTER,0.5,0.009,rect,0.25,0.0085"
-overlay2_desc2_overlay = 1_CENTER_TOP.png
+overlay2_desc2_overlay = img-sfc/1_CENTER_TOP.png
 overlay2_desc3 = "BOTTOM_CENTER,0.5,0.992,rect,0.25,0.0088"
-overlay2_desc3_overlay = 1_CENTER_BOTTOM.png
+overlay2_desc3_overlay = img-sfc/1_CENTER_BOTTOM.png
 overlay2_desc4 = "0_LEFT,0.25,0.5,rect,0.25,0.5"
-overlay2_desc4_overlay = 1_LEFT.png
+overlay2_desc4_overlay = img-sfc/1_LEFT.png
 overlay2_desc5 = "0_RIGHT,0.75,0.5,rect,0.25,0.5"
-overlay2_desc5_overlay = 1_RIGHT.png
+overlay2_desc5_overlay = img-sfc/1_RIGHT.png
 overlay2_desc6 = "l,0.0695,0.2713,rect,0.0482,0.036"
-overlay2_desc6_overlay = 1_L_BTN.png
+overlay2_desc6_overlay = img-sfc/1_L_BTN.png
 overlay2_desc7 = "r,0.93055,0.2713,rect,0.0482,0.036"
-overlay2_desc7_overlay = 1_R_BTN.png
+overlay2_desc7_overlay = img-sfc/1_R_BTN.png
 overlay2_desc8 = "up,0.0642,0.417,rect,0.0165,0.025"
-overlay2_desc8_overlay = 1_PAD_UP.png
+overlay2_desc8_overlay = img-sfc/1_PAD_UP.png
 overlay2_desc9 = "right|up,0.0982,0.41221,radial,0.015,0.0248"
 overlay2_desc10 = "right,0.09588,0.47427,rect,0.01409,0.03273"
-overlay2_desc10_overlay = 1_PAD_RIGHT.png
+overlay2_desc10_overlay = img-sfc/1_PAD_RIGHT.png
 overlay2_desc11 = "right|down,0.0982,0.5368,radial,0.015,0.0248"
 overlay2_desc12 = "down,0.06432,0.5265,rect,0.0169,0.0335"
-overlay2_desc12_overlay = 1_PAD_DOWN.png
+overlay2_desc12_overlay = img-sfc/1_PAD_DOWN.png
 overlay2_desc13 = "left|down,0.0303,0.5368,radial,0.015,0.0248"
 overlay2_desc14 = "left,0.0318,0.4765,rect,0.0145,0.0347"
-overlay2_desc14_overlay = 1_PAD_LEFT.png
+overlay2_desc14_overlay = img-sfc/1_PAD_LEFT.png
 overlay2_desc15 = "left|up,0.0303,0.41301,radial,0.015,0.0248"
 overlay2_desc16 = "x,0.93585,0.41660,radial,0.01815,0.03246"
-overlay2_desc16_overlay = BTN_X.png
+overlay2_desc16_overlay = img-sfc/BTN_X.png
 overlay2_desc17 = "y,0.90190,0.47195,radial,0.01815,0.03246"
-overlay2_desc17_overlay = BTN_Y.png
+overlay2_desc17_overlay = img-sfc/BTN_Y.png
 overlay2_desc18 = "b,0.93630,0.528,radial,0.01835,0.03277"
-overlay2_desc18_overlay = BTN_B.png
+overlay2_desc18_overlay = img-sfc/BTN_B.png
 overlay2_desc19 = "a,0.97043,0.4725,radial,0.01835,0.03277"
-overlay2_desc19_overlay = BTN_A.png
+overlay2_desc19_overlay = img-sfc/BTN_A.png
 overlay2_desc20 = "select,0.9115,0.6602,rect,0.0203,0.0343"
-overlay2_desc20_overlay = 1_DIAG_BTN.png
+overlay2_desc20_overlay = img-sfc/1_DIAG_BTN.png
 overlay2_desc21 = "start,0.96095,0.6602,rect,0.0203,0.0343"
-overlay2_desc21_overlay = 1_DIAG_BTN.png
+overlay2_desc21_overlay = img-sfc/1_DIAG_BTN.png
 overlay2_desc22 = "exit_emulator,0.064,0.85,rect,0.023,0.05"
 overlay2_desc23 = "reset,0.935,0.85,rect,0.023,0.05"
 overlay2_desc24 = "overlay_next,0.0875,0.6975,radial,0.0060,0.0110"
-overlay2_desc24_overlay = 1_BEZEL_LED.png
+overlay2_desc24_overlay = img-sfc/1_BEZEL_LED.png
 overlay2_desc24_next_target = "DARK"
 overlay2_desc25 = "menu_toggle,0.064,0.655,radial,0.012,0.022"
 overlay2_desc26 = "overlay_next,0.04,0.696,radial,0.009,0.017"
 overlay2_desc26_next_target = "BZL_LIGHT"
+
+# DARK
 overlay3_name = "DARK"
 overlay3_full_screen = true
 overlay3_normalized = true
@@ -167,41 +176,41 @@ overlay3_alpha_mod = 0.000100
 overlay3_aspect_ratio = 1.7777778
 overlay3_descs = 25
 overlay3_desc0 = "TOP_CENTER,0.5,0.009,rect,0.25,0.0085"
-overlay3_desc0_overlay = 1_CENTER_TOP.png
+overlay3_desc0_overlay = img-sfc/1_CENTER_TOP.png
 overlay3_desc1 = "BOTTOM_CENTER,0.5,0.992,rect,0.25,0.0088"
-overlay3_desc1_overlay = 1_CENTER_BOTTOM.png
+overlay3_desc1_overlay = img-sfc/1_CENTER_BOTTOM.png
 overlay3_desc2 = "0_LEFT,0.25,0.5,rect,0.25,0.5"
-overlay3_desc2_overlay = 1_LEFT.png
+overlay3_desc2_overlay = img-sfc/1_LEFT.png
 overlay3_desc3 = "0_RIGHT,0.75,0.5,rect,0.25,0.5"
-overlay3_desc3_overlay = 1_RIGHT.png
+overlay3_desc3_overlay = img-sfc/1_RIGHT.png
 overlay3_desc4 = "l,0.0695,0.2713,rect,0.0482,0.036"
-overlay3_desc4_overlay = 1_L_BTN.png
+overlay3_desc4_overlay = img-sfc/1_L_BTN.png
 overlay3_desc5 = "r,0.93055,0.2713,rect,0.0482,0.036"
-overlay3_desc5_overlay = 1_R_BTN.png
+overlay3_desc5_overlay = img-sfc/1_R_BTN.png
 overlay3_desc6 = "up,0.0642,0.417,rect,0.0165,0.025"
-overlay3_desc6_overlay = 1_PAD_UP.png
+overlay3_desc6_overlay = img-sfc/1_PAD_UP.png
 overlay3_desc7 = "right|up,0.0982,0.41221,radial,0.015,0.0248"
 overlay3_desc8 = "right,0.09588,0.47427,rect,0.01409,0.03273"
-overlay3_desc8_overlay = 1_PAD_RIGHT.png
+overlay3_desc8_overlay = img-sfc/1_PAD_RIGHT.png
 overlay3_desc9 = "right|down,0.0982,0.5368,radial,0.015,0.0248"
 overlay3_desc10 = "down,0.06432,0.5265,rect,0.0169,0.0335"
-overlay3_desc10_overlay = 1_PAD_DOWN.png
+overlay3_desc10_overlay = img-sfc/1_PAD_DOWN.png
 overlay3_desc11 = "left|down,0.0303,0.5368,radial,0.015,0.0248"
 overlay3_desc12 = "left,0.0318,0.4765,rect,0.0145,0.0347"
-overlay3_desc12_overlay = 1_PAD_LEFT.png
+overlay3_desc12_overlay = img-sfc/1_PAD_LEFT.png
 overlay3_desc13 = "left|up,0.0303,0.41301,radial,0.015,0.0248"
 overlay3_desc14 = "x,0.93585,0.41660,radial,0.01815,0.03246"
-overlay3_desc14_overlay = BTN_X.png
+overlay3_desc14_overlay = img-sfc/BTN_X.png
 overlay3_desc15 = "y,0.90190,0.47195,radial,0.01815,0.03246"
-overlay3_desc15_overlay = BTN_Y.png
+overlay3_desc15_overlay = img-sfc/BTN_Y.png
 overlay3_desc16 = "b,0.93630,0.528,radial,0.01835,0.03277"
-overlay3_desc16_overlay = BTN_B.png
+overlay3_desc16_overlay = img-sfc/BTN_B.png
 overlay3_desc17 = "a,0.97043,0.4725,radial,0.01835,0.03277"
-overlay3_desc17_overlay = BTN_A.png
+overlay3_desc17_overlay = img-sfc/BTN_A.png
 overlay3_desc18 = "select,0.9115,0.6602,rect,0.0203,0.0343"
-overlay3_desc18_overlay = 1_DIAG_BTN.png
+overlay3_desc18_overlay = img-sfc/1_DIAG_BTN.png
 overlay3_desc19 = "start,0.96095,0.6602,rect,0.0203,0.0343"
-overlay3_desc19_overlay = 1_DIAG_BTN.png
+overlay3_desc19_overlay = img-sfc/1_DIAG_BTN.png
 overlay3_desc20 = "exit_emulator,0.064,0.85,rect,0.023,0.05"
 overlay3_desc21 = "reset,0.935,0.85,rect,0.023,0.05"
 overlay3_desc22 = "overlay_next,0.0875,0.6975,radial,0.0060,0.0110"

borders/gb-4k.cfg

@@ -1,4 +1,4 @@
 overlays = 1
-overlay0_overlay = gb-4k.png
+overlay0_overlay = img/gb-4k.png
 overlay0_full_screen = true
-overlay0_descs = 0
+overlay0_descs = 0

borders/gb.cfg

@@ -1,7 +1,4 @@
 overlays = 1
-
-overlay0_overlay = gb.png
-
+overlay0_overlay = img/gb.png
 overlay0_full_screen = true
-
-overlay0_descs = 0
+overlay0_descs = 0

borders/gba-4k.cfg

@@ -1,4 +1,4 @@
 overlays = 1
-overlay0_overlay = gba-4k.png
+overlay0_overlay = img/gba-4k.png
 overlay0_full_screen = true
-overlay0_descs = 0
+overlay0_descs = 0

borders/nes-smb2-integer.cfg

@@ -1,7 +1,4 @@
 overlays = 1
-
-overlay0_overlay = nes-smb2-integer.png
-
+overlay0_overlay = img/nes-smb2-integer.png
 overlay0_full_screen = true
-
-overlay0_descs = 0
+overlay0_descs = 0

borders/snes-castlevania4-integer.cfg

@@ -1,7 +1,4 @@
 overlays = 1
-
-overlay0_overlay = snes-castlevania4-integer.png
-
+overlay0_overlay = img/snes-castlevania4-integer.png
 overlay0_full_screen = true
-
-overlay0_descs = 0
+overlay0_descs = 0

borders/snes-ct-integer.cfg

@@ -1,7 +1,4 @@
 overlays = 1
-
-overlay0_overlay = snes-ct-integer.png
-
+overlay0_overlay = img/snes-ct-integer.png
 overlay0_full_screen = true
-
-overlay0_descs = 0
+overlay0_descs = 0

borders/snes-demonscrest-integer.cfg

@@ -1,7 +1,4 @@
 overlays = 1
-
-overlay0_overlay = snes-demonscrest-integer.png
-
+overlay0_overlay = img/snes-demonscrest-integer.png
 overlay0_full_screen = true
-
-overlay0_descs = 0
+overlay0_descs = 0

borders/snes-lttp.cfg

@@ -1,7 +1,4 @@
 overlays = 1
-
-overlay0_overlay = snes-lttp.png
-
+overlay0_overlay = img/snes-lttp.png
 overlay0_full_screen = true
-
-overlay0_descs = 0
+overlay0_descs = 0

borders/snes-metroid-integer.cfg

@@ -1,7 +1,4 @@
 overlays = 1
-
-overlay0_overlay = snes-metroid-integer.png
-
+overlay0_overlay = img/snes-metroid-integer.png
 overlay0_full_screen = true
-
-overlay0_descs = 0
+overlay0_descs = 0

borders/snes-smas-integer.cfg

@@ -1,7 +1,4 @@
 overlays = 1
-
-overlay0_overlay = snes-smas-integer.png
-
+overlay0_overlay = img/snes-smas-integer.png
 overlay0_full_screen = true
-
-overlay0_descs = 0
+overlay0_descs = 0

borders/tv-integer.cfg

@@ -1,7 +1,4 @@
 overlays = 1
-
-overlay0_overlay = tv-integer.png
-
+overlay0_overlay = img/tv-integer.png
 overlay0_full_screen = true
-
-overlay0_descs = 0
+overlay0_descs = 0

ctr/borders/a2600-integer.cfg

@@ -1,7 +1,4 @@
 overlays = 1
-
-overlay0_overlay = a2600-integer.png
-
+overlay0_overlay = img/a2600-integer.png
 overlay0_full_screen = true
-
-overlay0_descs = 0
+overlay0_descs = 0

ctr/borders/gb-alt3-grid-gray.cfg

@@ -1,7 +1,4 @@
 overlays = 1
-
-overlay0_overlay = gb-alt3-grid-gray.png
-
+overlay0_overlay = img/gb-alt3-grid-gray.png
 overlay0_full_screen = true
-
-overlay0_descs = 0
+overlay0_descs = 0

ctr/borders/gb-alt3-grid-green.cfg

@@ -1,7 +1,4 @@
 overlays = 1
-
-overlay0_overlay = gb-alt3-grid-green.png
-
+overlay0_overlay = img/gb-alt3-grid-green.png
 overlay0_full_screen = true
-
-overlay0_descs = 0
+overlay0_descs = 0

ctr/borders/gb-alt3.cfg

@@ -1,7 +1,4 @@
 overlays = 1
-
-overlay0_overlay = gb-alt3.png
-
+overlay0_overlay = img/gb-alt3.png
 overlay0_full_screen = true
-
-overlay0_descs = 0
+overlay0_descs = 0

ctr/borders/gb-integer-grid-gray.cfg

@@ -1,7 +1,4 @@
 overlays = 1
-
-overlay0_overlay = gb-integer-grid-gray.png
-
+overlay0_overlay = img/gb-integer-grid-gray.png
 overlay0_full_screen = true
-
-overlay0_descs = 0
+overlay0_descs = 0

ctr/borders/gb-integer.cfg

@@ -1,7 +1,4 @@
 overlays = 1
-
-overlay0_overlay = gb-integer.png
-
+overlay0_overlay = img/gb-integer.png
 overlay0_full_screen = true
-
-overlay0_descs = 0
+overlay0_descs = 0