diff --git a/diylc/diylc-core/src/org/diylc/lang/TranslateUtil.java b/diylc/diylc-core/src/org/diylc/lang/TranslateUtil.java
index ef828285..c385d257 100644
--- a/diylc/diylc-core/src/org/diylc/lang/TranslateUtil.java
+++ b/diylc/diylc-core/src/org/diylc/lang/TranslateUtil.java
@@ -125,11 +125,29 @@ public class TranslateUtil {
     return missing;
   }
 
-  public static List<String> getAvailableLanguages() {
+  public static Map<String, Map<String, String>> getAvailableLanguages() {
     try (Stream<Path> walk = Files.walk(Paths.get(LANG_DIR))) {
-
-      return walk.filter(Files::isRegularFile).map(x -> x.getFileName().toString().replaceFirst("[.][^.]+$", ""))
+      Map<String, Map<String, String>> res = new HashMap<String, Map<String, String>>();
+      List<String> files = walk.filter(Files::isRegularFile).map(x -> x.getFileName().toString())
           .collect(Collectors.toList());
+      for (String file : files) {
+        String key = file.replaceFirst("[.][^.]+$", "");
+        Map<String, String> details = new HashMap<String, String>();
+        try (Stream<String> stream = Files.lines(
+            Paths.get(LANG_DIR + File.separator + file), StandardCharsets.UTF_8)) {
+          stream.forEach(s -> {
+            if (s.contains("=")) {
+              String[] parts = s.split("=");
+              if (parts.length == 2)
+                details.put(parts[0].toLowerCase().trim(), parts[1].trim());
+            }
+          });
+        } catch (IOException e) {
+          LOG.error("Error loading language file", e);
+        }
+        res.put(key, details);
+      }
+      return res;
     } catch (IOException e) {
       LOG.error("Error fetching available languages");
       return null;
diff --git a/diylc/diylc-swing/dict.txt b/diylc/diylc-swing/dict.txt
index 6980c1dc..64bbfd4d 100644
--- a/diylc/diylc-swing/dict.txt
+++ b/diylc/diylc-swing/dict.txt
@@ -45,7 +45,6 @@ G-D-S     JFET
 G-D-S     MOSFET
 G-S-D     JFET
 G-S-D     MOSFET
-Idioma
 Italiano
 NPN
 Nederlands
diff --git a/diylc/diylc-swing/lang/Deutsch.txt b/diylc/diylc-swing/lang/Deutsch.txt
index ec396426..d3b8360d 100644
--- a/diylc/diylc-swing/lang/Deutsch.txt
+++ b/diylc/diylc-swing/lang/Deutsch.txt
@@ -1,3 +1,6 @@
+#start-internal
+icon=germany
+#end-internal
 (Building Blocks)|(Bausteine)
 (Favorites)|(Favoriten)
 (Recently Used)|(Kürzlich verwendet)
diff --git a/diylc/diylc-swing/lang/English.txt b/diylc/diylc-swing/lang/English.txt
index 842b93b9..517189a8 100644
--- a/diylc/diylc-swing/lang/English.txt
+++ b/diylc/diylc-swing/lang/English.txt
@@ -1,3 +1,6 @@
+#start-internal
+icon=usa
+#end-internal
 (Building Blocks)
 (Favorites)
 (Recently Used)
diff --git a/diylc/diylc-swing/lang/Español.txt b/diylc/diylc-swing/lang/Español.txt
index eac8d499..b4dafac0 100644
--- a/diylc/diylc-swing/lang/Español.txt
+++ b/diylc/diylc-swing/lang/Español.txt
@@ -1,3 +1,6 @@
+#start-internal
+icon=spain
+#end-internal
 (Building Blocks)|(Bloques de construcción)
 (Favorites)|(Favoritos)
 (Recently Used)|(Recientemente usado)
diff --git a/diylc/diylc-swing/lang/Français.txt b/diylc/diylc-swing/lang/Français.txt
index 7f2414df..d2a10457 100644
--- a/diylc/diylc-swing/lang/Français.txt
+++ b/diylc/diylc-swing/lang/Français.txt
@@ -1,3 +1,6 @@
+#start-internal
+icon=france
+#end-internal
 (Building Blocks)|(Blocs de construction)
 (Favorites)|(Favoris)
 (Recently Used)|(Récemment utilisé)
diff --git a/diylc/diylc-swing/lang/Italiano.txt b/diylc/diylc-swing/lang/Italiano.txt
index 789cfb34..61eb8b13 100644
--- a/diylc/diylc-swing/lang/Italiano.txt
+++ b/diylc/diylc-swing/lang/Italiano.txt
@@ -1,3 +1,6 @@
+#start-internal
+icon=italy
+#end-internal
 (Building Blocks)|(Building Blocks)
 (Favorites)|(Preferiti)
 (Recently Used)|(Usato di recente)
diff --git a/diylc/diylc-swing/lang/Nederlands.txt b/diylc/diylc-swing/lang/Nederlands.txt
index d19c0aa3..e4ff60bb 100644
--- a/diylc/diylc-swing/lang/Nederlands.txt
+++ b/diylc/diylc-swing/lang/Nederlands.txt
@@ -1,3 +1,6 @@
+#start-internal
+icon=netherlands
+#end-internal
 (Building Blocks)|(Bouwstenen)
 (Favorites)|(Favorieten)
 (Recently Used)|(Onlangs gebruikt)
diff --git a/diylc/diylc-swing/src/org/diylc/flags/FlagLoader.java b/diylc/diylc-swing/src/org/diylc/flags/FlagLoader.java
new file mode 100644
index 00000000..61780931
--- /dev/null
+++ b/diylc/diylc-swing/src/org/diylc/flags/FlagLoader.java
@@ -0,0 +1,43 @@
+/*
+
+    DIY Layout Creator (DIYLC).
+    Copyright (c) 2009-2018 held jointly by the individual authors.
+
+    This file is part of DIYLC.
+
+    DIYLC is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    DIYLC is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with DIYLC.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+package org.diylc.flags;
+
+import javax.swing.Icon;
+import javax.swing.ImageIcon;
+
+/**
+ * Loads image resources as Icons.
+ * 
+ * @author Branislav Stojkovic
+ */
+public class FlagLoader {
+
+  public static Icon getIcon(String name) {
+    java.net.URL imgURL = FlagLoader.class.getResource("flag_" + name + ".png");
+    if (imgURL != null) {
+      return new ImageIcon(imgURL, name);
+    } else {
+      System.err.println("Couldn't find file: " + name);
+      return null;
+    }
+  }
+}
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_afghanistan.png b/diylc/diylc-swing/src/org/diylc/flags/flag_afghanistan.png
new file mode 100644
index 00000000..8859babf
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_afghanistan.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_albania.png b/diylc/diylc-swing/src/org/diylc/flags/flag_albania.png
new file mode 100644
index 00000000..a9733788
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_albania.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_algeria.png b/diylc/diylc-swing/src/org/diylc/flags/flag_algeria.png
new file mode 100644
index 00000000..a454fd8f
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_algeria.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_american_samoa.png b/diylc/diylc-swing/src/org/diylc/flags/flag_american_samoa.png
new file mode 100644
index 00000000..0f2de95e
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_american_samoa.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_andorra.png b/diylc/diylc-swing/src/org/diylc/flags/flag_andorra.png
new file mode 100644
index 00000000..3eda8030
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_andorra.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_angola.png b/diylc/diylc-swing/src/org/diylc/flags/flag_angola.png
new file mode 100644
index 00000000..de098884
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_angola.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_anguilla.png b/diylc/diylc-swing/src/org/diylc/flags/flag_anguilla.png
new file mode 100644
index 00000000..fb90b71c
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_anguilla.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_antigua_and_barbuda.png b/diylc/diylc-swing/src/org/diylc/flags/flag_antigua_and_barbuda.png
new file mode 100644
index 00000000..131a6b7e
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_antigua_and_barbuda.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_argentina.png b/diylc/diylc-swing/src/org/diylc/flags/flag_argentina.png
new file mode 100644
index 00000000..3279e5f8
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_argentina.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_armenia.png b/diylc/diylc-swing/src/org/diylc/flags/flag_armenia.png
new file mode 100644
index 00000000..8215cf72
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_armenia.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_aruba.png b/diylc/diylc-swing/src/org/diylc/flags/flag_aruba.png
new file mode 100644
index 00000000..a34b3ddc
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_aruba.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_australia.png b/diylc/diylc-swing/src/org/diylc/flags/flag_australia.png
new file mode 100644
index 00000000..3b2889b9
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_australia.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_austria.png b/diylc/diylc-swing/src/org/diylc/flags/flag_austria.png
new file mode 100644
index 00000000..a3795e86
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_austria.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_azerbaijan.png b/diylc/diylc-swing/src/org/diylc/flags/flag_azerbaijan.png
new file mode 100644
index 00000000..735008c9
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_azerbaijan.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_bahamas.png b/diylc/diylc-swing/src/org/diylc/flags/flag_bahamas.png
new file mode 100644
index 00000000..9b0a7abb
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_bahamas.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_bahrain.png b/diylc/diylc-swing/src/org/diylc/flags/flag_bahrain.png
new file mode 100644
index 00000000..f7d2c959
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_bahrain.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_bangladesh.png b/diylc/diylc-swing/src/org/diylc/flags/flag_bangladesh.png
new file mode 100644
index 00000000..16529066
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_bangladesh.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_barbados.png b/diylc/diylc-swing/src/org/diylc/flags/flag_barbados.png
new file mode 100644
index 00000000..1f8aadd0
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_barbados.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_belarus.png b/diylc/diylc-swing/src/org/diylc/flags/flag_belarus.png
new file mode 100644
index 00000000..678631a7
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_belarus.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_belgium.png b/diylc/diylc-swing/src/org/diylc/flags/flag_belgium.png
new file mode 100644
index 00000000..84629780
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_belgium.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_belize.png b/diylc/diylc-swing/src/org/diylc/flags/flag_belize.png
new file mode 100644
index 00000000..95f86f84
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_belize.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_benin.png b/diylc/diylc-swing/src/org/diylc/flags/flag_benin.png
new file mode 100644
index 00000000..67954696
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_benin.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_bermuda.png b/diylc/diylc-swing/src/org/diylc/flags/flag_bermuda.png
new file mode 100644
index 00000000..4ffd9e39
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_bermuda.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_bhutan.png b/diylc/diylc-swing/src/org/diylc/flags/flag_bhutan.png
new file mode 100644
index 00000000..16fce396
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_bhutan.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_bolivia.png b/diylc/diylc-swing/src/org/diylc/flags/flag_bolivia.png
new file mode 100644
index 00000000..5c86416b
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_bolivia.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_bosnia_and_herzegovina.png b/diylc/diylc-swing/src/org/diylc/flags/flag_bosnia_and_herzegovina.png
new file mode 100644
index 00000000..48f890a7
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_bosnia_and_herzegovina.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_botswana.png b/diylc/diylc-swing/src/org/diylc/flags/flag_botswana.png
new file mode 100644
index 00000000..9945edf3
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_botswana.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_brazil.png b/diylc/diylc-swing/src/org/diylc/flags/flag_brazil.png
new file mode 100644
index 00000000..e7375050
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_brazil.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_british_indian_ocean_territory.png b/diylc/diylc-swing/src/org/diylc/flags/flag_british_indian_ocean_territory.png
new file mode 100644
index 00000000..3566b553
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_british_indian_ocean_territory.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_british_virgin_islands.png b/diylc/diylc-swing/src/org/diylc/flags/flag_british_virgin_islands.png
new file mode 100644
index 00000000..39326145
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_british_virgin_islands.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_brunei.png b/diylc/diylc-swing/src/org/diylc/flags/flag_brunei.png
new file mode 100644
index 00000000..86037fa6
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_brunei.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_bulgaria.png b/diylc/diylc-swing/src/org/diylc/flags/flag_bulgaria.png
new file mode 100644
index 00000000..781ddfa4
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_bulgaria.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_burkina_faso.png b/diylc/diylc-swing/src/org/diylc/flags/flag_burkina_faso.png
new file mode 100644
index 00000000..e8484186
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_burkina_faso.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_burma.png b/diylc/diylc-swing/src/org/diylc/flags/flag_burma.png
new file mode 100644
index 00000000..753c584f
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_burma.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_burundi.png b/diylc/diylc-swing/src/org/diylc/flags/flag_burundi.png
new file mode 100644
index 00000000..a0391da7
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_burundi.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_cambodia.png b/diylc/diylc-swing/src/org/diylc/flags/flag_cambodia.png
new file mode 100644
index 00000000..d10de88f
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_cambodia.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_cameroon.png b/diylc/diylc-swing/src/org/diylc/flags/flag_cameroon.png
new file mode 100644
index 00000000..ba6cb72f
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_cameroon.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_canada.png b/diylc/diylc-swing/src/org/diylc/flags/flag_canada.png
new file mode 100644
index 00000000..870fa7f1
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_canada.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_cape_verde.png b/diylc/diylc-swing/src/org/diylc/flags/flag_cape_verde.png
new file mode 100644
index 00000000..200eb467
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_cape_verde.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_cayman_islands.png b/diylc/diylc-swing/src/org/diylc/flags/flag_cayman_islands.png
new file mode 100644
index 00000000..e3b81d59
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_cayman_islands.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_central_african_republic.png b/diylc/diylc-swing/src/org/diylc/flags/flag_central_african_republic.png
new file mode 100644
index 00000000..d8af6fc6
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_central_african_republic.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_chad.png b/diylc/diylc-swing/src/org/diylc/flags/flag_chad.png
new file mode 100644
index 00000000..cdf1578e
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_chad.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_chile.png b/diylc/diylc-swing/src/org/diylc/flags/flag_chile.png
new file mode 100644
index 00000000..67d4d801
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_chile.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_china.png b/diylc/diylc-swing/src/org/diylc/flags/flag_china.png
new file mode 100644
index 00000000..d84edf9f
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_china.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_colombia.png b/diylc/diylc-swing/src/org/diylc/flags/flag_colombia.png
new file mode 100644
index 00000000..1c81f202
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_colombia.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_comoros.png b/diylc/diylc-swing/src/org/diylc/flags/flag_comoros.png
new file mode 100644
index 00000000..4091fc3f
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_comoros.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_congo_democratic_republic.png b/diylc/diylc-swing/src/org/diylc/flags/flag_congo_democratic_republic.png
new file mode 100644
index 00000000..de82c589
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_congo_democratic_republic.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_congo_republic.png b/diylc/diylc-swing/src/org/diylc/flags/flag_congo_republic.png
new file mode 100644
index 00000000..7556a522
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_congo_republic.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_cook_islands.png b/diylc/diylc-swing/src/org/diylc/flags/flag_cook_islands.png
new file mode 100644
index 00000000..2cb34fca
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_cook_islands.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_costa_rica.png b/diylc/diylc-swing/src/org/diylc/flags/flag_costa_rica.png
new file mode 100644
index 00000000..36339c0e
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_costa_rica.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_cote_divoire.png b/diylc/diylc-swing/src/org/diylc/flags/flag_cote_divoire.png
new file mode 100644
index 00000000..2e095d38
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_cote_divoire.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_croatia.png b/diylc/diylc-swing/src/org/diylc/flags/flag_croatia.png
new file mode 100644
index 00000000..7113cccd
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_croatia.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_cuba.png b/diylc/diylc-swing/src/org/diylc/flags/flag_cuba.png
new file mode 100644
index 00000000..f35a92c7
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_cuba.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_cyprus.png b/diylc/diylc-swing/src/org/diylc/flags/flag_cyprus.png
new file mode 100644
index 00000000..ff1ea571
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_cyprus.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_czech_republic.png b/diylc/diylc-swing/src/org/diylc/flags/flag_czech_republic.png
new file mode 100644
index 00000000..7476024a
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_czech_republic.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_denmark.png b/diylc/diylc-swing/src/org/diylc/flags/flag_denmark.png
new file mode 100644
index 00000000..5e7dd63a
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_denmark.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_djibouti.png b/diylc/diylc-swing/src/org/diylc/flags/flag_djibouti.png
new file mode 100644
index 00000000..f531803a
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_djibouti.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_dominica.png b/diylc/diylc-swing/src/org/diylc/flags/flag_dominica.png
new file mode 100644
index 00000000..972fc0d9
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_dominica.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_dominican_republic.png b/diylc/diylc-swing/src/org/diylc/flags/flag_dominican_republic.png
new file mode 100644
index 00000000..e7fc0bdf
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_dominican_republic.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_east_timor.png b/diylc/diylc-swing/src/org/diylc/flags/flag_east_timor.png
new file mode 100644
index 00000000..5d57076b
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_east_timor.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_egypt.png b/diylc/diylc-swing/src/org/diylc/flags/flag_egypt.png
new file mode 100644
index 00000000..ac1349c1
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_egypt.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_el_salvador.png b/diylc/diylc-swing/src/org/diylc/flags/flag_el_salvador.png
new file mode 100644
index 00000000..441ea3ce
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_el_salvador.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_england.png b/diylc/diylc-swing/src/org/diylc/flags/flag_england.png
new file mode 100644
index 00000000..97e4e045
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_england.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_equador.png b/diylc/diylc-swing/src/org/diylc/flags/flag_equador.png
new file mode 100644
index 00000000..97ad9a31
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_equador.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_equatorial_guinea.png b/diylc/diylc-swing/src/org/diylc/flags/flag_equatorial_guinea.png
new file mode 100644
index 00000000..cbe55acd
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_equatorial_guinea.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_eritrea.png b/diylc/diylc-swing/src/org/diylc/flags/flag_eritrea.png
new file mode 100644
index 00000000..a9634682
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_eritrea.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_estonia.png b/diylc/diylc-swing/src/org/diylc/flags/flag_estonia.png
new file mode 100644
index 00000000..e8b183f0
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_estonia.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_ethiopia.png b/diylc/diylc-swing/src/org/diylc/flags/flag_ethiopia.png
new file mode 100644
index 00000000..49cf8d8a
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_ethiopia.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_eu.png b/diylc/diylc-swing/src/org/diylc/flags/flag_eu.png
new file mode 100644
index 00000000..9900d019
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_eu.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_falkland_islands.png b/diylc/diylc-swing/src/org/diylc/flags/flag_falkland_islands.png
new file mode 100644
index 00000000..4e1c90f6
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_falkland_islands.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_faroe_islands.png b/diylc/diylc-swing/src/org/diylc/flags/flag_faroe_islands.png
new file mode 100644
index 00000000..e8a0b499
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_faroe_islands.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_fiji.png b/diylc/diylc-swing/src/org/diylc/flags/flag_fiji.png
new file mode 100644
index 00000000..32280e47
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_fiji.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_finland.png b/diylc/diylc-swing/src/org/diylc/flags/flag_finland.png
new file mode 100644
index 00000000..c51c610c
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_finland.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_france.png b/diylc/diylc-swing/src/org/diylc/flags/flag_france.png
new file mode 100644
index 00000000..e7c03b91
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_france.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_french_polynesia.png b/diylc/diylc-swing/src/org/diylc/flags/flag_french_polynesia.png
new file mode 100644
index 00000000..6d09a192
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_french_polynesia.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_gabon.png b/diylc/diylc-swing/src/org/diylc/flags/flag_gabon.png
new file mode 100644
index 00000000..15652dfa
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_gabon.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_gambia.png b/diylc/diylc-swing/src/org/diylc/flags/flag_gambia.png
new file mode 100644
index 00000000..eff6eff1
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_gambia.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_generic.png b/diylc/diylc-swing/src/org/diylc/flags/flag_generic.png
new file mode 100644
index 00000000..a49157b7
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_generic.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_georgia.png b/diylc/diylc-swing/src/org/diylc/flags/flag_georgia.png
new file mode 100644
index 00000000..8ab76cfc
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_georgia.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_germany.png b/diylc/diylc-swing/src/org/diylc/flags/flag_germany.png
new file mode 100644
index 00000000..864ab143
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_germany.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_ghana.png b/diylc/diylc-swing/src/org/diylc/flags/flag_ghana.png
new file mode 100644
index 00000000..8deee62e
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_ghana.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_gibraltar.png b/diylc/diylc-swing/src/org/diylc/flags/flag_gibraltar.png
new file mode 100644
index 00000000..58c9d0a4
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_gibraltar.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_great_britain.png b/diylc/diylc-swing/src/org/diylc/flags/flag_great_britain.png
new file mode 100644
index 00000000..7748478a
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_great_britain.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_greece.png b/diylc/diylc-swing/src/org/diylc/flags/flag_greece.png
new file mode 100644
index 00000000..b3330c51
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_greece.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_greenland.png b/diylc/diylc-swing/src/org/diylc/flags/flag_greenland.png
new file mode 100644
index 00000000..bf918e98
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_greenland.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_grenada.png b/diylc/diylc-swing/src/org/diylc/flags/flag_grenada.png
new file mode 100644
index 00000000..a000a00c
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_grenada.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_guam.png b/diylc/diylc-swing/src/org/diylc/flags/flag_guam.png
new file mode 100644
index 00000000..8e16f085
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_guam.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_guatemala.png b/diylc/diylc-swing/src/org/diylc/flags/flag_guatemala.png
new file mode 100644
index 00000000..a22b3591
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_guatemala.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_guernsey.png b/diylc/diylc-swing/src/org/diylc/flags/flag_guernsey.png
new file mode 100644
index 00000000..bc5b6df5
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_guernsey.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_guinea.png b/diylc/diylc-swing/src/org/diylc/flags/flag_guinea.png
new file mode 100644
index 00000000..3150d37e
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_guinea.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_guinea_bissau.png b/diylc/diylc-swing/src/org/diylc/flags/flag_guinea_bissau.png
new file mode 100644
index 00000000..9396eb33
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_guinea_bissau.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_guyana.png b/diylc/diylc-swing/src/org/diylc/flags/flag_guyana.png
new file mode 100644
index 00000000..23ae7e9d
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_guyana.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_haiti.png b/diylc/diylc-swing/src/org/diylc/flags/flag_haiti.png
new file mode 100644
index 00000000..4e90fb11
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_haiti.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_honduras.png b/diylc/diylc-swing/src/org/diylc/flags/flag_honduras.png
new file mode 100644
index 00000000..6e88326d
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_honduras.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_hong_kong.png b/diylc/diylc-swing/src/org/diylc/flags/flag_hong_kong.png
new file mode 100644
index 00000000..d3abb0c0
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_hong_kong.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_hungary.png b/diylc/diylc-swing/src/org/diylc/flags/flag_hungary.png
new file mode 100644
index 00000000..7ece3c18
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_hungary.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_iceland.png b/diylc/diylc-swing/src/org/diylc/flags/flag_iceland.png
new file mode 100644
index 00000000..e31e91d9
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_iceland.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_india.png b/diylc/diylc-swing/src/org/diylc/flags/flag_india.png
new file mode 100644
index 00000000..24c3dd6d
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_india.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_indonesia.png b/diylc/diylc-swing/src/org/diylc/flags/flag_indonesia.png
new file mode 100644
index 00000000..9cf6ebe4
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_indonesia.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_iran.png b/diylc/diylc-swing/src/org/diylc/flags/flag_iran.png
new file mode 100644
index 00000000..a899aee4
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_iran.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_iraq.png b/diylc/diylc-swing/src/org/diylc/flags/flag_iraq.png
new file mode 100644
index 00000000..a061609d
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_iraq.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_ireland.png b/diylc/diylc-swing/src/org/diylc/flags/flag_ireland.png
new file mode 100644
index 00000000..24b01156
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_ireland.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_isle_of_man.png b/diylc/diylc-swing/src/org/diylc/flags/flag_isle_of_man.png
new file mode 100644
index 00000000..5bb0326b
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_isle_of_man.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_israel.png b/diylc/diylc-swing/src/org/diylc/flags/flag_israel.png
new file mode 100644
index 00000000..677e115e
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_israel.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_italy.png b/diylc/diylc-swing/src/org/diylc/flags/flag_italy.png
new file mode 100644
index 00000000..7c888e94
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_italy.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_jamaica.png b/diylc/diylc-swing/src/org/diylc/flags/flag_jamaica.png
new file mode 100644
index 00000000..6a65b414
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_jamaica.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_japan.png b/diylc/diylc-swing/src/org/diylc/flags/flag_japan.png
new file mode 100644
index 00000000..3f360d3c
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_japan.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_jersey.png b/diylc/diylc-swing/src/org/diylc/flags/flag_jersey.png
new file mode 100644
index 00000000..20bef679
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_jersey.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_jordan.png b/diylc/diylc-swing/src/org/diylc/flags/flag_jordan.png
new file mode 100644
index 00000000..b8ebcb1e
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_jordan.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_kazakhstan.png b/diylc/diylc-swing/src/org/diylc/flags/flag_kazakhstan.png
new file mode 100644
index 00000000..d9506e10
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_kazakhstan.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_kenya.png b/diylc/diylc-swing/src/org/diylc/flags/flag_kenya.png
new file mode 100644
index 00000000..e75a9e54
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_kenya.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_kiribati.png b/diylc/diylc-swing/src/org/diylc/flags/flag_kiribati.png
new file mode 100644
index 00000000..f1c14741
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_kiribati.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_kuwait.png b/diylc/diylc-swing/src/org/diylc/flags/flag_kuwait.png
new file mode 100644
index 00000000..df747261
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_kuwait.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_kyrgyzstan.png b/diylc/diylc-swing/src/org/diylc/flags/flag_kyrgyzstan.png
new file mode 100644
index 00000000..b9a2657b
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_kyrgyzstan.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_laos.png b/diylc/diylc-swing/src/org/diylc/flags/flag_laos.png
new file mode 100644
index 00000000..5ae00db0
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_laos.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_latvia.png b/diylc/diylc-swing/src/org/diylc/flags/flag_latvia.png
new file mode 100644
index 00000000..d95d956c
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_latvia.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_lebanon.png b/diylc/diylc-swing/src/org/diylc/flags/flag_lebanon.png
new file mode 100644
index 00000000..8741cf8b
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_lebanon.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_lesotho.png b/diylc/diylc-swing/src/org/diylc/flags/flag_lesotho.png
new file mode 100644
index 00000000..3762a8a5
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_lesotho.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_liberia.png b/diylc/diylc-swing/src/org/diylc/flags/flag_liberia.png
new file mode 100644
index 00000000..806ec418
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_liberia.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_libya.png b/diylc/diylc-swing/src/org/diylc/flags/flag_libya.png
new file mode 100644
index 00000000..ffc6950e
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_libya.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_liechtenstein.png b/diylc/diylc-swing/src/org/diylc/flags/flag_liechtenstein.png
new file mode 100644
index 00000000..05f81c68
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_liechtenstein.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_lithuania.png b/diylc/diylc-swing/src/org/diylc/flags/flag_lithuania.png
new file mode 100644
index 00000000..ea50803b
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_lithuania.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_luxembourg.png b/diylc/diylc-swing/src/org/diylc/flags/flag_luxembourg.png
new file mode 100644
index 00000000..ca2d6021
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_luxembourg.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_macau.png b/diylc/diylc-swing/src/org/diylc/flags/flag_macau.png
new file mode 100644
index 00000000..6e5a042f
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_macau.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_macedonia.png b/diylc/diylc-swing/src/org/diylc/flags/flag_macedonia.png
new file mode 100644
index 00000000..6561cf05
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_macedonia.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_madagascar.png b/diylc/diylc-swing/src/org/diylc/flags/flag_madagascar.png
new file mode 100644
index 00000000..ce26cc92
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_madagascar.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_malawi.png b/diylc/diylc-swing/src/org/diylc/flags/flag_malawi.png
new file mode 100644
index 00000000..022c0afe
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_malawi.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_malaysia.png b/diylc/diylc-swing/src/org/diylc/flags/flag_malaysia.png
new file mode 100644
index 00000000..5ce74b93
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_malaysia.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_maledives.png b/diylc/diylc-swing/src/org/diylc/flags/flag_maledives.png
new file mode 100644
index 00000000..6ee3fa8e
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_maledives.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_mali.png b/diylc/diylc-swing/src/org/diylc/flags/flag_mali.png
new file mode 100644
index 00000000..6d6d0650
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_mali.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_malta.png b/diylc/diylc-swing/src/org/diylc/flags/flag_malta.png
new file mode 100644
index 00000000..66cdecf8
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_malta.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_marshall_islands.png b/diylc/diylc-swing/src/org/diylc/flags/flag_marshall_islands.png
new file mode 100644
index 00000000..16c71545
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_marshall_islands.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_martinique.png b/diylc/diylc-swing/src/org/diylc/flags/flag_martinique.png
new file mode 100644
index 00000000..de720d31
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_martinique.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_mauretania.png b/diylc/diylc-swing/src/org/diylc/flags/flag_mauretania.png
new file mode 100644
index 00000000..e0500806
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_mauretania.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_mauritius.png b/diylc/diylc-swing/src/org/diylc/flags/flag_mauritius.png
new file mode 100644
index 00000000..2f45e046
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_mauritius.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_mexico.png b/diylc/diylc-swing/src/org/diylc/flags/flag_mexico.png
new file mode 100644
index 00000000..25685e8d
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_mexico.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_micronesia.png b/diylc/diylc-swing/src/org/diylc/flags/flag_micronesia.png
new file mode 100644
index 00000000..ed7adf67
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_micronesia.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_moldova.png b/diylc/diylc-swing/src/org/diylc/flags/flag_moldova.png
new file mode 100644
index 00000000..3f7cabee
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_moldova.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_monaco.png b/diylc/diylc-swing/src/org/diylc/flags/flag_monaco.png
new file mode 100644
index 00000000..eed6df15
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_monaco.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_mongolia.png b/diylc/diylc-swing/src/org/diylc/flags/flag_mongolia.png
new file mode 100644
index 00000000..4b5a9859
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_mongolia.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_montserrat.png b/diylc/diylc-swing/src/org/diylc/flags/flag_montserrat.png
new file mode 100644
index 00000000..6ba0f73e
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_montserrat.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_morocco.png b/diylc/diylc-swing/src/org/diylc/flags/flag_morocco.png
new file mode 100644
index 00000000..d791027d
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_morocco.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_mozambique.png b/diylc/diylc-swing/src/org/diylc/flags/flag_mozambique.png
new file mode 100644
index 00000000..f6bedbd5
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_mozambique.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_namibia.png b/diylc/diylc-swing/src/org/diylc/flags/flag_namibia.png
new file mode 100644
index 00000000..8b7633aa
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_namibia.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_nauru.png b/diylc/diylc-swing/src/org/diylc/flags/flag_nauru.png
new file mode 100644
index 00000000..4b18dc25
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_nauru.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_nepal.png b/diylc/diylc-swing/src/org/diylc/flags/flag_nepal.png
new file mode 100644
index 00000000..54473805
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_nepal.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_netherlands.png b/diylc/diylc-swing/src/org/diylc/flags/flag_netherlands.png
new file mode 100644
index 00000000..d086c6d6
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_netherlands.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_netherlands_antilles.png b/diylc/diylc-swing/src/org/diylc/flags/flag_netherlands_antilles.png
new file mode 100644
index 00000000..d034b5aa
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_netherlands_antilles.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_new_zealand.png b/diylc/diylc-swing/src/org/diylc/flags/flag_new_zealand.png
new file mode 100644
index 00000000..210bc477
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_new_zealand.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_nicaragua.png b/diylc/diylc-swing/src/org/diylc/flags/flag_nicaragua.png
new file mode 100644
index 00000000..d9db866b
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_nicaragua.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_niger.png b/diylc/diylc-swing/src/org/diylc/flags/flag_niger.png
new file mode 100644
index 00000000..dad712bc
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_niger.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_nigeria.png b/diylc/diylc-swing/src/org/diylc/flags/flag_nigeria.png
new file mode 100644
index 00000000..71533416
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_nigeria.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_niue.png b/diylc/diylc-swing/src/org/diylc/flags/flag_niue.png
new file mode 100644
index 00000000..fa951ac0
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_niue.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_norfolk_island.png b/diylc/diylc-swing/src/org/diylc/flags/flag_norfolk_island.png
new file mode 100644
index 00000000..03aa4c5f
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_norfolk_island.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_north_korea.png b/diylc/diylc-swing/src/org/diylc/flags/flag_north_korea.png
new file mode 100644
index 00000000..28c66cc7
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_north_korea.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_northern_mariana_islands.png b/diylc/diylc-swing/src/org/diylc/flags/flag_northern_mariana_islands.png
new file mode 100644
index 00000000..f594dc6b
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_northern_mariana_islands.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_norway.png b/diylc/diylc-swing/src/org/diylc/flags/flag_norway.png
new file mode 100644
index 00000000..892992f4
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_norway.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_oman.png b/diylc/diylc-swing/src/org/diylc/flags/flag_oman.png
new file mode 100644
index 00000000..f264804a
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_oman.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_pakistan.png b/diylc/diylc-swing/src/org/diylc/flags/flag_pakistan.png
new file mode 100644
index 00000000..ae9621cb
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_pakistan.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_palau.png b/diylc/diylc-swing/src/org/diylc/flags/flag_palau.png
new file mode 100644
index 00000000..ae7fdfb4
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_palau.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_panama.png b/diylc/diylc-swing/src/org/diylc/flags/flag_panama.png
new file mode 100644
index 00000000..ada3de14
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_panama.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_papua_new_guinea.png b/diylc/diylc-swing/src/org/diylc/flags/flag_papua_new_guinea.png
new file mode 100644
index 00000000..44accf36
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_papua_new_guinea.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_paraquay.png b/diylc/diylc-swing/src/org/diylc/flags/flag_paraquay.png
new file mode 100644
index 00000000..e51190ad
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_paraquay.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_peru.png b/diylc/diylc-swing/src/org/diylc/flags/flag_peru.png
new file mode 100644
index 00000000..acb9461f
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_peru.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_philippines.png b/diylc/diylc-swing/src/org/diylc/flags/flag_philippines.png
new file mode 100644
index 00000000..b8afbeca
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_philippines.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_pitcairn_islands.png b/diylc/diylc-swing/src/org/diylc/flags/flag_pitcairn_islands.png
new file mode 100644
index 00000000..d011e6ff
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_pitcairn_islands.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_poland.png b/diylc/diylc-swing/src/org/diylc/flags/flag_poland.png
new file mode 100644
index 00000000..359617b0
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_poland.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_portugal.png b/diylc/diylc-swing/src/org/diylc/flags/flag_portugal.png
new file mode 100644
index 00000000..6708587d
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_portugal.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_puerto_rico.png b/diylc/diylc-swing/src/org/diylc/flags/flag_puerto_rico.png
new file mode 100644
index 00000000..5e032497
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_puerto_rico.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_qatar.png b/diylc/diylc-swing/src/org/diylc/flags/flag_qatar.png
new file mode 100644
index 00000000..aaf9cc40
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_qatar.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_romania.png b/diylc/diylc-swing/src/org/diylc/flags/flag_romania.png
new file mode 100644
index 00000000..363f7041
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_romania.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_russia.png b/diylc/diylc-swing/src/org/diylc/flags/flag_russia.png
new file mode 100644
index 00000000..e3d3e931
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_russia.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_rwanda.png b/diylc/diylc-swing/src/org/diylc/flags/flag_rwanda.png
new file mode 100644
index 00000000..e1b273b3
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_rwanda.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_saint_helena.png b/diylc/diylc-swing/src/org/diylc/flags/flag_saint_helena.png
new file mode 100644
index 00000000..2f55871f
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_saint_helena.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_saint_kitts_and_nevis.png b/diylc/diylc-swing/src/org/diylc/flags/flag_saint_kitts_and_nevis.png
new file mode 100644
index 00000000..f260a6b1
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_saint_kitts_and_nevis.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_saint_lucia.png b/diylc/diylc-swing/src/org/diylc/flags/flag_saint_lucia.png
new file mode 100644
index 00000000..b70fcc8c
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_saint_lucia.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_saint_pierre_and_miquelon.png b/diylc/diylc-swing/src/org/diylc/flags/flag_saint_pierre_and_miquelon.png
new file mode 100644
index 00000000..25fc60f0
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_saint_pierre_and_miquelon.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_saint_vincent_and_the_grenadines.png b/diylc/diylc-swing/src/org/diylc/flags/flag_saint_vincent_and_the_grenadines.png
new file mode 100644
index 00000000..7012cb98
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_saint_vincent_and_the_grenadines.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_samoa.png b/diylc/diylc-swing/src/org/diylc/flags/flag_samoa.png
new file mode 100644
index 00000000..6523d4a6
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_samoa.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_san_marino.png b/diylc/diylc-swing/src/org/diylc/flags/flag_san_marino.png
new file mode 100644
index 00000000..9bcbb238
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_san_marino.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_sao_tome_and_principe.png b/diylc/diylc-swing/src/org/diylc/flags/flag_sao_tome_and_principe.png
new file mode 100644
index 00000000..8017de63
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_sao_tome_and_principe.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_saudi_arabia.png b/diylc/diylc-swing/src/org/diylc/flags/flag_saudi_arabia.png
new file mode 100644
index 00000000..c0804378
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_saudi_arabia.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_scotland.png b/diylc/diylc-swing/src/org/diylc/flags/flag_scotland.png
new file mode 100644
index 00000000..0032f060
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_scotland.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_senegal.png b/diylc/diylc-swing/src/org/diylc/flags/flag_senegal.png
new file mode 100644
index 00000000..0ae71635
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_senegal.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_serbia.png b/diylc/diylc-swing/src/org/diylc/flags/flag_serbia.png
new file mode 100644
index 00000000..40b744a5
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_serbia.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_seychelles.png b/diylc/diylc-swing/src/org/diylc/flags/flag_seychelles.png
new file mode 100644
index 00000000..52301c56
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_seychelles.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_sierra_leone.png b/diylc/diylc-swing/src/org/diylc/flags/flag_sierra_leone.png
new file mode 100644
index 00000000..16fc8964
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_sierra_leone.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_singapore.png b/diylc/diylc-swing/src/org/diylc/flags/flag_singapore.png
new file mode 100644
index 00000000..4b9abb7d
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_singapore.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_slovakia.png b/diylc/diylc-swing/src/org/diylc/flags/flag_slovakia.png
new file mode 100644
index 00000000..130f2878
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_slovakia.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_slovenia.png b/diylc/diylc-swing/src/org/diylc/flags/flag_slovenia.png
new file mode 100644
index 00000000..44badfa7
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_slovenia.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_solomon_islands.png b/diylc/diylc-swing/src/org/diylc/flags/flag_solomon_islands.png
new file mode 100644
index 00000000..5867c26d
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_solomon_islands.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_somalia.png b/diylc/diylc-swing/src/org/diylc/flags/flag_somalia.png
new file mode 100644
index 00000000..65b4dd08
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_somalia.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_south_africa.png b/diylc/diylc-swing/src/org/diylc/flags/flag_south_africa.png
new file mode 100644
index 00000000..a6431828
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_south_africa.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_south_georgia.png b/diylc/diylc-swing/src/org/diylc/flags/flag_south_georgia.png
new file mode 100644
index 00000000..c7242f6e
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_south_georgia.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_south_korea.png b/diylc/diylc-swing/src/org/diylc/flags/flag_south_korea.png
new file mode 100644
index 00000000..085928d7
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_south_korea.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_spain.png b/diylc/diylc-swing/src/org/diylc/flags/flag_spain.png
new file mode 100644
index 00000000..89889723
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_spain.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_sri_lanka.png b/diylc/diylc-swing/src/org/diylc/flags/flag_sri_lanka.png
new file mode 100644
index 00000000..7e1bae23
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_sri_lanka.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_sudan.png b/diylc/diylc-swing/src/org/diylc/flags/flag_sudan.png
new file mode 100644
index 00000000..e4981c50
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_sudan.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_suriname.png b/diylc/diylc-swing/src/org/diylc/flags/flag_suriname.png
new file mode 100644
index 00000000..5971b424
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_suriname.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_swaziland.png b/diylc/diylc-swing/src/org/diylc/flags/flag_swaziland.png
new file mode 100644
index 00000000..6eedba09
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_swaziland.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_sweden.png b/diylc/diylc-swing/src/org/diylc/flags/flag_sweden.png
new file mode 100644
index 00000000..d7c73cc7
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_sweden.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_switzerland.png b/diylc/diylc-swing/src/org/diylc/flags/flag_switzerland.png
new file mode 100644
index 00000000..645d55d3
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_switzerland.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_syria.png b/diylc/diylc-swing/src/org/diylc/flags/flag_syria.png
new file mode 100644
index 00000000..38c5a3c4
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_syria.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_taiwan.png b/diylc/diylc-swing/src/org/diylc/flags/flag_taiwan.png
new file mode 100644
index 00000000..d64b932d
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_taiwan.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_tajikistan.png b/diylc/diylc-swing/src/org/diylc/flags/flag_tajikistan.png
new file mode 100644
index 00000000..540756d3
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_tajikistan.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_tanzania.png b/diylc/diylc-swing/src/org/diylc/flags/flag_tanzania.png
new file mode 100644
index 00000000..1e9d1574
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_tanzania.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_thailand.png b/diylc/diylc-swing/src/org/diylc/flags/flag_thailand.png
new file mode 100644
index 00000000..06d54800
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_thailand.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_tibet.png b/diylc/diylc-swing/src/org/diylc/flags/flag_tibet.png
new file mode 100644
index 00000000..0a224b1f
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_tibet.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_togo.png b/diylc/diylc-swing/src/org/diylc/flags/flag_togo.png
new file mode 100644
index 00000000..c532b3c4
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_togo.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_tonga.png b/diylc/diylc-swing/src/org/diylc/flags/flag_tonga.png
new file mode 100644
index 00000000..4d6d34f3
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_tonga.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_trinidad_and_tobago.png b/diylc/diylc-swing/src/org/diylc/flags/flag_trinidad_and_tobago.png
new file mode 100644
index 00000000..e988a727
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_trinidad_and_tobago.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_tunisia.png b/diylc/diylc-swing/src/org/diylc/flags/flag_tunisia.png
new file mode 100644
index 00000000..e013b299
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_tunisia.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_turkey.png b/diylc/diylc-swing/src/org/diylc/flags/flag_turkey.png
new file mode 100644
index 00000000..0bb12063
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_turkey.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_turkmenistan.png b/diylc/diylc-swing/src/org/diylc/flags/flag_turkmenistan.png
new file mode 100644
index 00000000..d6eb408c
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_turkmenistan.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_turks_and_caicos_islands.png b/diylc/diylc-swing/src/org/diylc/flags/flag_turks_and_caicos_islands.png
new file mode 100644
index 00000000..38fb62a9
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_turks_and_caicos_islands.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_tuvalu.png b/diylc/diylc-swing/src/org/diylc/flags/flag_tuvalu.png
new file mode 100644
index 00000000..6c3d827f
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_tuvalu.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_uganda.png b/diylc/diylc-swing/src/org/diylc/flags/flag_uganda.png
new file mode 100644
index 00000000..9468efc3
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_uganda.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_ukraine.png b/diylc/diylc-swing/src/org/diylc/flags/flag_ukraine.png
new file mode 100644
index 00000000..93fd940c
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_ukraine.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_united_arab_emirates.png b/diylc/diylc-swing/src/org/diylc/flags/flag_united_arab_emirates.png
new file mode 100644
index 00000000..12bb66b2
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_united_arab_emirates.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_uruquay.png b/diylc/diylc-swing/src/org/diylc/flags/flag_uruquay.png
new file mode 100644
index 00000000..1a95c811
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_uruquay.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_usa.png b/diylc/diylc-swing/src/org/diylc/flags/flag_usa.png
new file mode 100644
index 00000000..dd89888d
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_usa.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_uzbekistan.png b/diylc/diylc-swing/src/org/diylc/flags/flag_uzbekistan.png
new file mode 100644
index 00000000..9ff6569b
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_uzbekistan.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_vanuatu.png b/diylc/diylc-swing/src/org/diylc/flags/flag_vanuatu.png
new file mode 100644
index 00000000..505eab04
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_vanuatu.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_vatican_city.png b/diylc/diylc-swing/src/org/diylc/flags/flag_vatican_city.png
new file mode 100644
index 00000000..94319d3b
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_vatican_city.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_venezuela.png b/diylc/diylc-swing/src/org/diylc/flags/flag_venezuela.png
new file mode 100644
index 00000000..c5e318e6
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_venezuela.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_vietnam.png b/diylc/diylc-swing/src/org/diylc/flags/flag_vietnam.png
new file mode 100644
index 00000000..dbbeb637
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_vietnam.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_virgin_islands.png b/diylc/diylc-swing/src/org/diylc/flags/flag_virgin_islands.png
new file mode 100644
index 00000000..95cdfec3
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_virgin_islands.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_wales.png b/diylc/diylc-swing/src/org/diylc/flags/flag_wales.png
new file mode 100644
index 00000000..403d4502
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_wales.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_wallis_and_futuna.png b/diylc/diylc-swing/src/org/diylc/flags/flag_wallis_and_futuna.png
new file mode 100644
index 00000000..29f5e829
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_wallis_and_futuna.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_yemen.png b/diylc/diylc-swing/src/org/diylc/flags/flag_yemen.png
new file mode 100644
index 00000000..af0e9707
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_yemen.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_zambia.png b/diylc/diylc-swing/src/org/diylc/flags/flag_zambia.png
new file mode 100644
index 00000000..09dacc79
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_zambia.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/flags/flag_zimbabwe.png b/diylc/diylc-swing/src/org/diylc/flags/flag_zimbabwe.png
new file mode 100644
index 00000000..7b1758c0
Binary files /dev/null and b/diylc/diylc-swing/src/org/diylc/flags/flag_zimbabwe.png differ
diff --git a/diylc/diylc-swing/src/org/diylc/swing/ActionFactory.java b/diylc/diylc-swing/src/org/diylc/swing/ActionFactory.java
index a9f5c3df..d3f881f7 100644
--- a/diylc/diylc-swing/src/org/diylc/swing/ActionFactory.java
+++ b/diylc/diylc-swing/src/org/diylc/swing/ActionFactory.java
@@ -40,6 +40,7 @@ import java.util.Set;
 import java.util.TreeMap;
 
 import javax.swing.AbstractAction;
+import javax.swing.Icon;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 import javax.swing.KeyStroke;
@@ -261,7 +262,12 @@ public class ActionFactory {
 
   public ToggleAction createToggleAction(String title, String configKey, String groupName,
       String defaultValue) {
-    return new ToggleAction(title, configKey, groupName, defaultValue);
+    return new ToggleAction(title, configKey, groupName, defaultValue, null);
+  }
+  
+  public ToggleAction createToggleAction(String title, String configKey, String groupName,
+      String defaultValue, Icon icon) {
+    return new ToggleAction(title, configKey, groupName, defaultValue, icon);
   }
 
   public ThemeAction createThemeAction(IPlugInPort plugInPort, Theme theme) {
@@ -1701,13 +1707,15 @@ public class ActionFactory {
 
     private String configKey;
 
-    public ToggleAction(String title, String configKey, String groupName, String defaultValue) {
+    public ToggleAction(String title, String configKey, String groupName, String defaultValue, Icon icon) {
       super();
       this.configKey = configKey;
       putValue(AbstractAction.NAME, title);
       putValue(IView.RADIO_BUTTON_GROUP_KEY, groupName);
       putValue(AbstractAction.SELECTED_KEY, ConfigurationManager.getInstance()
           .readString(configKey, defaultValue).equalsIgnoreCase(title));
+      if (icon != null)
+        putValue(AbstractAction.SMALL_ICON, icon);
     }
 
     @Override
diff --git a/diylc/diylc-swing/src/org/diylc/swing/plugins/config/ConfigPlugin.java b/diylc/diylc-swing/src/org/diylc/swing/plugins/config/ConfigPlugin.java
index e200d5da..2627083b 100644
--- a/diylc/diylc-swing/src/org/diylc/swing/plugins/config/ConfigPlugin.java
+++ b/diylc/diylc-swing/src/org/diylc/swing/plugins/config/ConfigPlugin.java
@@ -22,6 +22,9 @@ import java.io.FileInputStream;
 import java.io.InputStream;
 import java.util.EnumSet;
 import java.util.List;
+import java.util.Map;
+
+import javax.swing.Icon;
 
 import org.apache.log4j.Logger;
 import org.diylc.appframework.miscutils.ConfigurationManager;
@@ -31,6 +34,7 @@ import org.diylc.common.IPlugIn;
 import org.diylc.common.IPlugInPort;
 import org.diylc.components.autocreate.SolderPadAutoCreator;
 import org.diylc.core.Theme;
+import org.diylc.flags.FlagLoader;
 import org.diylc.images.IconLoader;
 import org.diylc.lang.TranslateUtil;
 import org.diylc.swing.ActionFactory;
@@ -99,6 +103,26 @@ public class ConfigPlugin implements IPlugIn {
     swingUI.injectMenuAction(
         ActionFactory.getInstance().createConfigAction(plugInPort, "Highlight Connected Areas", IPlugInPort.HIGHLIGHT_CONTINUITY_AREA, 
             false), CONFIG_MENU);
+    
+    try {
+      Map<String, Map<String, String>> languages = TranslateUtil.getAvailableLanguages(); 
+      if (languages != null && languages.size() > 0) {
+        swingUI.injectSubmenu(LANGUAGE_MENU, IconLoader.Earth.getIcon(), CONFIG_MENU);
+        for(Map.Entry<String, Map<String, String>> language : languages.entrySet()) {
+          Icon icon = null;
+          if (language.getValue().containsKey("icon"))
+            icon = FlagLoader.getIcon(language.getValue().get("icon"));
+          swingUI.injectMenuAction(                              
+              ActionFactory.getInstance().createToggleAction(language.getKey(), IPlugInPort.LANGUAGE, LANGUAGE_MENU, IPlugInPort.LANGUAGE_DEFAULT, 
+                  icon),
+              LANGUAGE_MENU);       
+        }
+      }
+    } catch (Exception e) {
+      LOG.error("Error while setting up language menu", e);
+    }
+   
+    
     swingUI.injectMenuAction(
         ActionFactory.getInstance().createConfigAction(plugInPort, "Mouse Wheel Zoom", IPlugInPort.WHEEL_ZOOM_KEY,
             false), CONFIG_MENU);
@@ -138,22 +162,7 @@ public class ConfigPlugin implements IPlugIn {
     
     swingUI.injectMenuAction(
         ActionFactory.getInstance()
-            .createConfigAction(plugInPort, "Sticky Points", IPlugInPort.STICKY_POINTS_KEY, true), CONFIG_MENU);
-       
-    try {
-      List<String> languages = TranslateUtil.getAvailableLanguages(); 
-      if (languages != null && languages.size() > 0) {
-        swingUI.injectSubmenu(LANGUAGE_MENU, IconLoader.Earth.getIcon(), CONFIG_MENU);
-        for(String language : languages) {
-          swingUI.injectMenuAction(
-              ActionFactory.getInstance().createToggleAction(language, IPlugInPort.LANGUAGE, LANGUAGE_MENU, IPlugInPort.LANGUAGE_DEFAULT),
-              LANGUAGE_MENU);       
-        }
-      }
-    } catch (Exception e) {
-      LOG.error("Error while setting up language menu", e);
-    }
-   
+            .createConfigAction(plugInPort, "Sticky Points", IPlugInPort.STICKY_POINTS_KEY, true), CONFIG_MENU);      
 
     File themeDir = new File("themes");
     if (themeDir.exists()) {