From 0571ac694a3411f218b80ea4f77451dab3f78cf3 Mon Sep 17 00:00:00 2001
From: Dev <90421310+EstatoDeviato@users.noreply.github.com>
Date: Tue, 28 May 2024 16:09:24 +0200
Subject: [PATCH 01/16] Update ms maximum

---
 include/courtroom.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/courtroom.h b/include/courtroom.h
index a8942efe2..ae19423d5 100644
--- a/include/courtroom.h
+++ b/include/courtroom.h
@@ -561,7 +561,7 @@ class Courtroom : public QMainWindow {
 
   // Minumum and maximum number of parameters in the MS packet
   static const int MS_MINIMUM = 15;
-  static const int MS_MAXIMUM = 35;
+  static const int MS_MAXIMUM = 40;
   QString m_chatmessage[MS_MAXIMUM];
 
   QString previous_ic_message = "";

From d083e647eff8b8b8b0cf45fd600d827f04a39fd6 Mon Sep 17 00:00:00 2001
From: Dev <90421310+EstatoDeviato@users.noreply.github.com>
Date: Sun, 9 Jun 2024 10:26:53 +0200
Subject: [PATCH 02/16] Update courtroom.h

---
 include/courtroom.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/courtroom.h b/include/courtroom.h
index ae19423d5..a8942efe2 100644
--- a/include/courtroom.h
+++ b/include/courtroom.h
@@ -561,7 +561,7 @@ class Courtroom : public QMainWindow {
 
   // Minumum and maximum number of parameters in the MS packet
   static const int MS_MINIMUM = 15;
-  static const int MS_MAXIMUM = 40;
+  static const int MS_MAXIMUM = 35;
   QString m_chatmessage[MS_MAXIMUM];
 
   QString previous_ic_message = "";

From 933d3756c982a127be4d7dac1cda37243b7dfddd Mon Sep 17 00:00:00 2001
From: Dev <90421310+EstatoDeviato@users.noreply.github.com>
Date: Thu, 25 Jul 2024 10:33:43 +0200
Subject: [PATCH 03/16] add overlays folder

---
 src/path_functions.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/path_functions.cpp b/src/path_functions.cpp
index 5d638411d..62c7a6723 100644
--- a/src/path_functions.cpp
+++ b/src/path_functions.cpp
@@ -140,13 +140,17 @@ QString AOApplication::get_pos_path(const QString& pos, const bool desk)
   QString desk_override = read_design_ini("overlays/" + f_background, get_background_path("design.ini"));
   if (desk_override != "") {
     f_desk_image = desk_override;
-} else if (w_courtroom->server_overlay != "") { // BN+ Packet
+  }
+  else if (w_courtroom->server_overlay != "") { // BN+ Packet
     if (file_exists(get_image_suffix(
-            get_background_path(w_courtroom->server_overlay))))
-    {
+            get_background_path(w_courtroom->server_overlay)))) {
       f_desk_image = w_courtroom->server_overlay;
     }
-}
+    else if (file_exists(get_image_suffix(
+                 VPath("overlays/" + w_courtroom->server_overlay)))) {
+      f_desk_image = w_courtroom->server_overlay;
+    }
+  }
   if (desk) {
     return f_desk_image;
   }

From a13517763519db8ea435b8bc0cf0bf132fc8b7f1 Mon Sep 17 00:00:00 2001
From: Dev <90421310+EstatoDeviato@users.noreply.github.com>
Date: Thu, 25 Jul 2024 10:35:11 +0200
Subject: [PATCH 04/16] add overlays folder

---
 include/aolayer.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/aolayer.h b/include/aolayer.h
index cfe9ab2c5..bd548f668 100644
--- a/include/aolayer.h
+++ b/include/aolayer.h
@@ -178,7 +178,7 @@ class BackgroundLayer : public AOLayer {
   Q_OBJECT
 public:
   BackgroundLayer(QWidget *p_parent, AOApplication *p_ao_app);
-  void load_image(QString p_filename);
+  void load_image(QString p_filename, bool desk = false);
 signals:
   void hide_void();
 protected:

From df760e1ebb17e739ac4ea8c1026ed4ce1ee9d35e Mon Sep 17 00:00:00 2001
From: Dev <90421310+EstatoDeviato@users.noreply.github.com>
Date: Thu, 25 Jul 2024 10:36:45 +0200
Subject: [PATCH 05/16] add overlays folder

---
 src/aolayer.cpp | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/aolayer.cpp b/src/aolayer.cpp
index e013d7075..3c3da9f4a 100644
--- a/src/aolayer.cpp
+++ b/src/aolayer.cpp
@@ -144,7 +144,7 @@ void AOLayer::move_and_center(int ax, int ay)
     center_pixmap(movie_frames[0]); // just use the first frame since dimensions are all that matter
 }
 
-void BackgroundLayer::load_image(QString p_filename)
+void BackgroundLayer::load_image(QString p_filename, bool desk)
 {
   play_once = false;
   cull_image = false;
@@ -155,7 +155,20 @@ void BackgroundLayer::load_image(QString p_filename)
 #ifdef DEBUG_MOVIE
   qDebug() << "[BackgroundLayer] BG loaded: " << p_filename;
 #endif
-  QString final_path = ao_app->get_image_suffix(ao_app->get_background_path(p_filename));
+  QString desk_override = read_design_ini("overlays/" + f_background, get_background_path("design.ini"));
+  if (desk_override != "") {
+    f_desk_image = desk_override;
+  }
+  else if (w_courtroom->server_overlay != "") { // BN+ Packet
+    if (file_exists(get_image_suffix(
+            get_background_path(w_courtroom->server_overlay)))) {
+      f_desk_image = w_courtroom->server_overlay;
+    }
+    else if (file_exists(get_image_suffix(
+                 VPath("overlays/" + w_courtroom->server_overlay)))) {
+      f_desk_image = w_courtroom->server_overlay;
+    }
+  }
 
   if (final_path == last_path) {
     // Don't restart background if background is unchanged

From 1f5a3adf64b0ebe31d8361cdcffd6989aeaa744b Mon Sep 17 00:00:00 2001
From: Dev <90421310+EstatoDeviato@users.noreply.github.com>
Date: Thu, 25 Jul 2024 10:37:40 +0200
Subject: [PATCH 06/16] add overlays folder

---
 src/courtroom.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/courtroom.cpp b/src/courtroom.cpp
index 2a2b46f37..4de1c6f43 100644
--- a/src/courtroom.cpp
+++ b/src/courtroom.cpp
@@ -4504,7 +4504,7 @@ void Courtroom::set_scene(bool show_desk, const QString f_side)
 {
   current_side = f_side;
   ui_vp_background->load_image(ao_app->get_pos_path(f_side));
-  ui_vp_desk->load_image(ao_app->get_pos_path(f_side, true));
+  ui_vp_desk->load_image(ao_app->get_pos_path(f_side, true), true);
 
   if (show_desk)
     ui_vp_desk->show();

From 279c1df250d5404a102bd367da1dd7f7b0bfee61 Mon Sep 17 00:00:00 2001
From: Dev <90421310+EstatoDeviato@users.noreply.github.com>
Date: Thu, 25 Jul 2024 10:41:04 +0200
Subject: [PATCH 07/16] correct wrong copy paste

---
 src/aolayer.cpp | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/aolayer.cpp b/src/aolayer.cpp
index 3c3da9f4a..be052e598 100644
--- a/src/aolayer.cpp
+++ b/src/aolayer.cpp
@@ -155,18 +155,16 @@ void BackgroundLayer::load_image(QString p_filename, bool desk)
 #ifdef DEBUG_MOVIE
   qDebug() << "[BackgroundLayer] BG loaded: " << p_filename;
 #endif
-  QString desk_override = read_design_ini("overlays/" + f_background, get_background_path("design.ini"));
-  if (desk_override != "") {
-    f_desk_image = desk_override;
+  QString final_path = "";
+  if (!desk) {
+    final_path = ao_app->get_image_suffix(ao_app->get_background_path(p_filename));
   }
-  else if (w_courtroom->server_overlay != "") { // BN+ Packet
-    if (file_exists(get_image_suffix(
-            get_background_path(w_courtroom->server_overlay)))) {
-      f_desk_image = w_courtroom->server_overlay;
+  else {
+    if (file_exists(ao_app->get_image_suffix(ao_app->get_background_path(p_filename)))) {
+      final_path = ao_app->get_image_suffix(ao_app->get_background_path(p_filename));
     }
-    else if (file_exists(get_image_suffix(
-                 VPath("overlays/" + w_courtroom->server_overlay)))) {
-      f_desk_image = w_courtroom->server_overlay;
+    else {
+      final_path = ao_app->get_image_suffix(VPath("overlays/" + p_filename));
     }
   }
 

From 9b719add119fdf1d5f6745c407adfba47c7feb55 Mon Sep 17 00:00:00 2001
From: Dev <90421310+EstatoDeviato@users.noreply.github.com>
Date: Mon, 9 Dec 2024 14:02:30 +0100
Subject: [PATCH 08/16] remove bool desk

---
 include/aolayer.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/aolayer.h b/include/aolayer.h
index bd548f668..cfe9ab2c5 100644
--- a/include/aolayer.h
+++ b/include/aolayer.h
@@ -178,7 +178,7 @@ class BackgroundLayer : public AOLayer {
   Q_OBJECT
 public:
   BackgroundLayer(QWidget *p_parent, AOApplication *p_ao_app);
-  void load_image(QString p_filename, bool desk = false);
+  void load_image(QString p_filename);
 signals:
   void hide_void();
 protected:

From f4eb5334bfe6ff49a80970785660350c459f8f31 Mon Sep 17 00:00:00 2001
From: Dev <90421310+EstatoDeviato@users.noreply.github.com>
Date: Mon, 9 Dec 2024 14:03:35 +0100
Subject: [PATCH 09/16] remove bool desk

---
 src/aolayer.cpp | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/src/aolayer.cpp b/src/aolayer.cpp
index be052e598..413f546a0 100644
--- a/src/aolayer.cpp
+++ b/src/aolayer.cpp
@@ -144,7 +144,7 @@ void AOLayer::move_and_center(int ax, int ay)
     center_pixmap(movie_frames[0]); // just use the first frame since dimensions are all that matter
 }
 
-void BackgroundLayer::load_image(QString p_filename, bool desk)
+void BackgroundLayer::load_image(QString p_filename)
 {
   play_once = false;
   cull_image = false;
@@ -155,18 +155,8 @@ void BackgroundLayer::load_image(QString p_filename, bool desk)
 #ifdef DEBUG_MOVIE
   qDebug() << "[BackgroundLayer] BG loaded: " << p_filename;
 #endif
-  QString final_path = "";
-  if (!desk) {
-    final_path = ao_app->get_image_suffix(ao_app->get_background_path(p_filename));
-  }
-  else {
-    if (file_exists(ao_app->get_image_suffix(ao_app->get_background_path(p_filename)))) {
-      final_path = ao_app->get_image_suffix(ao_app->get_background_path(p_filename));
-    }
-    else {
-      final_path = ao_app->get_image_suffix(VPath("overlays/" + p_filename));
-    }
-  }
+  QString final_path = ao_app->get_image_suffix(ao_app->get_background_path(p_filename));
+
 
   if (final_path == last_path) {
     // Don't restart background if background is unchanged

From 70afdb94e0ab529317600be3daceb53a8d36933d Mon Sep 17 00:00:00 2001
From: Dev <90421310+EstatoDeviato@users.noreply.github.com>
Date: Mon, 9 Dec 2024 14:04:18 +0100
Subject: [PATCH 10/16] remove bool desk

---
 src/courtroom.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/courtroom.cpp b/src/courtroom.cpp
index 0d576a310..dd115025b 100644
--- a/src/courtroom.cpp
+++ b/src/courtroom.cpp
@@ -4509,7 +4509,7 @@ void Courtroom::set_scene(bool show_desk, const QString f_side)
 {
   current_side = f_side;
   ui_vp_background->load_image(ao_app->get_pos_path(f_side));
-  ui_vp_desk->load_image(ao_app->get_pos_path(f_side, true), true);
+  ui_vp_desk->load_image(ao_app->get_pos_path(f_side, true));
 
   if (show_desk)
     ui_vp_desk->show();

From 61b03225fa941d36827b16d59c47d8dcab73df80 Mon Sep 17 00:00:00 2001
From: Dev <90421310+EstatoDeviato@users.noreply.github.com>
Date: Mon, 9 Dec 2024 14:05:03 +0100
Subject: [PATCH 11/16] remove blank line

---
 src/aolayer.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/aolayer.cpp b/src/aolayer.cpp
index 413f546a0..e013d7075 100644
--- a/src/aolayer.cpp
+++ b/src/aolayer.cpp
@@ -157,7 +157,6 @@ void BackgroundLayer::load_image(QString p_filename)
 #endif
   QString final_path = ao_app->get_image_suffix(ao_app->get_background_path(p_filename));
 
-
   if (final_path == last_path) {
     // Don't restart background if background is unchanged
     return;

From b85778e0cde72cde019011d7b1f2d6229f3f73b3 Mon Sep 17 00:00:00 2001
From: Dev <90421310+EstatoDeviato@users.noreply.github.com>
Date: Mon, 9 Dec 2024 14:10:43 +0100
Subject: [PATCH 12/16] Update path_functions.cpp

---
 src/path_functions.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/path_functions.cpp b/src/path_functions.cpp
index 62c7a6723..90bf47676 100644
--- a/src/path_functions.cpp
+++ b/src/path_functions.cpp
@@ -66,7 +66,11 @@ VPath AOApplication::get_music_path(QString p_song)
 VPath AOApplication::get_background_path(QString p_file)
 {
   if (courtroom_constructed) {
-    return VPath("background/" + w_courtroom->get_current_background() + "/" + p_file);
+    if (p_file.startsWith("overlays/")){
+      return VPath(p_file)
+    }else{
+      return VPath("background/" + w_courtroom->get_current_background() + "/" + p_file);
+    }
   }
   return get_default_background_path(p_file);
 }
@@ -148,7 +152,7 @@ QString AOApplication::get_pos_path(const QString& pos, const bool desk)
     }
     else if (file_exists(get_image_suffix(
                  VPath("overlays/" + w_courtroom->server_overlay)))) {
-      f_desk_image = w_courtroom->server_overlay;
+      f_desk_image = "overlays/" + w_courtroom->server_overlay;
     }
   }
   if (desk) {

From 8462dc7c8e07ebc8f473f7757be55459ffadc50d Mon Sep 17 00:00:00 2001
From: Alex Noir <Varsash@gmail.com>
Date: Mon, 9 Dec 2024 16:47:02 +0300
Subject: [PATCH 13/16] >:(

---
 src/path_functions.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/path_functions.cpp b/src/path_functions.cpp
index 90bf47676..e528c009f 100644
--- a/src/path_functions.cpp
+++ b/src/path_functions.cpp
@@ -67,7 +67,7 @@ VPath AOApplication::get_background_path(QString p_file)
 {
   if (courtroom_constructed) {
     if (p_file.startsWith("overlays/")){
-      return VPath(p_file)
+      return VPath(p_file);
     }else{
       return VPath("background/" + w_courtroom->get_current_background() + "/" + p_file);
     }

From a451aba9d696a51e1aa79f5394f2c19592b7a8c1 Mon Sep 17 00:00:00 2001
From: Alex Noir <Varsash@gmail.com>
Date: Thu, 19 Dec 2024 02:27:50 +0300
Subject: [PATCH 14/16] Overhaul overlays to handle scenarios where: * You
 refer to a pos inside of the current BG * You refer to an overlay folder and
 want to draw pos from it depending on your current pos * You refer to a pos
 inside of an overlay folder

Add DRO client positions.ini support
Fix niche issues where background is not shown, or where pos_remove button doesn't appear (for example, if the chara's default pos is not present on the current dropdown list)
---
 include/aoapplication.h |  2 +
 src/aolayer.cpp         |  6 +--
 src/courtroom.cpp       | 32 ++++++++++++---
 src/path_functions.cpp  | 89 ++++++++++++++++++++++++++++++-----------
 4 files changed, 97 insertions(+), 32 deletions(-)

diff --git a/include/aoapplication.h b/include/aoapplication.h
index dae99c459..16b0433dd 100644
--- a/include/aoapplication.h
+++ b/include/aoapplication.h
@@ -170,6 +170,8 @@ class AOApplication : public QApplication {
   QString get_image(QString p_element, QString p_theme="", QString p_subtheme="", QString p_default_theme="", QString p_misc="", QString p_character="", QString p_placeholder="", bool static_image=false);
   QString get_sfx(QString p_sfx, QString p_misc="", QString p_character="");
   QString get_pos_path(const QString& pos, bool desk = false);
+  // pre-2.8 old style pos handling
+  QString get_old_pos_path(const QString& pos, bool desk = false);
   QString get_case_sensitive_path(QString p_file);
   QString get_real_path(const VPath &vpath, const QStringList &suffixes={""});
   void invalidate_lookup_cache();
diff --git a/src/aolayer.cpp b/src/aolayer.cpp
index e013d7075..1806159ca 100644
--- a/src/aolayer.cpp
+++ b/src/aolayer.cpp
@@ -155,14 +155,12 @@ void BackgroundLayer::load_image(QString p_filename)
 #ifdef DEBUG_MOVIE
   qDebug() << "[BackgroundLayer] BG loaded: " << p_filename;
 #endif
-  QString final_path = ao_app->get_image_suffix(ao_app->get_background_path(p_filename));
-
-  if (final_path == last_path) {
+  if (p_filename == last_path) {
     // Don't restart background if background is unchanged
     return;
   }
 
-  start_playback(final_path);
+  start_playback(p_filename);
   play();
 }
 
diff --git a/src/courtroom.cpp b/src/courtroom.cpp
index dd115025b..cea51d22a 100644
--- a/src/courtroom.cpp
+++ b/src/courtroom.cpp
@@ -1679,19 +1679,33 @@ void Courtroom::set_background(QString p_background, bool display)
   // Populate the dropdown list with all pos that exist on this bg
   QStringList pos_list = {};
   for (const QString &key : default_pos.keys()) {
-    if (file_exists(ao_app->get_image_suffix(
-            ao_app->get_background_path(default_pos[key]))) || // if we have 2.8-style positions, e.g. def.png, wit.webp, hld.apng
-        file_exists(
+    if (file_exists(
             ao_app->get_image_suffix(ao_app->get_background_path(key)))) { // if we have pre-2.8-style positions, e.g. defenseempty.png
       pos_list.append(default_pos[key]);
     }
   }
+  // design.ini positions=def,pro,wit,...
   for (const QString &pos : ao_app->read_design_ini("positions", ao_app->get_background_path("design.ini")).split(",")) {
     if (file_exists(ao_app->get_image_suffix(ao_app->get_background_path(pos)))) {
       pos_list.append(pos);
     }
   }
 
+  // DRO-Style positions.ini overrides all
+  QString positions_ini = ao_app->get_real_path(ao_app->get_background_path("positions.ini"));
+  if (file_exists(positions_ini)) {
+    pos_list.clear();
+    QSettings settings(positions_ini, QSettings::IniFormat);
+  #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+    settings.setIniCodec("UTF-8");
+  #endif
+    QStringList keys = settings.childGroups();
+    // Insert values in reverse order
+    for (const QString &pos : keys) {
+      pos_list.append(pos);
+    }
+  }
+
   set_pos_dropdown(pos_list);
 
   if (display) {
@@ -4505,9 +4519,12 @@ void Courtroom::play_sfx()
         ao_app->get_sfx_looping(current_char, current_emote) == "1");
 }
 
-void Courtroom::set_scene(bool show_desk, const QString f_side)
+void Courtroom::set_scene(bool show_desk, QString f_side)
 {
   current_side = f_side;
+  if (current_side.isEmpty()) {
+    f_side = ao_app->get_char_side(current_char);
+  }
   ui_vp_background->load_image(ao_app->get_pos_path(f_side));
   ui_vp_desk->load_image(ao_app->get_pos_path(f_side, true));
 
@@ -5156,7 +5173,12 @@ void Courtroom::display_pos_remove()
     ui_pos_remove->hide();
   else {
     QString default_pos = ao_app->get_char_side(current_char);
-    if ((selected_side != default_pos && pos_dropdown_list.contains(default_pos)) || !pos_dropdown_list.contains(selected_side)){
+    if ((selected_side != default_pos && pos_dropdown_list.contains(default_pos)) ||
+        (!pos_dropdown_list.contains(selected_side) ||
+         (ui_pos_dropdown->count() > 0 && selected_side != ui_pos_dropdown->itemText(0))
+         )
+        )
+    {
       ui_pos_remove->show();
       return;
     }
diff --git a/src/path_functions.cpp b/src/path_functions.cpp
index e528c009f..b43f12128 100644
--- a/src/path_functions.cpp
+++ b/src/path_functions.cpp
@@ -82,18 +82,74 @@ VPath AOApplication::get_default_background_path(QString p_file)
 
 QString AOApplication::get_pos_path(const QString& pos, const bool desk)
 {
-  // witness is default if pos is invalid
-  QString f_background;
-  QString f_desk_image;
+  // Witness is default BG
+  QString f_background = "wit";
+  QString f_desk_image = "wit_overlay";
+
+  if (desk) {
+    f_desk_image = get_old_pos_path(pos, desk);
+  }
+  else {
+    f_background = get_old_pos_path(pos, desk);
+  }
+
+  // Special desk handling
+  QString desk_override = read_design_ini("overlays/" + f_background, get_background_path("design.ini"));
+  if (desk_override != "") {
+    f_desk_image = get_image_suffix(get_background_path(desk_override));
+  }
+
+  // DRO-style override handling
+  QString suffix = "back";
+  if (desk) {
+    suffix = "front";
+  }
+
+  // Read the positions.ini file
+  QString override = read_design_ini(pos + "/" + suffix, get_background_path("positions.ini"));
+  if (override != "") {
+    // Set both to the override (we only send back 1 of the 2 anyway)
+    f_desk_image = get_image_suffix(get_background_path(override));
+    f_background = get_image_suffix(get_background_path(override));
+  }
+
+  // Server dictates to override our overlay
+  if (w_courtroom->server_overlay != "") {
+    // Overlay is located inside of our BG folder
+    QString path_test = get_image_suffix(get_background_path(w_courtroom->server_overlay));
+    if (file_exists(path_test)) {
+      f_desk_image = path_test;
+    }
+
+    // Specific overlay *folder* to access inside of the overlay folder
+    path_test = get_image_suffix(VPath("overlays/" + w_courtroom->server_overlay + "/" + pos));
+    if (file_exists(path_test)) {
+      f_desk_image = path_test;
+    }
+
+    // Specific file path to access inside of the overlay folder
+    path_test = get_image_suffix(VPath("overlays/" + w_courtroom->server_overlay));
+    if (file_exists(path_test)) {
+      f_desk_image = path_test;
+    }
+  }
+  if (desk) {
+    return f_desk_image;
+  }
+  return f_background;
+}
+
+QString AOApplication::get_old_pos_path(const QString& pos, const bool desk)
+{
+  QString f_background = "wit";
+  QString f_desk_image = "wit_overlay";
+  // if we have pre-2.8-style positions, e.g. witnessempty.png, use that as the default.
   if (file_exists(get_image_suffix(get_background_path("witnessempty")))) {
     f_background = "witnessempty";
     f_desk_image = "stand";
   }
-  else {
-    f_background = "wit";
-    f_desk_image = "wit_overlay";
-  }
 
+  // Pre-2.8-style positions are detected
   if (pos == "def" && file_exists(get_image_suffix(
                              get_background_path("defenseempty")))) {
     f_background = "defenseempty";
@@ -141,26 +197,13 @@ QString AOApplication::get_pos_path(const QString& pos, const bool desk)
     f_desk_image = pos + "_overlay";
   }
 
-  QString desk_override = read_design_ini("overlays/" + f_background, get_background_path("design.ini"));
-  if (desk_override != "") {
-    f_desk_image = desk_override;
-  }
-  else if (w_courtroom->server_overlay != "") { // BN+ Packet
-    if (file_exists(get_image_suffix(
-            get_background_path(w_courtroom->server_overlay)))) {
-      f_desk_image = w_courtroom->server_overlay;
-    }
-    else if (file_exists(get_image_suffix(
-                 VPath("overlays/" + w_courtroom->server_overlay)))) {
-      f_desk_image = "overlays/" + w_courtroom->server_overlay;
-    }
-  }
   if (desk) {
-    return f_desk_image;
+    return get_image_suffix(get_background_path(f_desk_image));
   }
-  return f_background;
+  return get_image_suffix(get_background_path(f_background));
 }
 
+
 VPath AOApplication::get_evidence_path(QString p_file)
 {
   return VPath("evidence/" + p_file);

From 8c02a6ad02bca38adc8713c8d20ed4664d693f6b Mon Sep 17 00:00:00 2001
From: Alex Noir <Varsash@gmail.com>
Date: Thu, 19 Dec 2024 02:29:48 +0300
Subject: [PATCH 15/16] adjust comment to be more descriptive for dro positions
 ini handling

---
 src/courtroom.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/courtroom.cpp b/src/courtroom.cpp
index cea51d22a..7f3ad83bb 100644
--- a/src/courtroom.cpp
+++ b/src/courtroom.cpp
@@ -1700,7 +1700,7 @@ void Courtroom::set_background(QString p_background, bool display)
     settings.setIniCodec("UTF-8");
   #endif
     QStringList keys = settings.childGroups();
-    // Insert values in reverse order
+    // UNFORTUNATLEY, the order of pos inserted will be unpredictable because ini's are unordered!
     for (const QString &pos : keys) {
       pos_list.append(pos);
     }

From ef67e9ad515e1cdd52355d208951ea3d401121ca Mon Sep 17 00:00:00 2001
From: Alex Noir <Varsash@gmail.com>
Date: Thu, 19 Dec 2024 03:03:54 +0300
Subject: [PATCH 16/16] I'm gonna turn you into a pickle. * Fix overlays being
 impossible to clear

---
 src/packet_distribution.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/packet_distribution.cpp b/src/packet_distribution.cpp
index 0f2464e3a..73e6f6ac6 100644
--- a/src/packet_distribution.cpp
+++ b/src/packet_distribution.cpp
@@ -373,9 +373,7 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
     if (f_contents_size > 3) {
         // Set overlay if not empty
         //   overlay
-        if (!f_contents[2].isEmpty()) {
-            w_courtroom->server_overlay = f_contents[2];
-        }
+        w_courtroom->server_overlay = f_contents[2];
     }
 
     const bool shouldShowImmediately =