diff --git a/Beszel/beszel.svg b/Beszel/beszel.svg
index be8d4e29e8..8bb339dc77 100644
--- a/Beszel/beszel.svg
+++ b/Beszel/beszel.svg
@@ -1 +1,5 @@
-<svg fill="#22c55e" viewBox="0 0 56 70" xmlns="http://www.w3.org/2000/svg"><path d="M35 70H0V0h35q4.4 0 8.2 1.7a21.4 21.4 0 0 1 6.6 4.5q2.9 2.8 4.5 6.6Q56 16.7 56 21a15.4 15.4 0 0 1-.3 3.2 18 18 0 0 1-.2.8 19.4 19.4 0 0 1-1.5 4 17 17 0 0 1-2.4 3.4 13.5 13.5 0 0 1-2.6 2.3 13 13 0 0 1-.4.3q1.7 1 3 2.5Q53 39.1 54 41a18.3 18.3 0 0 1 1.5 4 17.4 17.4 0 0 1 .5 3 15 15 0 0 1 0 1q0 4.4-1.7 8.2a21.4 21.4 0 0 1-4.5 6.6q-2.8 2.9-6.6 4.6Q39.4 70 35 70M14 14v14h21a7 7 0 0 0 2.3-.3 7 7 0 0 0 .4-.2Q39 27 40 26a6.9 6.9 0 0 0 1.5-2.2q.5-1.3.5-2.8a7 7 0 0 0-.4-2.3 7 7 0 0 0-.1-.4Q40.9 17 40 16a7 7 0 0 0-2.3-1.4 6.9 6.9 0 0 0-2.5-.6zm0 28v14h21a7 7 0 0 0 2.3-.4 7 7 0 0 0 .4-.1Q39 54.9 40 54a7 7 0 0 0 1.5-2.2 6.9 6.9 0 0 0 .5-2.6V49a7 7 0 0 0-.4-2.3 7 7 0 0 0-.1-.4Q40.9 45 40 44a7 7 0 0 0-2.3-1.5 6.9 6.9 0 0 0-2.5-.6H14Z"/></svg>
\ No newline at end of file
+<<<<<<< HEAD
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 70" fill="#22c55e"><path d="M35 70H0V0h35q4.4 0 8.2 1.7a21.4 21.4 0 0 1 6.6 4.5q2.9 2.8 4.5 6.6Q56 16.7 56 21a15.4 15.4 0 0 1-.3 3.2 17.6 17.6 0 0 1-.2.8 19.4 19.4 0 0 1-1.5 4 17 17 0 0 1-2.4 3.4 13.5 13.5 0 0 1-2.6 2.3 12.5 12.5 0 0 1-.4.3q1.7 1 3 2.5Q53 39.1 54 41a18.3 18.3 0 0 1 1.5 4 17.4 17.4 0 0 1 .5 3 15.3 15.3 0 0 1 0 1q0 4.4-1.7 8.2a21.4 21.4 0 0 1-4.5 6.6q-2.8 2.9-6.6 4.6Q39.4 70 35 70ZM14 14v14h21a7 7 0 0 0 2.3-.3 6.6 6.6 0 0 0 .4-.2Q39 27 40 26a6.9 6.9 0 0 0 1.5-2.2q.5-1.3.5-2.8a7 7 0 0 0-.4-2.3 6.6 6.6 0 0 0-.1-.4Q40.9 17 40 16a7 7 0 0 0-2.3-1.4 6.9 6.9 0 0 0-2.5-.6 7.9 7.9 0 0 0-.2 0H14Zm0 28v14h21a7 7 0 0 0 2.3-.4 6.6 6.6 0 0 0 .4-.1Q39 54.9 40 54a7 7 0 0 0 1.5-2.2 6.9 6.9 0 0 0 .5-2.6 7.9 7.9 0 0 0 0-.2 7 7 0 0 0-.4-2.3 6.6 6.6 0 0 0-.1-.4Q40.9 45 40 44a7 7 0 0 0-2.3-1.5 6.9 6.9 0 0 0-2.5-.6 7.9 7.9 0 0 0-.2 0H14Z"/></svg>
+=======
+<svg fill="#22c55e" viewBox="0 0 56 70" xmlns="http://www.w3.org/2000/svg"><path d="M35 70H0V0h35q4.4 0 8.2 1.7a21.4 21.4 0 0 1 6.6 4.5q2.9 2.8 4.5 6.6Q56 16.7 56 21a15.4 15.4 0 0 1-.3 3.2 18 18 0 0 1-.2.8 19.4 19.4 0 0 1-1.5 4 17 17 0 0 1-2.4 3.4 13.5 13.5 0 0 1-2.6 2.3 13 13 0 0 1-.4.3q1.7 1 3 2.5Q53 39.1 54 41a18.3 18.3 0 0 1 1.5 4 17.4 17.4 0 0 1 .5 3 15 15 0 0 1 0 1q0 4.4-1.7 8.2a21.4 21.4 0 0 1-4.5 6.6q-2.8 2.9-6.6 4.6Q39.4 70 35 70M14 14v14h21a7 7 0 0 0 2.3-.3 7 7 0 0 0 .4-.2Q39 27 40 26a6.9 6.9 0 0 0 1.5-2.2q.5-1.3.5-2.8a7 7 0 0 0-.4-2.3 7 7 0 0 0-.1-.4Q40.9 17 40 16a7 7 0 0 0-2.3-1.4 6.9 6.9 0 0 0-2.5-.6zm0 28v14h21a7 7 0 0 0 2.3-.4 7 7 0 0 0 .4-.1Q39 54.9 40 54a7 7 0 0 0 1.5-2.2 6.9 6.9 0 0 0 .5-2.6V49a7 7 0 0 0-.4-2.3 7 7 0 0 0-.1-.4Q40.9 45 40 44a7 7 0 0 0-2.3-1.5 6.9 6.9 0 0 0-2.5-.6H14Z"/></svg>
+>>>>>>> b2672c4752533c3e00710e227a7107e437f37231
diff --git a/ProxmoxBackupServer/ProxmoxBackupServer.php b/ProxmoxBackupServer/ProxmoxBackupServer.php
new file mode 100644
index 0000000000..9716359d65
--- /dev/null
+++ b/ProxmoxBackupServer/ProxmoxBackupServer.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace App\SupportedApps\ProxmoxBackupServer;
+
+class ProxmoxBackupServer extends \App\SupportedApps
+{
+}
diff --git a/ProxmoxBackupServer/ProxmoxBackupServer.svg b/ProxmoxBackupServer/ProxmoxBackupServer.svg
new file mode 100644
index 0000000000..a7a9feb7ce
--- /dev/null
+++ b/ProxmoxBackupServer/ProxmoxBackupServer.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 147.244 129.039" xmlns="http://www.w3.org/2000/svg"><defs><clipPath id="a" clipPathUnits="userSpaceOnUse"><path d="M-83-347.714h436.402v326.41H-83z" style="fill:#e57000;fill-opacity:1;fill-rule:evenodd;stroke:none" transform="matrix(.7345 .67862 -.78497 .61953 0 0)"/></clipPath></defs><g style="fill:#000"><g clip-path="url(#a)" style="font-style:normal;font-variant:normal;font-weight:400;font-stretch:normal;font-size:144px;line-height:125%;font-family:Helion;-inkscape-font-specification:Helion;letter-spacing:0;word-spacing:0;fill:#000;fill-opacity:1;stroke:none" transform="matrix(-.23853 0 0 .23853 139.53 6.637)"><path d="M276.304 226.623 466.892 17.021C459.5 9.628 450.888 3.819 441.058-.405c-9.83-4.225-20.392-6.377-31.684-6.459-11.993.092-22.98 2.468-32.963 7.129-9.982 4.661-18.655 11.059-26.017 19.193l-74.09 80.915L202.7 19.458c-7.627-8.134-16.502-14.532-26.627-19.193-10.124-4.661-21.071-7.037-32.84-7.129-11.293.082-21.854 2.234-31.684 6.459-9.83 4.224-18.442 10.033-25.835 17.426l190.594 209.597" style="fill:#000;fill-opacity:1"/></g><g clip-path="url(#a)" style="font-style:normal;font-variant:normal;font-weight:400;font-stretch:normal;font-size:144px;line-height:125%;font-family:Helion;-inkscape-font-specification:Helion;letter-spacing:0;word-spacing:0;fill:#000;fill-opacity:1;stroke:none" transform="matrix(.23853 0 0 -.23853 7.714 122.402)"><path d="M276.304 226.623 466.892 17.021C459.5 9.628 450.888 3.819 441.058-.405c-9.83-4.225-20.392-6.377-31.684-6.459-11.993.092-22.98 2.468-32.963 7.129-9.982 4.661-18.655 11.059-26.017 19.193l-74.09 80.915L202.7 19.458c-7.627-8.134-16.502-14.532-26.627-19.193-10.124-4.661-21.071-7.037-32.84-7.129-11.293.082-21.854 2.234-31.684 6.459-9.83 4.224-18.442 10.033-25.835 17.426l190.594 209.597" style="fill:#000;fill-opacity:1"/></g><path d="m1160.63 988.205-143.267-157.112c-8.333-8.887-18.03-15.877-29.093-20.97-11.063-5.093-23.024-7.69-35.884-7.79-12.338.09-23.877 2.442-34.618 7.057-10.74 4.616-20.15 10.963-28.227 19.04l145.397 159.778-145.397 159.777c8.077 8.333 17.486 14.835 28.227 19.507 10.74 4.67 22.28 7.045 34.618 7.123 12.894-.1 24.921-2.696 36.084-7.79 11.162-5.092 20.793-12.082 28.893-20.97l143.266-157.65m31.991 0 143.267-157.112c8.333-8.887 18.03-15.877 29.093-20.97 11.063-5.093 23.024-7.69 35.883-7.79 12.339.09 23.878 2.442 34.619 7.057 10.74 4.616 20.15 10.963 28.227 19.04l-145.397 159.778 145.397 159.777c-8.077 8.333-17.486 14.835-28.227 19.507-10.74 4.67-22.28 7.045-34.618 7.123-12.894-.1-24.921-2.696-36.084-7.79-11.162-5.092-20.793-12.082-28.893-20.97l-143.266-157.65" style="font-style:normal;font-variant:normal;font-weight:400;font-stretch:normal;font-size:1059.61px;line-height:125%;font-family:Helion;-inkscape-font-specification:Helion;letter-spacing:0;word-spacing:0;fill:#e57000;fill-opacity:1;stroke:none" transform="translate(-207.627 -171.69) scale(.23903)"/></g></svg>
\ No newline at end of file
diff --git a/ProxmoxBackupServer/app.json b/ProxmoxBackupServer/app.json
new file mode 100644
index 0000000000..e51a3d5808
--- /dev/null
+++ b/ProxmoxBackupServer/app.json
@@ -0,0 +1,10 @@
+{
+    "appid": "e368337b94ce07c52ef5f319e18319b4fa2ac5c6",
+    "name": "Proxmox Backup Server",
+    "website": "https://www.proxmox.com/en/proxmox-backup-server",
+    "license": "GNU General Public License v3.0 only",
+    "description": "Proxmox Backup Server is an enterprise backup solution, for backing up and restoring VMs, containers, and physical hosts. By supporting incremental, fully deduplicated backups, Proxmox Backup Server significantly reduces network load and saves valuable storage space. With strong encryption and methods of ensuring data integrity, you can feel safe when backing up data, even to targets which are not fully trusted.",
+    "enhanced": false,
+    "tile_background": "dark",
+    "icon": "ProxmoxBackupServer.png"
+}
\ No newline at end of file