diff --git a/ServerManagement/Components/Controls/ServerComponent.razor b/ServerManagement/Components/Controls/ServerComponent.razor
index 312dcb2..3dd9101 100755
--- a/ServerManagement/Components/Controls/ServerComponent.razor
+++ b/ServerManagement/Components/Controls/ServerComponent.razor
@@ -4,7 +4,7 @@
 
 @if (Server != null)
 {
-  <li @key="Server.Id">
+  <li @key="Server.Id" style="background-color: @GetBackgroundColor();">
     @Server.Name in @Server.City is
     <span style="color:@(Server.IsOnline ? "green" : "red")">
       @(Server.IsOnline ? "online" : "offline")
@@ -51,6 +51,9 @@
   [Parameter]
   public Server? Server { get; set; }
 
+  [CascadingParameter(Name="SelectedCity")]
+  public string? SelectedCity { get; set; }
+
   private void DeleteServer(int serverId)
   {
     if (serverId > 0)
@@ -59,4 +62,24 @@
       NavigationManager.Refresh(forceReload: true);
     }
   }
+
+  private string GetBackgroundColor()
+  {
+    if (SelectedCity != null) {
+      switch (this.SelectedCity)
+      {
+        case "Eindhoven": return "lightskyblue";
+        case "Helmond": return "lightcoral";
+        case "Oosterhout": return "lightgreen";
+        case "Roosendaal": return "lightsalmon";
+        case "Deurne": return "lightpink";
+        default:
+          return "white";
+      }
+    }
+    else
+    {
+      return "white";
+    }
+  }
 }
\ No newline at end of file
diff --git a/ServerManagement/Components/Pages/Servers.razor b/ServerManagement/Components/Pages/Servers.razor
index 1c5dc73..16fe783 100644
--- a/ServerManagement/Components/Pages/Servers.razor
+++ b/ServerManagement/Components/Pages/Servers.razor
@@ -11,11 +11,12 @@
 <a href="@($"/servers/add")" class="btn btn-primary">Add</a>
 <br/>
 
-<ServerListComponent
-  CityName="@this.selectedCity"
-  SearchFilter="@this.searchFilter">
-
-</ServerListComponent>
+<CascadingValue Name="SelectedCity" Value="@selectedCity">
+  <ServerListComponent
+    CityName="@this.selectedCity"
+    SearchFilter="@this.searchFilter">
+  </ServerListComponent>
+</CascadingValue>
 
 @code {
   private string selectedCity = "Eindhoven";