diff --git a/Amperfy/Screens/Base.lproj/Main.storyboard b/Amperfy/Screens/Base.lproj/Main.storyboard
index 4b882859..58298169 100644
--- a/Amperfy/Screens/Base.lproj/Main.storyboard
+++ b/Amperfy/Screens/Base.lproj/Main.storyboard
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="23094" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
-    <device id="retina5_9" orientation="portrait" appearance="light"/>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
+    <device id="mac" appearance="light" renderMode="macOS"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23084"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
         <capability name="Image references" minToolsVersion="12.0"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
@@ -16,7 +16,7 @@
             <objects>
                 <collectionViewController id="Hcv-qR-IhX" customClass="SideBarVC" customModule="Amperfy" customModuleProvider="target" sceneMemberID="viewController">
                     <collectionView key="view" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" id="e1Y-U4-xQV">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
+                        <rect key="frame" x="0.0" y="0.0" width="420" height="600"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <collectionViewFlowLayout key="collectionViewLayout" automaticEstimatedItemSize="YES" minimumLineSpacing="10" minimumInteritemSpacing="10" id="ybH-cr-Au5">
@@ -41,7 +41,7 @@
             <objects>
                 <navigationController id="Im4-0j-icf" sceneMemberID="viewController">
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="NeG-lD-bG9">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
+                        <rect key="frame" x="0.0" y="0.0" width="478.5" height="38"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
                 </navigationController>
@@ -69,17 +69,17 @@
             <objects>
                 <viewController storyboardIdentifier="LoginVC" id="BYZ-38-t0r" customClass="LoginVC" customModule="Amperfy" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
+                        <rect key="frame" x="0.0" y="0.0" width="800" height="600"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Username" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aKf-Oy-Mn4">
-                                <rect key="frame" x="30" y="278" width="86" height="34"/>
+                                <rect key="frame" x="30" y="216" width="89.5" height="22"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" clearButtonMode="always" translatesAutoresizingMaskIntoConstraints="NO" id="Hkb-KJ-f3A" userLabel="UsernameTextField">
-                                <rect key="frame" x="120" y="278" width="225" height="34"/>
+                                <rect key="frame" x="120" y="216" width="650" height="22"/>
                                 <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                 <color key="tintColor" name="systemBlueColor" catalog="System" colorSpace="catalog"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -92,7 +92,7 @@
                                 </connections>
                             </textField>
                             <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" clearButtonMode="always" translatesAutoresizingMaskIntoConstraints="NO" id="vfm-n3-YO9" userLabel="PasswordTextField">
-                                <rect key="frame" x="120" y="320" width="225" height="34"/>
+                                <rect key="frame" x="120" y="246" width="650" height="22"/>
                                 <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                 <color key="tintColor" name="systemBlueColor" catalog="System" colorSpace="catalog"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -105,25 +105,25 @@
                                 </connections>
                             </textField>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Password" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0Dr-h8-7rI">
-                                <rect key="frame" x="30" y="320" width="86" height="34"/>
+                                <rect key="frame" x="30" y="246" width="89.5" height="22"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="API" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="v9a-mi-SHt" userLabel="Api">
-                                <rect key="frame" x="30" y="366.66666666666669" width="86" height="20.666666666666686"/>
+                                <rect key="frame" x="30" y="281" width="89.5" height="20"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Server URL" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fDZ-Za-sK8">
-                                <rect key="frame" x="30" y="236" width="86" height="34"/>
+                                <rect key="frame" x="30" y="186" width="89.5" height="22"/>
                                 <fontDescription key="fontDescription" name=".AppleSystemUIFont" family=".AppleSystemUIFont" pointSize="17"/>
                                 <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Amperfy" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="23L-Mn-QSO">
-                                <rect key="frame" x="87" y="120" width="201" height="60"/>
+                                <rect key="frame" x="300" y="70" width="201" height="60"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="60" id="cu0-Db-zjP"/>
                                 </constraints>
@@ -132,7 +132,7 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="https://localhost/ampache" adjustsFontSizeToFit="NO" minimumFontSize="17" clearButtonMode="always" translatesAutoresizingMaskIntoConstraints="NO" id="cJB-xi-h6o" userLabel="ServerUrlTextField">
-                                <rect key="frame" x="120" y="236" width="225" height="34"/>
+                                <rect key="frame" x="120" y="186" width="650" height="22"/>
                                 <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                 <color key="tintColor" name="systemBlueColor" catalog="System" colorSpace="catalog"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -145,7 +145,7 @@
                                 </connections>
                             </textField>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" preferredBehavioralStyle="pad" hasAttributedTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="7aA-CY-fi1" customClass="BasicButton" customModule="Amperfy" customModuleProvider="target">
-                                <rect key="frame" x="147.66666666666666" y="436" width="80" height="30"/>
+                                <rect key="frame" x="360" y="386" width="80" height="30"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="30" id="fP5-0V-kT7"/>
@@ -166,7 +166,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="right" contentVerticalAlignment="center" lineBreakMode="clip" translatesAutoresizingMaskIntoConstraints="NO" id="TKD-wA-Xnd" userLabel="ApiSelector" customClass="BasicButton" customModule="Amperfy" customModuleProvider="target">
-                                <rect key="frame" x="30" y="362" width="315" height="30"/>
+                                <rect key="frame" x="30" y="276" width="740" height="30"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="30" id="Y5U-L5-OQV"/>
                                 </constraints>
@@ -177,6 +177,18 @@
                                     <imageReference key="image" image="arrowtriangle.down.fill" catalog="system" symbolScale="small"/>
                                 </state>
                             </button>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="right" contentVerticalAlignment="center" lineBreakMode="clip" translatesAutoresizingMaskIntoConstraints="NO" id="5SU-WK-bHl" userLabel="Advanced" customClass="BasicButton" customModule="Amperfy" customModuleProvider="target">
+                                <rect key="frame" x="678" y="311" width="92.5" height="30"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="30" id="YJS-Ng-t4C"/>
+                                </constraints>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <inset key="imageEdgeInsets" minX="0.0" minY="11" maxX="4" maxY="11"/>
+                                <state key="normal" title="Advanced">
+                                    <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                    <imageReference key="image" image="arrowtriangle.down.fill" catalog="system" symbolScale="small"/>
+                                </state>
+                            </button>
                         </subviews>
                         <viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
                         <color key="backgroundColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -189,9 +201,11 @@
                             <constraint firstItem="aKf-Oy-Mn4" firstAttribute="width" secondItem="fDZ-Za-sK8" secondAttribute="width" id="Aew-mQ-nQ5"/>
                             <constraint firstItem="cJB-xi-h6o" firstAttribute="height" secondItem="fDZ-Za-sK8" secondAttribute="height" id="DPF-fx-sxS"/>
                             <constraint firstItem="fDZ-Za-sK8" firstAttribute="leading" secondItem="6Tk-OE-BBY" secondAttribute="leading" constant="30" id="Drx-hG-HUs"/>
+                            <constraint firstItem="5SU-WK-bHl" firstAttribute="top" secondItem="TKD-wA-Xnd" secondAttribute="bottom" constant="5" id="Fn6-RP-j80"/>
                             <constraint firstItem="vfm-n3-YO9" firstAttribute="leading" secondItem="cJB-xi-h6o" secondAttribute="leading" id="GUC-sc-BoB"/>
                             <constraint firstItem="TKD-wA-Xnd" firstAttribute="top" secondItem="vfm-n3-YO9" secondAttribute="bottom" constant="8" id="Lld-Sa-gVk"/>
                             <constraint firstItem="Hkb-KJ-f3A" firstAttribute="leading" secondItem="cJB-xi-h6o" secondAttribute="leading" id="M0R-J6-4zg"/>
+                            <constraint firstItem="5SU-WK-bHl" firstAttribute="trailing" secondItem="TKD-wA-Xnd" secondAttribute="trailing" id="MtJ-tj-V1Z"/>
                             <constraint firstItem="aKf-Oy-Mn4" firstAttribute="leading" secondItem="fDZ-Za-sK8" secondAttribute="leading" id="NI8-DU-Smj"/>
                             <constraint firstItem="0Dr-h8-7rI" firstAttribute="trailing" secondItem="fDZ-Za-sK8" secondAttribute="trailing" id="Ncx-zx-uTR"/>
                             <constraint firstItem="vfm-n3-YO9" firstAttribute="width" secondItem="cJB-xi-h6o" secondAttribute="width" id="OLv-WK-43r"/>
@@ -205,7 +219,6 @@
                             <constraint firstItem="0Dr-h8-7rI" firstAttribute="width" secondItem="fDZ-Za-sK8" secondAttribute="width" id="YeK-Pf-Fvc"/>
                             <constraint firstItem="aKf-Oy-Mn4" firstAttribute="height" secondItem="fDZ-Za-sK8" secondAttribute="height" id="ZBc-kR-ffG"/>
                             <constraint firstItem="vfm-n3-YO9" firstAttribute="trailing" secondItem="cJB-xi-h6o" secondAttribute="trailing" id="aAs-X2-RQ8"/>
-                            <constraint firstItem="7aA-CY-fi1" firstAttribute="top" secondItem="TKD-wA-Xnd" secondAttribute="bottom" constant="44" id="bNC-nX-UJK"/>
                             <constraint firstItem="23L-Mn-QSO" firstAttribute="centerX" secondItem="8bC-Xf-vdC" secondAttribute="centerX" id="e6A-vY-X0O"/>
                             <constraint firstItem="v9a-mi-SHt" firstAttribute="width" secondItem="fDZ-Za-sK8" secondAttribute="width" id="eh7-LK-dDs"/>
                             <constraint firstItem="TKD-wA-Xnd" firstAttribute="leading" secondItem="v9a-mi-SHt" secondAttribute="leading" id="hkc-6H-UfN"/>
@@ -219,10 +232,12 @@
                             <constraint firstItem="cJB-xi-h6o" firstAttribute="centerY" secondItem="fDZ-Za-sK8" secondAttribute="centerY" id="qeN-eF-JdY"/>
                             <constraint firstItem="vfm-n3-YO9" firstAttribute="top" secondItem="Hkb-KJ-f3A" secondAttribute="bottom" constant="8" id="rT8-XR-RMg"/>
                             <constraint firstItem="cJB-xi-h6o" firstAttribute="top" secondItem="23L-Mn-QSO" secondAttribute="bottom" constant="56" id="ste-gC-7NE"/>
+                            <constraint firstItem="7aA-CY-fi1" firstAttribute="top" secondItem="5SU-WK-bHl" secondAttribute="bottom" constant="45" id="u5g-8o-wLO"/>
                             <constraint firstItem="0Dr-h8-7rI" firstAttribute="leading" secondItem="fDZ-Za-sK8" secondAttribute="leading" id="y1E-kI-fvv"/>
                         </constraints>
                     </view>
                     <connections>
+                        <outlet property="advancedButton" destination="5SU-WK-bHl" id="87S-QX-ffm"/>
                         <outlet property="apiSelectorButton" destination="TKD-wA-Xnd" id="1Ri-mL-bOC"/>
                         <outlet property="passwordTF" destination="vfm-n3-YO9" id="bfH-Hk-RYo"/>
                         <outlet property="serverUrlTF" destination="cJB-xi-h6o" id="vTq-48-JYD"/>
@@ -239,7 +254,7 @@
             <objects>
                 <tableViewController storyboardIdentifier="PlaylistsVC" title="Playlists" id="1iw-qc-oYh" customClass="PlaylistsVC" customModule="Amperfy" customModuleProvider="target" sceneMemberID="viewController">
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="wvP-mD-HIZ">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
+                        <rect key="frame" x="0.0" y="0.0" width="800" height="600"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <connections>
@@ -261,7 +276,7 @@
             <objects>
                 <tableViewController storyboardIdentifier="PlaylistDetailVC" title="Playlist Detail" id="5fS-Oh-qFf" customClass="PlaylistDetailVC" customModule="Amperfy" customModuleProvider="target" sceneMemberID="viewController">
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="jkA-6m-ese">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
+                        <rect key="frame" x="0.0" y="0.0" width="800" height="600"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <gestureRecognizers/>
@@ -281,7 +296,7 @@
             <objects>
                 <tableViewController storyboardIdentifier="PlaylistSelectorVC" title="Add to Playlist" id="4rB-Ko-4wo" customClass="PlaylistSelectorVC" customModule="Amperfy" customModuleProvider="target" sceneMemberID="viewController">
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="aAk-vJ-f60">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
+                        <rect key="frame" x="0.0" y="0.0" width="800" height="600"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <connections>
@@ -300,7 +315,7 @@
             <objects>
                 <tableViewController storyboardIdentifier="ArtistsVC" title="Artists" id="ZGw-SA-mia" customClass="ArtistsVC" customModule="Amperfy" customModuleProvider="target" sceneMemberID="viewController">
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="lfA-ZU-K5x">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
+                        <rect key="frame" x="0.0" y="0.0" width="800" height="600"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <connections>
@@ -322,7 +337,7 @@
             <objects>
                 <tableViewController storyboardIdentifier="ArtistDetailVC" title="Artist detail" id="CbP-zj-PDn" customClass="ArtistDetailVC" customModule="Amperfy" customModuleProvider="target" sceneMemberID="viewController">
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="91F-6S-6y1">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="802"/>
+                        <rect key="frame" x="0.0" y="0.0" width="800" height="600"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <connections>
@@ -344,7 +359,7 @@
             <objects>
                 <tableViewController storyboardIdentifier="AlbumsVC" title="Albums" id="w9f-yb-ooi" customClass="AlbumsVC" customModule="Amperfy" customModuleProvider="target" sceneMemberID="viewController">
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="ili-jA-D28">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
+                        <rect key="frame" x="0.0" y="0.0" width="800" height="600"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <connections>
@@ -366,7 +381,7 @@
             <objects>
                 <collectionViewController storyboardIdentifier="AlbumsCollectionVC" id="Cqt-KH-xhP" customClass="AlbumsCollectionVC" customModule="Amperfy" customModuleProvider="target" sceneMemberID="viewController">
                     <collectionView key="view" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" showsHorizontalScrollIndicator="NO" dataMode="prototypes" id="dvf-Oo-vEP">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
+                        <rect key="frame" x="0.0" y="0.0" width="800" height="600"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="vSL-sV-K9l">
@@ -394,7 +409,7 @@
             <objects>
                 <tableViewController storyboardIdentifier="AlbumDetailVC" title="Album name" id="CiG-al-lkI" customClass="AlbumDetailVC" customModule="Amperfy" customModuleProvider="target" sceneMemberID="viewController">
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="oZh-fj-3uQ">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="802"/>
+                        <rect key="frame" x="0.0" y="0.0" width="800" height="600"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <connections>
@@ -413,7 +428,7 @@
             <objects>
                 <tableViewController storyboardIdentifier="SongsVC" title="Songs" id="PdJ-u4-MrR" customClass="SongsVC" customModule="Amperfy" customModuleProvider="target" sceneMemberID="viewController">
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="55" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="Kcs-9P-3Bf">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
+                        <rect key="frame" x="0.0" y="0.0" width="800" height="600"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <gestureRecognizers/>
@@ -434,7 +449,7 @@
                 <navigationController id="Xme-l1-fiY" sceneMemberID="viewController">
                     <tabBarItem key="tabBarItem" title="Search" image="magnifyingglass" catalog="system" selectedImage="magnifyingglass" id="6F7-ce-EiN"/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" largeTitles="YES" id="q5a-rn-qe1">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="96"/>
+                        <rect key="frame" x="0.0" y="0.0" width="800" height="90"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
                     <connections>
@@ -450,7 +465,7 @@
             <objects>
                 <tableViewController storyboardIdentifier="SearchVC" id="xQ3-ra-8Di" customClass="SearchVC" customModule="Amperfy" customModuleProvider="target" sceneMemberID="viewController">
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="55" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="TW7-aC-UCo">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
+                        <rect key="frame" x="0.0" y="0.0" width="800" height="600"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <connections>
@@ -495,7 +510,7 @@
                     <tabBarItem key="tabBarItem" title="Library" image="music.note.house" catalog="system" selectedImage="music.note.house" id="wHf-aA-izU"/>
                     <toolbarItems/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" largeTitles="YES" id="VnR-3z-lih">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="96"/>
+                        <rect key="frame" x="0.0" y="0.0" width="800" height="90"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <textAttributes key="largeTitleTextAttributes">
                             <fontDescription key="fontDescription" type="boldSystem" pointSize="30"/>
@@ -515,7 +530,7 @@
             <objects>
                 <collectionViewController storyboardIdentifier="LibraryVC" id="Rsr-FU-pgx" customClass="LibraryVC" customModule="Amperfy" customModuleProvider="target" sceneMemberID="viewController">
                     <collectionView key="view" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" id="dye-y7-xj0">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
+                        <rect key="frame" x="0.0" y="0.0" width="800" height="600"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <collectionViewFlowLayout key="collectionViewLayout" automaticEstimatedItemSize="YES" minimumLineSpacing="10" minimumInteritemSpacing="10" id="Uwm-IA-oOc">
@@ -541,11 +556,11 @@
             <objects>
                 <viewController storyboardIdentifier="LibrarySyncPopupVC" id="4fV-g4-CJz" customClass="LibrarySyncPopupVC" customModule="Amperfy" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="CZT-70-aub">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
+                        <rect key="frame" x="0.0" y="0.0" width="800" height="600"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="a7T-Uc-nlO">
-                                <rect key="frame" x="32.666666666666657" y="166" width="310" height="360"/>
+                                <rect key="frame" x="245" y="60" width="310" height="360"/>
                                 <subviews>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" preferredBehavioralStyle="pad" hasAttributedTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Jwb-Ck-Kjx" userLabel="Optional Button" customClass="BasicButton" customModule="Amperfy" customModuleProvider="target">
                                         <rect key="frame" x="58" y="262" width="194" height="30"/>
@@ -609,7 +624,7 @@
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="LaP-GD-BAs">
-                                        <rect key="frame" x="104.33333333333334" y="-23.333333333333336" width="101.33333333333331" height="86.666666666666686"/>
+                                        <rect key="frame" x="104.5" y="-22.5" width="101.5" height="87.5"/>
                                         <color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="100" id="4zW-ma-IiG"/>
@@ -630,7 +645,7 @@
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bih-od-ZMX" userLabel="Title Label">
-                                        <rect key="frame" x="134.33333333333334" y="60" width="41" height="30"/>
+                                        <rect key="frame" x="135" y="60" width="41" height="30"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="30" id="gn9-tm-cXi"/>
                                         </constraints>
@@ -690,11 +705,11 @@
             <objects>
                 <viewController storyboardIdentifier="SyncVC" id="n1j-bZ-g7e" customClass="SyncVC" customModule="Amperfy" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="eKy-0T-u87">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
+                        <rect key="frame" x="0.0" y="0.0" width="800" height="600"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Syncing" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8Hu-Ks-SWY">
-                                <rect key="frame" x="157" y="105" width="61" height="21"/>
+                                <rect key="frame" x="368" y="105" width="63.5" height="21"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="21" id="uSi-BX-2HO"/>
                                 </constraints>
@@ -703,10 +718,10 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <progressView opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="npf-bB-pkf">
-                                <rect key="frame" x="25" y="214" width="325" height="4"/>
+                                <rect key="frame" x="25" y="214" width="750" height="20"/>
                             </progressView>
                             <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="100.0%" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KKh-tQ-byV">
-                                <rect key="frame" x="290" y="226" width="60" height="21"/>
+                                <rect key="frame" x="715" y="242" width="60" height="20"/>
                                 <constraints>
                                     <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="60" id="hbQ-OO-Ail"/>
                                 </constraints>
@@ -715,16 +730,16 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Info" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qe5-xR-nU8">
-                                <rect key="frame" x="25" y="226" width="29" height="21"/>
+                                <rect key="frame" x="25" y="242" width="30" height="20"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" animating="YES" style="medium" translatesAutoresizingMaskIntoConstraints="NO" id="3en-Wv-ZMc">
-                                <rect key="frame" x="330" y="226" width="20" height="20"/>
+                                <rect key="frame" x="759" y="242" width="16" height="16"/>
                             </activityIndicatorView>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" preferredBehavioralStyle="pad" translatesAutoresizingMaskIntoConstraints="NO" id="stS-Nk-8XD" customClass="BasicButton" customModule="Amperfy" customModuleProvider="target">
-                                <rect key="frame" x="270" y="282" width="80" height="30"/>
+                                <rect key="frame" x="695" y="297" width="80" height="30"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="80" id="Iha-4v-U1b"/>
@@ -780,7 +795,7 @@
             <objects>
                 <tableViewController storyboardIdentifier="DownloadsVC" title="Downloads" id="0yB-ih-px5" userLabel="Downloads" customClass="DownloadsVC" customModule="Amperfy" customModuleProvider="target" sceneMemberID="viewController">
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="55" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="BWe-SW-JDn">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
+                        <rect key="frame" x="0.0" y="0.0" width="800" height="600"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <gestureRecognizers/>
@@ -808,11 +823,11 @@
             <objects>
                 <viewController storyboardIdentifier="SettingsHostVC" id="hqa-F9-lNZ" customClass="SettingsHostVC" customModule="Amperfy" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="hwu-20-I2H">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
+                        <rect key="frame" x="0.0" y="0.0" width="800" height="600"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <containerView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="bcG-FU-Xh9">
-                                <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
+                                <rect key="frame" x="0.0" y="0.0" width="800" height="600"/>
                                 <connections>
                                     <segue destination="Wdk-bS-aW2" kind="embed" destinationCreationSelector="segueToSwiftUI:" id="rgx-91-t0t"/>
                                 </connections>
@@ -838,7 +853,7 @@
             <objects>
                 <tableViewController storyboardIdentifier="GenresVC" title="Genres" id="aeq-6R-iJo" userLabel="Genres" customClass="GenresVC" customModule="Amperfy" customModuleProvider="target" sceneMemberID="viewController">
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="f5t-tw-JHM">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
+                        <rect key="frame" x="0.0" y="0.0" width="800" height="600"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <connections>
@@ -860,7 +875,7 @@
             <objects>
                 <tableViewController storyboardIdentifier="GenreDetailVC" title="Artist detail" id="noZ-Ok-RcV" userLabel="Genre detail" customClass="GenreDetailVC" customModule="Amperfy" customModuleProvider="target" sceneMemberID="viewController">
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="znq-mO-hXT">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="802"/>
+                        <rect key="frame" x="0.0" y="0.0" width="800" height="600"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <connections>
@@ -883,7 +898,7 @@
             <objects>
                 <tableViewController storyboardIdentifier="MusicFoldersVC" title="MusicFolders" id="abK-SC-K8I" customClass="MusicFoldersVC" customModule="Amperfy" customModuleProvider="target" sceneMemberID="viewController">
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="wfa-EF-89p">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
+                        <rect key="frame" x="0.0" y="0.0" width="800" height="600"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <connections>
@@ -905,7 +920,7 @@
             <objects>
                 <tableViewController title="Indexes" id="3rD-M7-zZU" customClass="IndexesVC" customModule="Amperfy" customModuleProvider="target" sceneMemberID="viewController">
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="HeN-MG-BHK">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="802"/>
+                        <rect key="frame" x="0.0" y="0.0" width="800" height="600"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <connections>
@@ -927,7 +942,7 @@
             <objects>
                 <tableViewController storyboardIdentifier="DirectoriesVC" title="Directories" id="GWk-0G-KgA" customClass="DirectoriesVC" customModule="Amperfy" customModuleProvider="target" sceneMemberID="viewController">
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="RUT-m8-Qq3">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="802"/>
+                        <rect key="frame" x="0.0" y="0.0" width="800" height="600"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <connections>
@@ -949,7 +964,7 @@
             <objects>
                 <tableViewController storyboardIdentifier="PodcastsVC" title="Podcasts" id="cJ5-gG-DGL" customClass="PodcastsVC" customModule="Amperfy" customModuleProvider="target" sceneMemberID="viewController">
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="4lq-IF-nZ5">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
+                        <rect key="frame" x="0.0" y="0.0" width="800" height="600"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <connections>
@@ -971,7 +986,7 @@
             <objects>
                 <tableViewController storyboardIdentifier="PodcastDetailVC" id="Bk4-m4-eoF" customClass="PodcastDetailVC" customModule="Amperfy" customModuleProvider="target" sceneMemberID="viewController">
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" allowsSelection="NO" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="PWZ-ta-hZB">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="802"/>
+                        <rect key="frame" x="0.0" y="0.0" width="800" height="600"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <connections>
@@ -991,7 +1006,7 @@
                 <navigationController automaticallyAdjustsScrollViewInsets="NO" id="0kE-xi-dh6" sceneMemberID="viewController">
                     <toolbarItems/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" largeTitles="YES" id="j6n-0F-S2J">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="96"/>
+                        <rect key="frame" x="0.0" y="0.0" width="420" height="90"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <color key="backgroundColor" systemColor="secondarySystemBackgroundColor"/>
                     </navigationBar>
@@ -1009,11 +1024,11 @@
             <objects>
                 <viewController storyboardIdentifier="UpdateVC" id="aa1-XZ-0Qq" customClass="UpdateVC" customModule="Amperfy" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="S8S-p0-qnj">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
+                        <rect key="frame" x="0.0" y="0.0" width="800" height="600"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Updating" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Jrv-NL-BF0">
-                                <rect key="frame" x="152.66666666666666" y="155" width="70" height="21"/>
+                                <rect key="frame" x="364" y="105" width="72.5" height="21"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="21" id="j91-Tv-cP7"/>
                                 </constraints>
@@ -1022,10 +1037,10 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <progressView opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3Iq-Ky-1CL">
-                                <rect key="frame" x="25" y="264" width="325" height="4"/>
+                                <rect key="frame" x="25" y="214" width="750" height="20"/>
                             </progressView>
                             <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="100.0%" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="CPF-gs-YSl">
-                                <rect key="frame" x="290" y="276" width="60" height="21"/>
+                                <rect key="frame" x="715" y="242" width="60" height="20"/>
                                 <constraints>
                                     <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="60" id="PR0-jM-5uS"/>
                                 </constraints>
@@ -1034,13 +1049,13 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Info" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="SfK-rI-5Rb">
-                                <rect key="frame" x="25" y="276" width="29" height="21"/>
+                                <rect key="frame" x="25" y="242" width="30" height="20"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" animating="YES" style="medium" translatesAutoresizingMaskIntoConstraints="NO" id="CnR-bF-BSK">
-                                <rect key="frame" x="330" y="276" width="20" height="20"/>
+                                <rect key="frame" x="759" y="242" width="16" height="16"/>
                             </activityIndicatorView>
                         </subviews>
                         <viewLayoutGuide key="safeArea" id="nnI-kd-OaY"/>
@@ -1077,7 +1092,7 @@
             <objects>
                 <tableViewController storyboardIdentifier="PlaylistEditVC" title="Edit Playlist" id="BdK-66-Any" customClass="PlaylistEditVC" customModule="Amperfy" customModuleProvider="target" sceneMemberID="viewController">
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="y8Q-Ot-b43">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
+                        <rect key="frame" x="0.0" y="0.0" width="800" height="600"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <connections>
@@ -1111,13 +1126,14 @@
             <color white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>
         <systemColor name="secondarySystemBackgroundColor">
-            <color red="0.94901960780000005" green="0.94901960780000005" blue="0.96862745100000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.94901960784313721" green="0.94901960784313721" blue="0.96862745098039216" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </systemColor>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>
         <systemColor name="systemBlueColor">
-            <color red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.0" green="0.47843137254901963" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </systemColor>
     </resources>
 </document>
+
diff --git a/Amperfy/Screens/ViewController/LoginVC.swift b/Amperfy/Screens/ViewController/LoginVC.swift
index 280a5748..5a885f00 100644
--- a/Amperfy/Screens/ViewController/LoginVC.swift
+++ b/Amperfy/Screens/ViewController/LoginVC.swift
@@ -22,6 +22,7 @@
 import UIKit
 import AmperfyKit
 import PromiseKit
+import SwiftUI
 
 extension String {
     var isHyperTextProtocolProvided: Bool {
@@ -38,7 +39,8 @@ class LoginVC: UIViewController {
     @IBOutlet weak var usernameTF: UITextField!
     @IBOutlet weak var passwordTF: UITextField!
     @IBOutlet weak var apiSelectorButton: BasicButton!
-    
+    @IBOutlet weak var advancedButton: BasicButton!
+
     @IBAction func serverUrlActionPressed() {
         serverUrlTF.resignFirstResponder()
         login()
@@ -124,6 +126,94 @@ class LoginVC: UIViewController {
                 self.updateApiSelectorText()
             })
         ])
+
+        struct ContentView: View {
+             @Binding var listEntries: [String]
+             @Environment(
+                 \.dismiss
+             ) var dismiss
+
+             var body: some View {
+                 NavigationView {
+                     List {
+                         ForEach(
+                             listEntries.indices,
+                             id: \.self
+                         ) {
+                             index in TextField(
+                                 "Enter Header: HEADER_NAME=HEADER_VALUE",
+                                 text: $listEntries[index]
+                             )
+                         }
+                         .onDelete(
+                             perform: {
+                                 (
+                                     offset: IndexSet
+                                 ) in listEntries.remove(
+                                     atOffsets: offset
+                                 )
+                             })
+                         .moveDisabled(
+                             true
+                         )
+                     }
+                     .navigationBarItems(
+                         leading: Button(
+                             action: {
+                                 listEntries
+                                     .append(
+                                         "New Header"
+                                     )
+                             },
+                             label: {
+                                 Image(
+                                     systemName: "plus"
+                                 )
+                             }
+                         ),
+                         trailing: HStack {
+                             EditButton()
+                             Button("Back") {
+                                 dismiss()
+                             }
+                         }
+                     )
+                 }
+             }
+         }
+         let customHeadersBinding = Binding<[String]>(
+             get: {
+                 self.backendApi.customHeaders
+             },
+             set: {
+                 self.backendApi.setCustomHeaders(
+                     headers: $0
+                 )
+             }
+         )
+         let contentView = ContentView(
+             listEntries: customHeadersBinding
+         )
+         let hostingVC = UIHostingController(
+             rootView: contentView
+         )
+
+         advancedButton.showsMenuAsPrimaryAction = true
+         advancedButton.menu = UIMenu(
+             children: [
+                 UIAction(
+                     title: "Custom HTTP Headers",
+                     handler: { _ in
+                         self.present(
+                             hostingVC,
+                             animated: true,
+                             completion: nil
+                         )
+                         hostingVC.modalPresentationStyle = .formSheet
+                     }
+                 )
+             ]
+         )
     }
     
     override func viewIsAppearing(_ animated: Bool) {
diff --git a/AmperfyKit/Api/Ampache/AmpacheApi.swift b/AmperfyKit/Api/Ampache/AmpacheApi.swift
index 7f2a213b..d82c9153 100644
--- a/AmperfyKit/Api/Ampache/AmpacheApi.swift
+++ b/AmperfyKit/Api/Ampache/AmpacheApi.swift
@@ -48,6 +48,10 @@ class AmpacheApi: BackendApi {
         return ampacheXmlServerApi.isStreamingTranscodingActive
     }
 
+    public var customHeaders: [String] {
+        return ampacheXmlServerApi.customHeaders
+    }
+
     func provideCredentials(credentials: LoginCredentials) {
         ampacheXmlServerApi.provideCredentials(credentials: credentials)
     }
@@ -88,4 +92,7 @@ class AmpacheApi: BackendApi {
         return ampacheXmlServerApi.cleanse(url: url)
     }
 
+    func setCustomHeaders(headers: [String]) {
+        ampacheXmlServerApi.setCustomHeaders(headers: headers)
+    }
 }
diff --git a/AmperfyKit/Api/Ampache/AmpacheXmlServerApi.swift b/AmperfyKit/Api/Ampache/AmpacheXmlServerApi.swift
index ee3bac83..91074685 100644
--- a/AmperfyKit/Api/Ampache/AmpacheXmlServerApi.swift
+++ b/AmperfyKit/Api/Ampache/AmpacheXmlServerApi.swift
@@ -77,7 +77,8 @@ class AmpacheXmlServerApi: URLCleanser {
     var isStreamingTranscodingActive: Bool {
         return persistentStorage.settings.streamingFormatPreference != .raw
     }
-    
+    var customHeaders: [String] = []
+
     private let log = OSLog(subsystem: "Amperfy", category: "Ampache")
     private let performanceMonitor: ThreadPerformanceMonitor
     let eventLogger: EventLogger
@@ -687,8 +688,14 @@ class AmpacheXmlServerApi: URLCleanser {
     }
     
     private func request(url: URL) -> Promise<APIDataResponse> {
+        let httpHeaders: HTTPHeaders = customHeaders.reduce(into: [:]) { result, header in
+            let parts = header.split(separator: "=")
+            if parts.count == 2 {
+                result[String(parts[0])] = String(parts[1])
+            }
+        }
         return firstly {
-            AF.request(url, method: .get).validate().responseData()
+            AF.request(url, method: .get, headers: httpHeaders).validate().responseData()
         }.then { data, response in
             Promise<APIDataResponse>.value(APIDataResponse(data: data, url: url, meta: response))
         }
@@ -797,5 +804,9 @@ class AmpacheXmlServerApi: URLCleanser {
             self.request(url: url)
         }
     }
-    
+
+    func setCustomHeaders(headers: [String]) {
+        self.customHeaders = headers
+    }
+
 }
diff --git a/AmperfyKit/Api/BackendApi.swift b/AmperfyKit/Api/BackendApi.swift
index d6bfb7d3..887ff58f 100644
--- a/AmperfyKit/Api/BackendApi.swift
+++ b/AmperfyKit/Api/BackendApi.swift
@@ -180,6 +180,7 @@ public protocol BackendApi: URLCleanser {
     var clientApiVersion: String { get }
     var serverApiVersion: String { get }
     var isStreamingTranscodingActive: Bool { get }
+    var customHeaders: [String] { get }
     func provideCredentials(credentials: LoginCredentials)
     func isAuthenticationValid(credentials: LoginCredentials) -> Promise<Void>
     func generateUrl(forDownloadingPlayable playable: AbstractPlayable) -> Promise<URL>
@@ -189,4 +190,5 @@ public protocol BackendApi: URLCleanser {
     func createLibrarySyncer(storage: PersistentStorage) -> LibrarySyncer
     func createArtworkArtworkDownloadDelegate() -> DownloadManagerDelegate
     func extractArtworkInfoFromURL(urlString: String) -> ArtworkRemoteInfo?
+    func setCustomHeaders(headers: [String])
 }
diff --git a/AmperfyKit/Api/BackendProxy.swift b/AmperfyKit/Api/BackendProxy.swift
index f162802a..01ae4073 100644
--- a/AmperfyKit/Api/BackendProxy.swift
+++ b/AmperfyKit/Api/BackendProxy.swift
@@ -294,19 +294,23 @@ public class BackendProxy {
 }
     
 extension BackendProxy: BackendApi {
-  
+
     public var clientApiVersion: String {
         return activeApi.clientApiVersion
     }
-    
+
     public var serverApiVersion: String {
         return activeApi.serverApiVersion
     }
-    
+
     public var isStreamingTranscodingActive: Bool {
         return activeApi.isStreamingTranscodingActive
     }
-    
+
+    public var customHeaders: [String] {
+        return activeApi.customHeaders
+    }
+
     public func provideCredentials(credentials: LoginCredentials) {
         activeApi.provideCredentials(credentials: credentials)
     }
@@ -314,23 +318,23 @@ extension BackendProxy: BackendApi {
     public func isAuthenticationValid(credentials: LoginCredentials) -> Promise<Void> {
         return activeApi.isAuthenticationValid(credentials: credentials)
     }
-    
+
     public func generateUrl(forDownloadingPlayable playable: AbstractPlayable) -> Promise<URL> {
         return activeApi.generateUrl(forDownloadingPlayable: playable)
     }
-    
+
     public func generateUrl(forStreamingPlayable playable: AbstractPlayable, maxBitrate: StreamingMaxBitratePreference) -> Promise<URL> {
         return activeApi.generateUrl(forStreamingPlayable: playable, maxBitrate: maxBitrate)
     }
-    
+
     public func generateUrl(forArtwork artwork: Artwork) -> Promise<URL> {
         return activeApi.generateUrl(forArtwork: artwork)
     }
-    
+
     public func checkForErrorResponse(response: APIDataResponse) -> ResponseError? {
         return activeApi.checkForErrorResponse(response: response)
     }
-    
+
     public func createLibrarySyncer(storage: PersistentStorage) -> LibrarySyncer {
         return activeApi.createLibrarySyncer(storage: storage)
     }
@@ -338,13 +342,16 @@ extension BackendProxy: BackendApi {
     public func createArtworkArtworkDownloadDelegate() -> DownloadManagerDelegate {
         return activeApi.createArtworkArtworkDownloadDelegate()
     }
-    
+
     public func extractArtworkInfoFromURL(urlString: String) -> ArtworkRemoteInfo? {
         return activeApi.extractArtworkInfoFromURL(urlString: urlString)
     }
-    
+
     public func cleanse(url: URL) -> CleansedURL {
         return activeApi.cleanse(url: url)
     }
-    
+
+    public func setCustomHeaders(headers: [String]) {
+        activeApi.setCustomHeaders(headers: headers)
+    }
 }
diff --git a/AmperfyKit/Api/Subsonic/SubsonicApi.swift b/AmperfyKit/Api/Subsonic/SubsonicApi.swift
index 495640ee..5d4536b3 100644
--- a/AmperfyKit/Api/Subsonic/SubsonicApi.swift
+++ b/AmperfyKit/Api/Subsonic/SubsonicApi.swift
@@ -58,6 +58,10 @@ extension SubsonicApi: BackendApi {
         return subsonicServerApi.isStreamingTranscodingActive
     }
 
+    public var customHeaders: [String] {
+        return subsonicServerApi.customHeaders
+    }
+
     func provideCredentials(credentials: LoginCredentials) {
         subsonicServerApi.provideCredentials(credentials: credentials)
     }
@@ -98,4 +102,7 @@ extension SubsonicApi: BackendApi {
         return subsonicServerApi.cleanse(url: url)
     }
 
+    func setCustomHeaders(headers: [String]) {
+        subsonicServerApi.setCustomHeaders(headers: headers)
+    }
 }
diff --git a/AmperfyKit/Api/Subsonic/SubsonicServerApi.swift b/AmperfyKit/Api/Subsonic/SubsonicServerApi.swift
index 6055df6a..bad5a245 100644
--- a/AmperfyKit/Api/Subsonic/SubsonicServerApi.swift
+++ b/AmperfyKit/Api/Subsonic/SubsonicServerApi.swift
@@ -92,6 +92,7 @@ class SubsonicServerApi: URLCleanser {
     var isStreamingTranscodingActive: Bool {
         return persistentStorage.settings.streamingFormatPreference != .raw
     }
+    var customHeaders: [String] = []
     var authType: SubsonicApiAuthType = .autoDetect
     private var authTypeBasedClientApiVersion: SubsonicVersion {
         return self.authType == .legacy ? Self.defaultClientApiVersionPreToken : Self.defaultClientApiVersionWithToken
@@ -750,13 +751,22 @@ class SubsonicServerApi: URLCleanser {
     }
     
     private func request(url: URL) -> Promise<APIDataResponse> {
+        let httpHeaders: HTTPHeaders = customHeaders.reduce(into: [:]) { result, header in
+            let parts = header.split(separator: "=")
+            if parts.count == 2 {
+                result[String(parts[0])] = String(parts[1])
+            }
+        }
         return firstly {
-            AF.request(url, method: .get).validate().responseData()
+            AF.request(url, method: .get, headers: httpHeaders).validate().responseData()
         }.then { data, response in
             Promise<APIDataResponse>.value(APIDataResponse(data: data, url: url, meta: response))
         }
     }
-    
+
+    func setCustomHeaders(headers: [String]) {
+        customHeaders = headers
+    }
 }
 
 extension SubsonicServerApi: SubsonicUrlCreator {