diff --git a/popup.html b/popup.html
index b018fa1..6d0446a 100644
--- a/popup.html
+++ b/popup.html
@@ -47,12 +47,9 @@
             <option value="0" id="Scania"><div class="server-name">Scania</div></option>
             <option value="1" id="Windia"> <div class="server-name">Windia</div></option>
             <option value="2" id="Bera"> <div class="server-name">Bera</div></option>
-            <option value="3" id="Broa"><div class="server-name">Broa</div></option>
-            <option value="4" id="Khaini"><div class="server-name">Khaini</div></option>
-            <option value="5" id="Mardia"><div class="server-name">Ymck</div></option>
-            <option value="6" id="Demethos"><div class="server-name">Gazed</div></option>
-            <option value="7" id="Bellocan"><div class="server-name">Bellonova</div></option>
-            <option value="8" id="Renegades"><div class="server-name">Renegades</div></option>
+            <option value="3" id="Khroa"><div class="server-name">Khroa</div></option>
+            <option value="4" id="Mybckn"><div class="server-name">Mybckn</div></option>
+            <option value="5" id="Grazed"><div class="server-name">Grazed</div></option>
         </select>
         
       </div>
diff --git a/popup.js b/popup.js
index e43f5f7..6b56bdb 100644
--- a/popup.js
+++ b/popup.js
@@ -7,7 +7,7 @@ var result = bgpage.resultlist;
 
 var newItemName;
 
-var fmservers = ["Scania", "Windia", "Bera", "Broa", "Khaini", "Ymck", "Gazed", "Bellonova", "Renegades"];
+var fmservers = ["Scania", "Windia", "Bera", "Khroa", "Mybckn", "Grazed"];
 
 window.onload = reload;
 
@@ -251,7 +251,21 @@ function selectReplacement(obj) {
         var txt = document.createTextNode(opts[i].text);
         var img = document.createElement('img');
         img.className = 'server-icon';
-        img.src = "http://maple.fm/img/worlds/" + opts[i].id + ".png";
+        switch(i){
+            case 0:
+            case 1:
+            case 2:
+                img.src = "http://maple.fm/img/worlds/" + opts[i].id + ".png";
+                break;
+            case 3:
+                img.src = "http://maple.fm/img/worlds/Khaini.png";
+                break;
+            case 4:
+                img.src = "http://maple.fm/img/worlds/Mardia.png";
+                break;
+            case 5:
+                img.src = "http://maple.fm/img/worlds/Galicia.png"
+        }
 
         li.appendChild(img);
         li.appendChild(txt);