diff --git a/Plugins/ThemeRepo/res/DiscordPreview.html b/Plugins/ThemeRepo/res/DiscordPreview.html
index 1f870160cb..a0c8b36b75 100644
--- a/Plugins/ThemeRepo/res/DiscordPreview.html
+++ b/Plugins/ThemeRepo/res/DiscordPreview.html
@@ -45,22 +45,24 @@
 												<div class="pill-2uzAFe wrapper-sa6paO">
 													<span class="item-2hkk8m" style="opacity: 0; height: 8px; transform: translate3d(-4px, 0px, 0px);"></span>
 												</div>
-												<div tabindex="0" class="blob-1PX1Gp wrapper-25eVIn" role="button">
-													<svg width="48" height="48" viewBox="0 0 48 48" class="svg-1X37T1">
-														<mask id="DiscordPreviewMask" fill="black" x="0" y="0" width="48" height="48">
-															<path d="M48 24C48 37.2548 37.2548 48 24 48C10.7452 48 0 37.2548 0 24C0 10.7452 10.7452 0 24 0C37.2548 0 48 10.7452 48 24Z" fill="white"></path>
-															<rect x="28" y="-4" width="24" height="24" rx="12" ry="12" transform="translate(20 -20)" fill="black"></rect>
-															<rect x="28" y="28" width="24" height="24" rx="12" ry="12" transform="translate(20 20)" fill="black"></rect>
-														</mask>
-														<foreignObject mask="url(#DiscordPreviewMask)" x="0" y="0" width="48" height="48">
-															<a class="button-OhfaWu wrapper-1BJsBx" aria-label="Home" href="">
-																<svg name="Nova_Discord" class="homeIcon-tEMBK1" width="28" height="20" viewBox="0 0 28 20">
-																	<path fill="currentColor" d="M20.6644 20C20.6644 20 19.8014 18.9762 19.0822 18.0714C22.2226 17.1905 23.4212 15.2381 23.4212 15.2381C22.4384 15.881 21.5034 16.3334 20.6644 16.6429C19.4658 17.1429 18.3151 17.4762 17.1884 17.6667C14.887 18.0953 12.7774 17.9762 10.9795 17.6429C9.61301 17.381 8.43836 17 7.45548 16.6191C6.90411 16.4048 6.30479 16.1429 5.70548 15.8096C5.63356 15.7619 5.56164 15.7381 5.48973 15.6905C5.44178 15.6667 5.41781 15.6429 5.39384 15.6191C4.96233 15.381 4.7226 15.2143 4.7226 15.2143C4.7226 15.2143 5.87329 17.1191 8.91781 18.0238C8.19863 18.9286 7.31164 20 7.31164 20C2.0137 19.8333 0 16.381 0 16.381C0 8.7144 3.45205 2.50017 3.45205 2.50017C6.90411 -0.07123 10.1884 0.000197861 10.1884 0.000197861L10.4281 0.285909C6.11301 1.52399 4.12329 3.40493 4.12329 3.40493C4.12329 3.40493 4.65068 3.11921 5.53767 2.71446C8.10274 1.59542 10.1404 1.2859 10.9795 1.21447C11.1233 1.19066 11.2432 1.16685 11.387 1.16685C12.8493 0.976379 14.5034 0.92876 16.2295 1.11923C18.5068 1.38114 20.9521 2.0478 23.4452 3.40493C23.4452 3.40493 21.5514 1.61923 17.476 0.381146L17.8116 0.000197861C17.8116 0.000197861 21.0959 -0.07123 24.5479 2.50017C24.5479 2.50017 28 8.7144 28 16.381C28 16.381 25.9623 19.8333 20.6644 20ZM9.51712 8.88106C8.15068 8.88106 7.07192 10.0715 7.07192 11.5239C7.07192 12.9763 8.17466 14.1667 9.51712 14.1667C10.8836 14.1667 11.9623 12.9763 11.9623 11.5239C11.9863 10.0715 10.8836 8.88106 9.51712 8.88106ZM18.2671 8.88106C16.9007 8.88106 15.8219 10.0715 15.8219 11.5239C15.8219 12.9763 16.9247 14.1667 18.2671 14.1667C19.6336 14.1667 20.7123 12.9763 20.7123 11.5239C20.7123 10.0715 19.6336 8.88106 18.2671 8.88106Z"></path>
-																</svg>
-															</a>
-														</foreignObject>
-													</svg>
-													<div class="badgeWrapper-3e8pMZ"></div>
+												<div class="listItemWrapper-3X98Pc">
+													<div class="blob-1PX1Gp wrapper-25eVIn">
+														<svg width="48" height="48" viewBox="0 0 48 48" class="svg-1X37T1">
+															<mask id="DiscordPreviewMask" fill="black" x="0" y="0" width="48" height="48">
+																<path d="M48 24C48 37.2548 37.2548 48 24 48C10.7452 48 0 37.2548 0 24C0 10.7452 10.7452 0 24 0C37.2548 0 48 10.7452 48 24Z" fill="white"></path>
+																<rect x="28" y="-4" width="24" height="24" rx="12" ry="12" transform="translate(20 -20)" fill="black"></rect>
+																<rect x="28" y="28" width="24" height="24" rx="12" ry="12" transform="translate(20 20)" fill="black"></rect>
+															</mask>
+															<foreignObject mask="url(#DiscordPreviewMask)" x="0" y="0" width="48" height="48">
+																<a class="button-OhfaWu wrapper-1BJsBx" aria-label="Home" href="">
+																	<svg name="Nova_Discord" class="homeIcon-tEMBK1" width="28" height="20" viewBox="0 0 28 20">
+																		<path fill="currentColor" d="M20.6644 20C20.6644 20 19.8014 18.9762 19.0822 18.0714C22.2226 17.1905 23.4212 15.2381 23.4212 15.2381C22.4384 15.881 21.5034 16.3334 20.6644 16.6429C19.4658 17.1429 18.3151 17.4762 17.1884 17.6667C14.887 18.0953 12.7774 17.9762 10.9795 17.6429C9.61301 17.381 8.43836 17 7.45548 16.6191C6.90411 16.4048 6.30479 16.1429 5.70548 15.8096C5.63356 15.7619 5.56164 15.7381 5.48973 15.6905C5.44178 15.6667 5.41781 15.6429 5.39384 15.6191C4.96233 15.381 4.7226 15.2143 4.7226 15.2143C4.7226 15.2143 5.87329 17.1191 8.91781 18.0238C8.19863 18.9286 7.31164 20 7.31164 20C2.0137 19.8333 0 16.381 0 16.381C0 8.7144 3.45205 2.50017 3.45205 2.50017C6.90411 -0.07123 10.1884 0.000197861 10.1884 0.000197861L10.4281 0.285909C6.11301 1.52399 4.12329 3.40493 4.12329 3.40493C4.12329 3.40493 4.65068 3.11921 5.53767 2.71446C8.10274 1.59542 10.1404 1.2859 10.9795 1.21447C11.1233 1.19066 11.2432 1.16685 11.387 1.16685C12.8493 0.976379 14.5034 0.92876 16.2295 1.11923C18.5068 1.38114 20.9521 2.0478 23.4452 3.40493C23.4452 3.40493 21.5514 1.61923 17.476 0.381146L17.8116 0.000197861C17.8116 0.000197861 21.0959 -0.07123 24.5479 2.50017C24.5479 2.50017 28 8.7144 28 16.381C28 16.381 25.9623 19.8333 20.6644 20ZM9.51712 8.88106C8.15068 8.88106 7.07192 10.0715 7.07192 11.5239C7.07192 12.9763 8.17466 14.1667 9.51712 14.1667C10.8836 14.1667 11.9623 12.9763 11.9623 11.5239C11.9863 10.0715 10.8836 8.88106 9.51712 8.88106ZM18.2671 8.88106C16.9007 8.88106 15.8219 10.0715 15.8219 11.5239C15.8219 12.9763 16.9247 14.1667 18.2671 14.1667C19.6336 14.1667 20.7123 12.9763 20.7123 11.5239C20.7123 10.0715 19.6336 8.88106 18.2671 8.88106Z"></path>
+																	</svg>
+																</a>
+															</foreignObject>
+														</svg>
+														<div class="badgeWrapper-3e8pMZ"></div>
+													</div>
 												</div>
 											</div>
 											<div style="opacity: 1; height: 56px; transform: scale(1);">
@@ -228,46 +230,50 @@
 												<div class="pill-3YxEhL wrapper-sa6paO">
 													<span class="item-2hkk8m" style="opacity: 0; height: 8px; transform: translate3d(-4px, 0px, 0px);"></span>
 												</div>
-												<div tabindex="0" class="circleButtonMask-2VNJsN wrapper-25eVIn" role="button">
-													<svg width="48" height="48" viewBox="0 0 48 48" class="svg-1X37T1">
-														<mask id="fc8484ec-5608-4acb-a464-162b9718ad08" fill="black" x="0" y="0" width="48" height="48">
-															<path d="M48 24C48 37.2548 37.2548 48 24 48C10.7452 48 0 37.2548 0 24C0 10.7452 10.7452 0 24 0C37.2548 0 48 10.7452 48 24Z" fill="white"></path>
-															<rect x="28" y="-4" width="24" height="24" rx="12" ry="12" transform="translate(20 -20)" fill="black"></rect>
-															<rect x="28" y="28" width="24" height="24" rx="12" ry="12" transform="translate(20 20)" fill="black"></rect>
-														</mask>
-														<foreignObject mask="url(#fc8484ec-5608-4acb-a464-162b9718ad08)" x="0" y="0" width="48" height="48">
-															<div tabindex="0" class="circleIconButton-jET_ig" aria-label="Server hinzufügen" role="button">
-																<svg name="Nova_Add" class="circleIcon-LvPL6c" width="24" height="24" viewBox="0 0 24 24">
-																	<path fill="currentColor" d="M21 11.001H13V3.00098H11V11.001H3V13.001H11V21.001H13V13.001H21V11.001Z"></path>
-																</svg>
-															</div>
-														</foreignObject>
-													</svg>
-													<div class="badgeWrapper-3e8pMZ"></div>
+												<div class="listItemWrapper-3X98Pc">
+													<div  class="circleButtonMask-2VNJsN wrapper-25eVIn">
+														<svg width="48" height="48" viewBox="0 0 48 48" class="svg-1X37T1">
+															<mask id="fc8484ec-5608-4acb-a464-162b9718ad08" fill="black" x="0" y="0" width="48" height="48">
+																<path d="M48 24C48 37.2548 37.2548 48 24 48C10.7452 48 0 37.2548 0 24C0 10.7452 10.7452 0 24 0C37.2548 0 48 10.7452 48 24Z" fill="white"></path>
+																<rect x="28" y="-4" width="24" height="24" rx="12" ry="12" transform="translate(20 -20)" fill="black"></rect>
+																<rect x="28" y="28" width="24" height="24" rx="12" ry="12" transform="translate(20 20)" fill="black"></rect>
+															</mask>
+															<foreignObject mask="url(#fc8484ec-5608-4acb-a464-162b9718ad08)" x="0" y="0" width="48" height="48">
+																<div tabindex="0" class="circleIconButton-jET_ig" aria-label="Server hinzufügen" role="button">
+																	<svg name="Nova_Add" class="circleIcon-LvPL6c" width="24" height="24" viewBox="0 0 24 24">
+																		<path fill="currentColor" d="M21 11.001H13V3.00098H11V11.001H3V13.001H11V21.001H13V13.001H21V11.001Z"></path>
+																	</svg>
+																</div>
+															</foreignObject>
+														</svg>
+														<div class="badgeWrapper-3e8pMZ"></div>
+													</div>
 												</div>
 											</div>
 											<div class="listItem-2P_4kh">
 												<div class="pill-3YxEhL wrapper-sa6paO">
 													<span class="item-2hkk8m" style="opacity: 0; height: 8px; transform: translate3d(-4px, 0px, 0px);"></span>
 												</div>
-												<div tabindex="0" class="circleButtonMask-2VNJsN wrapper-25eVIn" role="button">
-													<svg width="48" height="48" viewBox="0 0 48 48" class="svg-1X37T1">
-														<mask id="17e1719d-09eb-4909-b5ee-873df96d7afa" fill="black" x="0" y="0" width="48" height="48">
-															<path d="M48 24C48 37.2548 37.2548 48 24 48C10.7452 48 0 37.2548 0 24C0 10.7452 10.7452 0 24 0C37.2548 0 48 10.7452 48 24Z" fill="white"></path>
-															<rect x="28" y="-4" width="24" height="24" rx="12" ry="12" transform="translate(20 -20)" fill="black"></rect>
-															<rect x="28" y="28" width="24" height="24" rx="12" ry="12" transform="translate(20 20)" fill="black"></rect>
-														</mask>
-														<foreignObject mask="url(#17e1719d-09eb-4909-b5ee-873df96d7afa)" x="0" y="0" width="48" height="48">
-															<div tabindex="0" class="circleIconButton-jET_ig" aria-label="Server Discovery" role="button">
-																<svg name="Search" width="24" height="24" viewBox="0 0 18 18">
-																	<g fill="none" fill-rule="evenodd">
-																		<path fill="currentColor" d="M3.60091481,7.20297313 C3.60091481,5.20983419 5.20983419,3.60091481 7.20297313,3.60091481 C9.19611206,3.60091481 10.8050314,5.20983419 10.8050314,7.20297313 C10.8050314,9.19611206 9.19611206,10.8050314 7.20297313,10.8050314 C5.20983419,10.8050314 3.60091481,9.19611206 3.60091481,7.20297313 Z M12.0057176,10.8050314 L11.3733562,10.8050314 L11.1492281,10.5889079 C11.9336764,9.67638651 12.4059463,8.49170955 12.4059463,7.20297313 C12.4059463,4.32933105 10.0766152,2 7.20297313,2 C4.32933105,2 2,4.32933105 2,7.20297313 C2,10.0766152 4.32933105,12.4059463 7.20297313,12.4059463 C8.49170955,12.4059463 9.67638651,11.9336764 10.5889079,11.1492281 L10.8050314,11.3733562 L10.8050314,12.0057176 L14.8073185,16 L16,14.8073185 L12.2102538,11.0099776 L12.0057176,10.8050314 Z"></path>
-																	</g>
-																</svg>
-															</div>
-														</foreignObject>
-													</svg>
-													<div class="badgeWrapper-3e8pMZ"></div>
+												<div class="listItemWrapper-3X98Pc">
+													<div  class="circleButtonMask-2VNJsN wrapper-25eVIn">
+														<svg width="48" height="48" viewBox="0 0 48 48" class="svg-1X37T1">
+															<mask id="17e1719d-09eb-4909-b5ee-873df96d7afa" fill="black" x="0" y="0" width="48" height="48">
+																<path d="M48 24C48 37.2548 37.2548 48 24 48C10.7452 48 0 37.2548 0 24C0 10.7452 10.7452 0 24 0C37.2548 0 48 10.7452 48 24Z" fill="white"></path>
+																<rect x="28" y="-4" width="24" height="24" rx="12" ry="12" transform="translate(20 -20)" fill="black"></rect>
+																<rect x="28" y="28" width="24" height="24" rx="12" ry="12" transform="translate(20 20)" fill="black"></rect>
+															</mask>
+															<foreignObject mask="url(#17e1719d-09eb-4909-b5ee-873df96d7afa)" x="0" y="0" width="48" height="48">
+																<div tabindex="0" class="circleIconButton-jET_ig" aria-label="Server Discovery" role="button">
+																	<svg name="Search" width="24" height="24" viewBox="0 0 18 18">
+																		<g fill="none" fill-rule="evenodd">
+																			<path fill="currentColor" d="M3.60091481,7.20297313 C3.60091481,5.20983419 5.20983419,3.60091481 7.20297313,3.60091481 C9.19611206,3.60091481 10.8050314,5.20983419 10.8050314,7.20297313 C10.8050314,9.19611206 9.19611206,10.8050314 7.20297313,10.8050314 C5.20983419,10.8050314 3.60091481,9.19611206 3.60091481,7.20297313 Z M12.0057176,10.8050314 L11.3733562,10.8050314 L11.1492281,10.5889079 C11.9336764,9.67638651 12.4059463,8.49170955 12.4059463,7.20297313 C12.4059463,4.32933105 10.0766152,2 7.20297313,2 C4.32933105,2 2,4.32933105 2,7.20297313 C2,10.0766152 4.32933105,12.4059463 7.20297313,12.4059463 C8.49170955,12.4059463 9.67638651,11.9336764 10.5889079,11.1492281 L10.8050314,11.3733562 L10.8050314,12.0057176 L14.8073185,16 L16,14.8073185 L12.2102538,11.0099776 L12.0057176,10.8050314 Z"></path>
+																		</g>
+																	</svg>
+																</div>
+															</foreignObject>
+														</svg>
+														<div class="badgeWrapper-3e8pMZ"></div>
+													</div>
 												</div>
 											</div>
 											<div class="listItem-2P_4kh">
diff --git a/Themes/ServerColumns/ServerColumns.css b/Themes/ServerColumns/ServerColumns.css
index 73635a1f80..b4a849d71f 100644
--- a/Themes/ServerColumns/ServerColumns.css
+++ b/Themes/ServerColumns/ServerColumns.css
@@ -49,10 +49,11 @@ body.foldercontentopened .titleBar-AC4pGV.typeMacOS-3EmCyP .macButtons-2MuSAC {
 .wrapper-1Rf91z #server-search {
 	margin: 4px calc(1px * (((var(--vguildsize) + 10) * (var(--vcolumns) - 1))/2)) !important;
 }
+.wrapper-1Rf91z .pill-2uzAFe ~ .listItemWrapper-3X98Pc,
 .wrapper-1Rf91z .blob-1PX1Gp {
 	margin: 0 calc(1px * (((var(--vguildsize) + 10) * (var(--vcolumns) - 1))/2)) 4px calc(1px * ((((var(--vguildsize) + 10) * (var(--vcolumns) - 1))/2) + 2)) !important;
 }
-.wrapper-1Rf91z .listItemWrapper-3X98Pc,
+.wrapper-1Rf91z .pill-1m5BUr ~ .listItemWrapper-3X98Pc,
 .wrapper-1Rf91z .blob-3RT82C {
 	margin: 0 calc(1px * ((((var(--vguildsize) + 10) * (var(--vcolumns) - 1))/2) * (1 - var(--valigndms)))) 0 calc(1px * (((0 * var(--valigndms)) + ((((var(--vguildsize) + 10) * (var(--vcolumns) - 1))/2) * (1 - var(--valigndms)))))) !important;
 }