commit 286d73ae0255e25fbb11be6a5c2a0ec0d26e3ee6
Author: Leszek Koltunski <leszek@koltunski.pl>
Date:   Thu Mar 19 23:50:25 2020 +0000

    Port the downloading into the new 'magic' server.

diff --git a/src/main/java/org/distorted/dialog/RubikDialogScoresView.java b/src/main/java/org/distorted/dialog/RubikDialogScoresView.java
index e21ed49d..8e15ad0d 100644
--- a/src/main/java/org/distorted/dialog/RubikDialogScoresView.java
+++ b/src/main/java/org/distorted/dialog/RubikDialogScoresView.java
@@ -81,10 +81,12 @@ public class RubikDialogScoresView extends FrameLayout
     RubikScores scores = RubikScores.getInstance();
 
     boolean inserted = false;
-    long myRecordInSeconds = scores.getRecord(object, size, scramble);
+    long myRecordInMillis = scores.getRecord(object, size, scramble);
+    float myRecordInSeconds = (myRecordInMillis/100)/10.0f;
+    boolean mySubmitted = scores.isSubmitted(object, size, scramble);
     String myName = scores.getName();
     int myCountryID = scores.getCountryID();
-    String myRecord = ( myRecordInSeconds<RubikScores.NO_RECORD ) ? Float.toString((myRecordInSeconds/100)/10.0f) : "??";
+    String myRecord = ( myRecordInMillis<RubikScores.NO_RECORD ) ? Float.toString(myRecordInSeconds) : "??";
     String theirTime;
     int theirCountryID;
 
@@ -95,7 +97,7 @@ public class RubikDialogScoresView extends FrameLayout
       {
       if( name[j] != null )
         {
-        if( myRecordInSeconds<time[j] && !inserted )
+        if( !mySubmitted && myRecordInSeconds<time[j] && !inserted )
           {
           inserted = true;
           View row = createRow(act, myCountryID, myName, myRecord, red);
@@ -128,7 +130,7 @@ public class RubikDialogScoresView extends FrameLayout
     TextView textName = row.findViewById(R.id.scoresScrambleRowName);
     TextView textTime = row.findViewById(R.id.scoresScrambleRowTime);
 
-    imgCoun.setImageResource(countryID!=0 ? countryID : R.drawable.unk);
+    imgCoun.setImageResource(countryID!=0 ? countryID : R.drawable.un);
     textName.setText(name);
     textTime.setText(time);
 
diff --git a/src/main/java/org/distorted/object/RubikObjectList.java b/src/main/java/org/distorted/object/RubikObjectList.java
index 6c012c2b..0c4c2fd8 100644
--- a/src/main/java/org/distorted/object/RubikObjectList.java
+++ b/src/main/java/org/distorted/object/RubikObjectList.java
@@ -113,6 +113,58 @@ public enum RubikObjectList
     return -1;
     }
 
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+  public static int unpackObjectFromString(String obj)
+    {
+    int u = obj.indexOf('_');
+    int l = obj.length();
+
+    if( u>0 )
+      {
+      String name = obj.substring(0,u);
+      int size = Integer.parseInt( obj.substring(u+1,l) );
+
+      for(int i=0; i<NUM_OBJECTS; i++)
+        {
+        if( objects[i].name().equals(name) )
+          {
+          int s = getSize(i,size);
+          return pack(i,s);
+          }
+        }
+      }
+
+    return -1;
+    }
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+  public static String getObjectList()
+    {
+    String name;
+    StringBuilder list = new StringBuilder();
+    int len;
+    int[] sizes;
+
+    for(int i=0; i<NUM_OBJECTS; i++)
+      {
+      sizes = objects[i].mObjectSizes;
+      len   = sizes.length;
+      name  = objects[i].name();
+
+      for(int j=0; j<len; j++)
+        {
+        if( i>0 || j>0 ) list.append(',');
+        list.append(name);
+        list.append('_');
+        list.append(sizes[j]);
+        }
+      }
+
+    return list.toString();
+    }
+
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
   public static int getTotal()
diff --git a/src/main/java/org/distorted/scores/RubikScores.java b/src/main/java/org/distorted/scores/RubikScores.java
index f5b8a0c9..44f6a68f 100644
--- a/src/main/java/org/distorted/scores/RubikScores.java
+++ b/src/main/java/org/distorted/scores/RubikScores.java
@@ -37,6 +37,8 @@ public class RubikScores
   private static RubikScores mThis;
 
   private long[][][] mRecords;
+  private int [][][] mSubmitted;
+
   private String mName;
   private boolean mNameIsVerified;
   private int mNumRuns;
@@ -47,20 +49,22 @@ public class RubikScores
 
   private RubikScores()
     {
-    mRecords = new long[NUM_OBJECTS][MAX_SIZE][MAX_SCRAMBLE];
+    mRecords   = new long[NUM_OBJECTS][MAX_SIZE][MAX_SCRAMBLE];
+    mSubmitted = new int [NUM_OBJECTS][MAX_SIZE][MAX_SCRAMBLE];
 
     for(int i=0; i<NUM_OBJECTS; i++)
       for(int j=0; j<MAX_SIZE; j++)
         for(int k=0; k<MAX_SCRAMBLE; k++)
           {
-          mRecords[i][j][k] = NO_RECORD;
+          mRecords[i][j][k]   = NO_RECORD;
+          mSubmitted[i][j][k] = 0;
           }
 
     mName = "YOU";
     mNameIsVerified = false;
     mNumPlays= -1;
     mNumRuns = -1;
-    mCountryID = R.drawable.unk;
+    mCountryID = R.drawable.un;
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -101,6 +105,8 @@ public class RubikScores
           builder.append(sizes[size]);
           builder.append("=");
           builder.append(mRecords[object][size][scramble]);
+          builder.append(",");
+          builder.append(mSubmitted[object][size][scramble]);
           builder.append(" ");
           }
         }
@@ -118,9 +124,9 @@ public class RubikScores
 
   public void restorePreferences(SharedPreferences preferences)
     {
-    String recordStr, subStr, nameStr, sizeStr, timeStr;
-    int start, end, equals, underscore;
-    int object, size;
+    String recordStr, subStr, nameStr, sizeStr, timeStr, submStr;
+    int start, end, equals, underscore, comma;
+    int object, size, subm;
     long time;
 
     for(int scramble=0; scramble<MAX_SCRAMBLE; scramble++)
@@ -139,24 +145,28 @@ public class RubikScores
 
         underscore = subStr.indexOf("_");
         equals = subStr.indexOf("=");
+        comma = subStr.indexOf(",");
 
-        if( underscore>=0 && equals>=0 )
+        if( underscore>=0 && equals>=0 && comma>=0 )
           {
           nameStr = subStr.substring(0,underscore);
           sizeStr = subStr.substring(underscore+1, equals);
-          timeStr = subStr.substring(equals+1);
+          timeStr = subStr.substring(equals+1,comma);
+          submStr = subStr.substring(comma+1);
 
           object = RubikObjectList.getOrdinal(nameStr);
           size   = RubikObjectList.getSize(object,Integer.parseInt(sizeStr));
           time   = Long.parseLong(timeStr);
+          subm   = Integer.parseInt(submStr);
 
-          if( object>=0 && object< NUM_OBJECTS && size>=0 && size<MAX_SIZE )
+          if( object>=0 && object< NUM_OBJECTS && size>=0 && size<MAX_SIZE && subm>=0 && subm<=1 )
             {
-            mRecords[object][size][scramble] = time;
+            mRecords  [object][size][scramble] = time;
+            mSubmitted[object][size][scramble] = subm;
 
             if( time<NO_RECORD )
               {
-              android.util.Log.e("solv", "Set record for: object="+object+" size="+size+" scramble="+scramble+" time: "+time);
+              android.util.Log.e("solv", "Set record for: object="+object+" size="+size+" scramble="+scramble+" time: "+time+" submitted: "+subm);
               }
             }
           else
@@ -227,6 +237,19 @@ public class RubikScores
     mCountryID = country;
     }
 
+///////////////////////////////////////////////////////////////////////////////////////////////////
+// TODO
+
+  public void setSubmitted(int object, int size, int scramble)
+    {
+    int maxsize = RubikObjectList.getObject(object).getSizes().length;
+
+    if( object>=0 && object<NUM_OBJECTS && size>=0 && size<maxsize && scramble>=1 && scramble<=MAX_SCRAMBLE )
+      {
+      mSubmitted[object][size][scramble] = 1;
+      }
+    }
+
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
   public long getRecord(int object, int size, int scramble)
@@ -241,6 +264,20 @@ public class RubikScores
     return -1;
     }
 
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+  public boolean isSubmitted(int object, int size, int scramble)
+    {
+    int maxsize = RubikObjectList.getObject(object).getSizes().length;
+
+    if( object>=0 && object<NUM_OBJECTS && size>=0 && size<maxsize && scramble>=0 && scramble<MAX_SCRAMBLE )
+      {
+      return mSubmitted[object][size][scramble]==1;
+      }
+
+    return false;
+    }
+
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // TODO
 
diff --git a/src/main/java/org/distorted/scores/RubikScoresDownloader.java b/src/main/java/org/distorted/scores/RubikScoresDownloader.java
index 3e8ed227..a623b01d 100644
--- a/src/main/java/org/distorted/scores/RubikScoresDownloader.java
+++ b/src/main/java/org/distorted/scores/RubikScoresDownloader.java
@@ -38,14 +38,12 @@ public class RubikScoresDownloader implements Runnable
     void exception(String exception);
     }
 
-  public static final int MAX_PLACES = 12;
+  public static final int MAX_PLACES = 10;
 
   private static final int DOWNLOAD   = 0;
   private static final int SUBMIT     = 1;
   private static final int IDLE       = 2;
 
-  private static final String URL  ="http://koltunski.pl/rubik/cgi-bin";
-
   private final String[] hex = {
     "%00", "%01", "%02", "%03", "%04", "%05", "%06", "%07",
     "%08", "%09", "%0a", "%0b", "%0c", "%0d", "%0e", "%0f",
@@ -111,7 +109,16 @@ public class RubikScoresDownloader implements Runnable
       {
       end = mScores.indexOf('\n', begin+1);
       if( end<0 ) end = len;
-      fillRow(mScores.substring(begin+1,end));
+
+      try
+        {
+        fillRow(mScores.substring(begin+1,end));
+        }
+      catch(Exception ex)
+        {
+        // faulty row - ignore
+        }
+
       begin = end;
       }
     }
@@ -124,31 +131,27 @@ public class RubikScoresDownloader implements Runnable
     int s2 = row.indexOf(' ',s1+1);
     int s3 = row.indexOf(' ',s2+1);
     int s4 = row.indexOf(' ',s3+1);
-    int s5 = row.indexOf(' ',s4+1);
-    int s6 = row.length();
+    int s5 = row.length();
 
     if( s5>s4 && s4>s3 && s3>s2 && s2>s1 && s1>0 )
       {
-      int size = Integer.parseInt( row.substring(0,s1) );
+      int object = RubikObjectList.unpackObjectFromString( row.substring(0,s1) );
 
-      if( size>=0 && size<mTotal )
+      if( object>=0 && object<mTotal )
         {
         int level      = Integer.parseInt( row.substring(s1+1,s2) );
-        int place      = Integer.parseInt( row.substring(s2+1,s3) );
-        String name    = row.substring(s3+1, s4);
-        int time       = Integer.parseInt( row.substring(s4+1,s5) );
-        String country = row.substring(s5+1, s6);
+        String name    = row.substring(s2+1, s3);
+        int time       = Integer.parseInt( row.substring(s3+1,s4) );
+        String country = row.substring(s4+1, s5);
 
-        if(level>=0 && level<MAX_SCRAMBLE && place>=0 && place<MAX_PLACES)
+        if(level>0 && level<=MAX_SCRAMBLE)
           {
-          int p = mPlaces[size][level];
-          mPlaces[size][level]++;
+          int p = mPlaces[object][level];
+          mPlaces[object][level]++;
 
-          if( p!=place ) android.util.Log.e("downloader", "size="+size+" level="+level+" p="+p+" place="+place);
-
-          mCountry[size][level][place] = country;
-          mName   [size][level][place] = name;
-          mTime   [size][level][place] = ((float)time)/10.0f;
+          mCountry[object][level-1][p] = country;
+          mName   [object][level-1][p] = name;
+          mTime   [object][level-1][p] = ((float)(time/100))/10.0f;
           }
         }
       }
@@ -195,7 +198,9 @@ public class RubikScoresDownloader implements Runnable
 
   private boolean doDownload()
     {
-    String message=URL+"/download.cgi?n="+URLencode(mUserName)+"&r="+mNumRuns+"&e="+mVersion+"d";
+    String message="https://distorted.org/magic/cgi-bin/download.cgi";
+    message += "?n="+URLencode(mUserName)+"&r="+mNumRuns+"&e="+mVersion+"d";
+    message += "&o="+RubikObjectList.getObjectList()+"&min=0&max="+MAX_SCRAMBLE+"&l="+MAX_PLACES;
 
     try
       {
@@ -270,7 +275,6 @@ public class RubikScoresDownloader implements Runnable
         {
         mRunning = true;
         success = doDownload();
-        fillValues();
         }
       }
     catch( Exception e )
@@ -278,6 +282,8 @@ public class RubikScoresDownloader implements Runnable
       mReceiver.exception("Exception downloading records: "+e.getMessage() );
       }
 
+    fillValues();
+
     mRunning = false;
 
     if( success )
diff --git a/src/main/res/drawable-nodpi/ad.png b/src/main/res/drawable-nodpi/ad.png
new file mode 100644
index 00000000..1f6463c3
Binary files /dev/null and b/src/main/res/drawable-nodpi/ad.png differ
diff --git a/src/main/res/drawable-nodpi/ae.png b/src/main/res/drawable-nodpi/ae.png
new file mode 100644
index 00000000..f9e73ee1
Binary files /dev/null and b/src/main/res/drawable-nodpi/ae.png differ
diff --git a/src/main/res/drawable-nodpi/af.png b/src/main/res/drawable-nodpi/af.png
new file mode 100644
index 00000000..2a8baba1
Binary files /dev/null and b/src/main/res/drawable-nodpi/af.png differ
diff --git a/src/main/res/drawable-nodpi/afg.png b/src/main/res/drawable-nodpi/afg.png
deleted file mode 100644
index 2a8baba1..00000000
Binary files a/src/main/res/drawable-nodpi/afg.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/al.png b/src/main/res/drawable-nodpi/al.png
new file mode 100644
index 00000000..3d17887f
Binary files /dev/null and b/src/main/res/drawable-nodpi/al.png differ
diff --git a/src/main/res/drawable-nodpi/alb.png b/src/main/res/drawable-nodpi/alb.png
deleted file mode 100644
index 3d17887f..00000000
Binary files a/src/main/res/drawable-nodpi/alb.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/alg.png b/src/main/res/drawable-nodpi/alg.png
deleted file mode 100644
index a1514239..00000000
Binary files a/src/main/res/drawable-nodpi/alg.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/am.png b/src/main/res/drawable-nodpi/am.png
new file mode 100644
index 00000000..aa86ab3f
Binary files /dev/null and b/src/main/res/drawable-nodpi/am.png differ
diff --git a/src/main/res/drawable-nodpi/and.png b/src/main/res/drawable-nodpi/and.png
deleted file mode 100644
index 1f6463c3..00000000
Binary files a/src/main/res/drawable-nodpi/and.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ar.png b/src/main/res/drawable-nodpi/ar.png
new file mode 100644
index 00000000..797d30b3
Binary files /dev/null and b/src/main/res/drawable-nodpi/ar.png differ
diff --git a/src/main/res/drawable-nodpi/arg.png b/src/main/res/drawable-nodpi/arg.png
deleted file mode 100644
index 797d30b3..00000000
Binary files a/src/main/res/drawable-nodpi/arg.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/arm.png b/src/main/res/drawable-nodpi/arm.png
deleted file mode 100644
index aa86ab3f..00000000
Binary files a/src/main/res/drawable-nodpi/arm.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/at.png b/src/main/res/drawable-nodpi/at.png
new file mode 100644
index 00000000..d94ee28e
Binary files /dev/null and b/src/main/res/drawable-nodpi/at.png differ
diff --git a/src/main/res/drawable-nodpi/au.png b/src/main/res/drawable-nodpi/au.png
new file mode 100644
index 00000000..da9079fa
Binary files /dev/null and b/src/main/res/drawable-nodpi/au.png differ
diff --git a/src/main/res/drawable-nodpi/aus.png b/src/main/res/drawable-nodpi/aus.png
deleted file mode 100644
index da9079fa..00000000
Binary files a/src/main/res/drawable-nodpi/aus.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/aut.png b/src/main/res/drawable-nodpi/aut.png
deleted file mode 100644
index d94ee28e..00000000
Binary files a/src/main/res/drawable-nodpi/aut.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/az.png b/src/main/res/drawable-nodpi/az.png
new file mode 100644
index 00000000..b87be4d0
Binary files /dev/null and b/src/main/res/drawable-nodpi/az.png differ
diff --git a/src/main/res/drawable-nodpi/aze.png b/src/main/res/drawable-nodpi/aze.png
deleted file mode 100644
index b87be4d0..00000000
Binary files a/src/main/res/drawable-nodpi/aze.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ba.png b/src/main/res/drawable-nodpi/ba.png
new file mode 100644
index 00000000..30fd3c56
Binary files /dev/null and b/src/main/res/drawable-nodpi/ba.png differ
diff --git a/src/main/res/drawable-nodpi/bah.png b/src/main/res/drawable-nodpi/bah.png
deleted file mode 100644
index 1e204044..00000000
Binary files a/src/main/res/drawable-nodpi/bah.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ban.png b/src/main/res/drawable-nodpi/ban.png
deleted file mode 100644
index ce0b179f..00000000
Binary files a/src/main/res/drawable-nodpi/ban.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/bd.png b/src/main/res/drawable-nodpi/bd.png
new file mode 100644
index 00000000..ce0b179f
Binary files /dev/null and b/src/main/res/drawable-nodpi/bd.png differ
diff --git a/src/main/res/drawable-nodpi/be.png b/src/main/res/drawable-nodpi/be.png
new file mode 100644
index 00000000..9484119e
Binary files /dev/null and b/src/main/res/drawable-nodpi/be.png differ
diff --git a/src/main/res/drawable-nodpi/bel.png b/src/main/res/drawable-nodpi/bel.png
deleted file mode 100644
index 9484119e..00000000
Binary files a/src/main/res/drawable-nodpi/bel.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/bg.png b/src/main/res/drawable-nodpi/bg.png
new file mode 100644
index 00000000..fa002343
Binary files /dev/null and b/src/main/res/drawable-nodpi/bg.png differ
diff --git a/src/main/res/drawable-nodpi/bh.png b/src/main/res/drawable-nodpi/bh.png
new file mode 100644
index 00000000..1e204044
Binary files /dev/null and b/src/main/res/drawable-nodpi/bh.png differ
diff --git a/src/main/res/drawable-nodpi/bhu.png b/src/main/res/drawable-nodpi/bhu.png
deleted file mode 100644
index 7b432111..00000000
Binary files a/src/main/res/drawable-nodpi/bhu.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/bir.png b/src/main/res/drawable-nodpi/bir.png
deleted file mode 100644
index 09ccebdc..00000000
Binary files a/src/main/res/drawable-nodpi/bir.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/blr.png b/src/main/res/drawable-nodpi/blr.png
deleted file mode 100644
index 0d9dae23..00000000
Binary files a/src/main/res/drawable-nodpi/blr.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/blz.png b/src/main/res/drawable-nodpi/blz.png
deleted file mode 100644
index 62bdaf2b..00000000
Binary files a/src/main/res/drawable-nodpi/blz.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/bn.png b/src/main/res/drawable-nodpi/bn.png
new file mode 100644
index 00000000..df98ac83
Binary files /dev/null and b/src/main/res/drawable-nodpi/bn.png differ
diff --git a/src/main/res/drawable-nodpi/bo.png b/src/main/res/drawable-nodpi/bo.png
new file mode 100644
index 00000000..66bccdc1
Binary files /dev/null and b/src/main/res/drawable-nodpi/bo.png differ
diff --git a/src/main/res/drawable-nodpi/bol.png b/src/main/res/drawable-nodpi/bol.png
deleted file mode 100644
index 66bccdc1..00000000
Binary files a/src/main/res/drawable-nodpi/bol.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/bos.png b/src/main/res/drawable-nodpi/bos.png
deleted file mode 100644
index 30fd3c56..00000000
Binary files a/src/main/res/drawable-nodpi/bos.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/br.png b/src/main/res/drawable-nodpi/br.png
new file mode 100644
index 00000000..1c40f764
Binary files /dev/null and b/src/main/res/drawable-nodpi/br.png differ
diff --git a/src/main/res/drawable-nodpi/bra.png b/src/main/res/drawable-nodpi/bra.png
deleted file mode 100644
index 1c40f764..00000000
Binary files a/src/main/res/drawable-nodpi/bra.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/bru.png b/src/main/res/drawable-nodpi/bru.png
deleted file mode 100644
index df98ac83..00000000
Binary files a/src/main/res/drawable-nodpi/bru.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/bt.png b/src/main/res/drawable-nodpi/bt.png
new file mode 100644
index 00000000..7b432111
Binary files /dev/null and b/src/main/res/drawable-nodpi/bt.png differ
diff --git a/src/main/res/drawable-nodpi/bul.png b/src/main/res/drawable-nodpi/bul.png
deleted file mode 100644
index fa002343..00000000
Binary files a/src/main/res/drawable-nodpi/bul.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/by.png b/src/main/res/drawable-nodpi/by.png
new file mode 100644
index 00000000..0d9dae23
Binary files /dev/null and b/src/main/res/drawable-nodpi/by.png differ
diff --git a/src/main/res/drawable-nodpi/bz.png b/src/main/res/drawable-nodpi/bz.png
new file mode 100644
index 00000000..62bdaf2b
Binary files /dev/null and b/src/main/res/drawable-nodpi/bz.png differ
diff --git a/src/main/res/drawable-nodpi/ca.png b/src/main/res/drawable-nodpi/ca.png
new file mode 100644
index 00000000..e06aca5c
Binary files /dev/null and b/src/main/res/drawable-nodpi/ca.png differ
diff --git a/src/main/res/drawable-nodpi/can.png b/src/main/res/drawable-nodpi/can.png
deleted file mode 100644
index e06aca5c..00000000
Binary files a/src/main/res/drawable-nodpi/can.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/cey.png b/src/main/res/drawable-nodpi/cey.png
deleted file mode 100644
index 950d4a42..00000000
Binary files a/src/main/res/drawable-nodpi/cey.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ch.png b/src/main/res/drawable-nodpi/ch.png
new file mode 100644
index 00000000..0820cacf
Binary files /dev/null and b/src/main/res/drawable-nodpi/ch.png differ
diff --git a/src/main/res/drawable-nodpi/chi.png b/src/main/res/drawable-nodpi/chi.png
deleted file mode 100644
index dd76a082..00000000
Binary files a/src/main/res/drawable-nodpi/chi.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/chn.png b/src/main/res/drawable-nodpi/chn.png
deleted file mode 100644
index 6dc25fa7..00000000
Binary files a/src/main/res/drawable-nodpi/chn.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/cl.png b/src/main/res/drawable-nodpi/cl.png
new file mode 100644
index 00000000..dd76a082
Binary files /dev/null and b/src/main/res/drawable-nodpi/cl.png differ
diff --git a/src/main/res/drawable-nodpi/cn.png b/src/main/res/drawable-nodpi/cn.png
new file mode 100644
index 00000000..6dc25fa7
Binary files /dev/null and b/src/main/res/drawable-nodpi/cn.png differ
diff --git a/src/main/res/drawable-nodpi/co.png b/src/main/res/drawable-nodpi/co.png
new file mode 100644
index 00000000..2ad162e1
Binary files /dev/null and b/src/main/res/drawable-nodpi/co.png differ
diff --git a/src/main/res/drawable-nodpi/col.png b/src/main/res/drawable-nodpi/col.png
deleted file mode 100644
index 2ad162e1..00000000
Binary files a/src/main/res/drawable-nodpi/col.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/cos.png b/src/main/res/drawable-nodpi/cos.png
deleted file mode 100644
index 944e22f8..00000000
Binary files a/src/main/res/drawable-nodpi/cos.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/cr.png b/src/main/res/drawable-nodpi/cr.png
new file mode 100644
index 00000000..944e22f8
Binary files /dev/null and b/src/main/res/drawable-nodpi/cr.png differ
diff --git a/src/main/res/drawable-nodpi/cro.png b/src/main/res/drawable-nodpi/cro.png
deleted file mode 100644
index 9b2065bf..00000000
Binary files a/src/main/res/drawable-nodpi/cro.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/cu.png b/src/main/res/drawable-nodpi/cu.png
new file mode 100644
index 00000000..a9035f4e
Binary files /dev/null and b/src/main/res/drawable-nodpi/cu.png differ
diff --git a/src/main/res/drawable-nodpi/cub.png b/src/main/res/drawable-nodpi/cub.png
deleted file mode 100644
index a9035f4e..00000000
Binary files a/src/main/res/drawable-nodpi/cub.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/cy.png b/src/main/res/drawable-nodpi/cy.png
new file mode 100644
index 00000000..f72b7989
Binary files /dev/null and b/src/main/res/drawable-nodpi/cy.png differ
diff --git a/src/main/res/drawable-nodpi/cyp.png b/src/main/res/drawable-nodpi/cyp.png
deleted file mode 100644
index f72b7989..00000000
Binary files a/src/main/res/drawable-nodpi/cyp.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/cz.png b/src/main/res/drawable-nodpi/cz.png
new file mode 100644
index 00000000..035dc851
Binary files /dev/null and b/src/main/res/drawable-nodpi/cz.png differ
diff --git a/src/main/res/drawable-nodpi/cze.png b/src/main/res/drawable-nodpi/cze.png
deleted file mode 100644
index 035dc851..00000000
Binary files a/src/main/res/drawable-nodpi/cze.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/de.png b/src/main/res/drawable-nodpi/de.png
new file mode 100644
index 00000000..9306c0f3
Binary files /dev/null and b/src/main/res/drawable-nodpi/de.png differ
diff --git a/src/main/res/drawable-nodpi/den.png b/src/main/res/drawable-nodpi/den.png
deleted file mode 100644
index 62e4d3fb..00000000
Binary files a/src/main/res/drawable-nodpi/den.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/dk.png b/src/main/res/drawable-nodpi/dk.png
new file mode 100644
index 00000000..62e4d3fb
Binary files /dev/null and b/src/main/res/drawable-nodpi/dk.png differ
diff --git a/src/main/res/drawable-nodpi/dm.png b/src/main/res/drawable-nodpi/dm.png
new file mode 100644
index 00000000..df178b58
Binary files /dev/null and b/src/main/res/drawable-nodpi/dm.png differ
diff --git a/src/main/res/drawable-nodpi/dom.png b/src/main/res/drawable-nodpi/dom.png
deleted file mode 100644
index df178b58..00000000
Binary files a/src/main/res/drawable-nodpi/dom.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/dz.png b/src/main/res/drawable-nodpi/dz.png
new file mode 100644
index 00000000..a1514239
Binary files /dev/null and b/src/main/res/drawable-nodpi/dz.png differ
diff --git a/src/main/res/drawable-nodpi/ec.png b/src/main/res/drawable-nodpi/ec.png
new file mode 100644
index 00000000..2b4b2303
Binary files /dev/null and b/src/main/res/drawable-nodpi/ec.png differ
diff --git a/src/main/res/drawable-nodpi/ecu.png b/src/main/res/drawable-nodpi/ecu.png
deleted file mode 100644
index 2b4b2303..00000000
Binary files a/src/main/res/drawable-nodpi/ecu.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ee.png b/src/main/res/drawable-nodpi/ee.png
new file mode 100644
index 00000000..0c41b6e7
Binary files /dev/null and b/src/main/res/drawable-nodpi/ee.png differ
diff --git a/src/main/res/drawable-nodpi/eg.png b/src/main/res/drawable-nodpi/eg.png
new file mode 100644
index 00000000..242af4ec
Binary files /dev/null and b/src/main/res/drawable-nodpi/eg.png differ
diff --git a/src/main/res/drawable-nodpi/egy.png b/src/main/res/drawable-nodpi/egy.png
deleted file mode 100644
index 242af4ec..00000000
Binary files a/src/main/res/drawable-nodpi/egy.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/es.png b/src/main/res/drawable-nodpi/es.png
new file mode 100644
index 00000000..fbb3f38d
Binary files /dev/null and b/src/main/res/drawable-nodpi/es.png differ
diff --git a/src/main/res/drawable-nodpi/esp.png b/src/main/res/drawable-nodpi/esp.png
deleted file mode 100644
index fbb3f38d..00000000
Binary files a/src/main/res/drawable-nodpi/esp.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/est.png b/src/main/res/drawable-nodpi/est.png
deleted file mode 100644
index 0c41b6e7..00000000
Binary files a/src/main/res/drawable-nodpi/est.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/fi.png b/src/main/res/drawable-nodpi/fi.png
new file mode 100644
index 00000000..0368022e
Binary files /dev/null and b/src/main/res/drawable-nodpi/fi.png differ
diff --git a/src/main/res/drawable-nodpi/fin.png b/src/main/res/drawable-nodpi/fin.png
deleted file mode 100644
index 0368022e..00000000
Binary files a/src/main/res/drawable-nodpi/fin.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/fr.png b/src/main/res/drawable-nodpi/fr.png
new file mode 100644
index 00000000..006ef26b
Binary files /dev/null and b/src/main/res/drawable-nodpi/fr.png differ
diff --git a/src/main/res/drawable-nodpi/fra.png b/src/main/res/drawable-nodpi/fra.png
deleted file mode 100644
index 006ef26b..00000000
Binary files a/src/main/res/drawable-nodpi/fra.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/gb.png b/src/main/res/drawable-nodpi/gb.png
new file mode 100644
index 00000000..4a6a762c
Binary files /dev/null and b/src/main/res/drawable-nodpi/gb.png differ
diff --git a/src/main/res/drawable-nodpi/ge.png b/src/main/res/drawable-nodpi/ge.png
new file mode 100644
index 00000000..04f6441b
Binary files /dev/null and b/src/main/res/drawable-nodpi/ge.png differ
diff --git a/src/main/res/drawable-nodpi/geo.png b/src/main/res/drawable-nodpi/geo.png
deleted file mode 100644
index 04f6441b..00000000
Binary files a/src/main/res/drawable-nodpi/geo.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ger.png b/src/main/res/drawable-nodpi/ger.png
deleted file mode 100644
index 9306c0f3..00000000
Binary files a/src/main/res/drawable-nodpi/ger.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/gr.png b/src/main/res/drawable-nodpi/gr.png
new file mode 100644
index 00000000..71983801
Binary files /dev/null and b/src/main/res/drawable-nodpi/gr.png differ
diff --git a/src/main/res/drawable-nodpi/gre.png b/src/main/res/drawable-nodpi/gre.png
deleted file mode 100644
index 71983801..00000000
Binary files a/src/main/res/drawable-nodpi/gre.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/gt.png b/src/main/res/drawable-nodpi/gt.png
new file mode 100644
index 00000000..3f72544c
Binary files /dev/null and b/src/main/res/drawable-nodpi/gt.png differ
diff --git a/src/main/res/drawable-nodpi/gu.png b/src/main/res/drawable-nodpi/gu.png
new file mode 100644
index 00000000..416c2fae
Binary files /dev/null and b/src/main/res/drawable-nodpi/gu.png differ
diff --git a/src/main/res/drawable-nodpi/gua.png b/src/main/res/drawable-nodpi/gua.png
deleted file mode 100644
index 3f72544c..00000000
Binary files a/src/main/res/drawable-nodpi/gua.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/gum.png b/src/main/res/drawable-nodpi/gum.png
deleted file mode 100644
index 416c2fae..00000000
Binary files a/src/main/res/drawable-nodpi/gum.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/guy.png b/src/main/res/drawable-nodpi/guy.png
deleted file mode 100644
index 4d6eb645..00000000
Binary files a/src/main/res/drawable-nodpi/guy.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/gy.png b/src/main/res/drawable-nodpi/gy.png
new file mode 100644
index 00000000..4d6eb645
Binary files /dev/null and b/src/main/res/drawable-nodpi/gy.png differ
diff --git a/src/main/res/drawable-nodpi/hai.png b/src/main/res/drawable-nodpi/hai.png
deleted file mode 100644
index 1784c898..00000000
Binary files a/src/main/res/drawable-nodpi/hai.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/hn.png b/src/main/res/drawable-nodpi/hn.png
new file mode 100644
index 00000000..27340013
Binary files /dev/null and b/src/main/res/drawable-nodpi/hn.png differ
diff --git a/src/main/res/drawable-nodpi/hon.png b/src/main/res/drawable-nodpi/hon.png
deleted file mode 100644
index 27340013..00000000
Binary files a/src/main/res/drawable-nodpi/hon.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/hr.png b/src/main/res/drawable-nodpi/hr.png
new file mode 100644
index 00000000..9b2065bf
Binary files /dev/null and b/src/main/res/drawable-nodpi/hr.png differ
diff --git a/src/main/res/drawable-nodpi/ht.png b/src/main/res/drawable-nodpi/ht.png
new file mode 100644
index 00000000..1784c898
Binary files /dev/null and b/src/main/res/drawable-nodpi/ht.png differ
diff --git a/src/main/res/drawable-nodpi/hu.png b/src/main/res/drawable-nodpi/hu.png
new file mode 100644
index 00000000..9e4c8e5c
Binary files /dev/null and b/src/main/res/drawable-nodpi/hu.png differ
diff --git a/src/main/res/drawable-nodpi/hun.png b/src/main/res/drawable-nodpi/hun.png
deleted file mode 100644
index 9e4c8e5c..00000000
Binary files a/src/main/res/drawable-nodpi/hun.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/id.png b/src/main/res/drawable-nodpi/id.png
new file mode 100644
index 00000000..c473b55d
Binary files /dev/null and b/src/main/res/drawable-nodpi/id.png differ
diff --git a/src/main/res/drawable-nodpi/ie.png b/src/main/res/drawable-nodpi/ie.png
new file mode 100644
index 00000000..1cdb87d4
Binary files /dev/null and b/src/main/res/drawable-nodpi/ie.png differ
diff --git a/src/main/res/drawable-nodpi/il.png b/src/main/res/drawable-nodpi/il.png
new file mode 100644
index 00000000..efb60f33
Binary files /dev/null and b/src/main/res/drawable-nodpi/il.png differ
diff --git a/src/main/res/drawable-nodpi/in.png b/src/main/res/drawable-nodpi/in.png
new file mode 100644
index 00000000..2e85fb7a
Binary files /dev/null and b/src/main/res/drawable-nodpi/in.png differ
diff --git a/src/main/res/drawable-nodpi/ina.png b/src/main/res/drawable-nodpi/ina.png
deleted file mode 100644
index c473b55d..00000000
Binary files a/src/main/res/drawable-nodpi/ina.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ind.png b/src/main/res/drawable-nodpi/ind.png
deleted file mode 100644
index 2e85fb7a..00000000
Binary files a/src/main/res/drawable-nodpi/ind.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/iq.png b/src/main/res/drawable-nodpi/iq.png
new file mode 100644
index 00000000..143e7090
Binary files /dev/null and b/src/main/res/drawable-nodpi/iq.png differ
diff --git a/src/main/res/drawable-nodpi/ir.png b/src/main/res/drawable-nodpi/ir.png
new file mode 100644
index 00000000..7b918e45
Binary files /dev/null and b/src/main/res/drawable-nodpi/ir.png differ
diff --git a/src/main/res/drawable-nodpi/irl.png b/src/main/res/drawable-nodpi/irl.png
deleted file mode 100644
index 1cdb87d4..00000000
Binary files a/src/main/res/drawable-nodpi/irl.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/irn.png b/src/main/res/drawable-nodpi/irn.png
deleted file mode 100644
index 7b918e45..00000000
Binary files a/src/main/res/drawable-nodpi/irn.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/irq.png b/src/main/res/drawable-nodpi/irq.png
deleted file mode 100644
index 143e7090..00000000
Binary files a/src/main/res/drawable-nodpi/irq.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/is.png b/src/main/res/drawable-nodpi/is.png
new file mode 100644
index 00000000..bc49665e
Binary files /dev/null and b/src/main/res/drawable-nodpi/is.png differ
diff --git a/src/main/res/drawable-nodpi/isl.png b/src/main/res/drawable-nodpi/isl.png
deleted file mode 100644
index bc49665e..00000000
Binary files a/src/main/res/drawable-nodpi/isl.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/isr.png b/src/main/res/drawable-nodpi/isr.png
deleted file mode 100644
index efb60f33..00000000
Binary files a/src/main/res/drawable-nodpi/isr.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/it.png b/src/main/res/drawable-nodpi/it.png
new file mode 100644
index 00000000..242cfa07
Binary files /dev/null and b/src/main/res/drawable-nodpi/it.png differ
diff --git a/src/main/res/drawable-nodpi/ita.png b/src/main/res/drawable-nodpi/ita.png
deleted file mode 100644
index 242cfa07..00000000
Binary files a/src/main/res/drawable-nodpi/ita.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/jam.png b/src/main/res/drawable-nodpi/jam.png
deleted file mode 100644
index a2150ebb..00000000
Binary files a/src/main/res/drawable-nodpi/jam.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/jap.png b/src/main/res/drawable-nodpi/jap.png
deleted file mode 100644
index 9d62511e..00000000
Binary files a/src/main/res/drawable-nodpi/jap.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/jm.png b/src/main/res/drawable-nodpi/jm.png
new file mode 100644
index 00000000..a2150ebb
Binary files /dev/null and b/src/main/res/drawable-nodpi/jm.png differ
diff --git a/src/main/res/drawable-nodpi/jo.png b/src/main/res/drawable-nodpi/jo.png
new file mode 100644
index 00000000..5bb8ab22
Binary files /dev/null and b/src/main/res/drawable-nodpi/jo.png differ
diff --git a/src/main/res/drawable-nodpi/jor.png b/src/main/res/drawable-nodpi/jor.png
deleted file mode 100644
index 5bb8ab22..00000000
Binary files a/src/main/res/drawable-nodpi/jor.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/jp.png b/src/main/res/drawable-nodpi/jp.png
new file mode 100644
index 00000000..9d62511e
Binary files /dev/null and b/src/main/res/drawable-nodpi/jp.png differ
diff --git a/src/main/res/drawable-nodpi/kaz.png b/src/main/res/drawable-nodpi/kaz.png
deleted file mode 100644
index 37899069..00000000
Binary files a/src/main/res/drawable-nodpi/kaz.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/kg.png b/src/main/res/drawable-nodpi/kg.png
new file mode 100644
index 00000000..31b5435c
Binary files /dev/null and b/src/main/res/drawable-nodpi/kg.png differ
diff --git a/src/main/res/drawable-nodpi/kor.png b/src/main/res/drawable-nodpi/kor.png
deleted file mode 100644
index ed4241f6..00000000
Binary files a/src/main/res/drawable-nodpi/kor.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/kp.png b/src/main/res/drawable-nodpi/kp.png
new file mode 100644
index 00000000..831e215e
Binary files /dev/null and b/src/main/res/drawable-nodpi/kp.png differ
diff --git a/src/main/res/drawable-nodpi/kr.png b/src/main/res/drawable-nodpi/kr.png
new file mode 100644
index 00000000..ed4241f6
Binary files /dev/null and b/src/main/res/drawable-nodpi/kr.png differ
diff --git a/src/main/res/drawable-nodpi/kuw.png b/src/main/res/drawable-nodpi/kuw.png
deleted file mode 100644
index e905c39b..00000000
Binary files a/src/main/res/drawable-nodpi/kuw.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/kw.png b/src/main/res/drawable-nodpi/kw.png
new file mode 100644
index 00000000..e905c39b
Binary files /dev/null and b/src/main/res/drawable-nodpi/kw.png differ
diff --git a/src/main/res/drawable-nodpi/kyr.png b/src/main/res/drawable-nodpi/kyr.png
deleted file mode 100644
index 31b5435c..00000000
Binary files a/src/main/res/drawable-nodpi/kyr.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/kz.png b/src/main/res/drawable-nodpi/kz.png
new file mode 100644
index 00000000..37899069
Binary files /dev/null and b/src/main/res/drawable-nodpi/kz.png differ
diff --git a/src/main/res/drawable-nodpi/la.png b/src/main/res/drawable-nodpi/la.png
new file mode 100644
index 00000000..d9ec7fbe
Binary files /dev/null and b/src/main/res/drawable-nodpi/la.png differ
diff --git a/src/main/res/drawable-nodpi/lao.png b/src/main/res/drawable-nodpi/lao.png
deleted file mode 100644
index d9ec7fbe..00000000
Binary files a/src/main/res/drawable-nodpi/lao.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/lat.png b/src/main/res/drawable-nodpi/lat.png
deleted file mode 100644
index d79dff14..00000000
Binary files a/src/main/res/drawable-nodpi/lat.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/lb.png b/src/main/res/drawable-nodpi/lb.png
new file mode 100644
index 00000000..300bd007
Binary files /dev/null and b/src/main/res/drawable-nodpi/lb.png differ
diff --git a/src/main/res/drawable-nodpi/leb.png b/src/main/res/drawable-nodpi/leb.png
deleted file mode 100644
index 300bd007..00000000
Binary files a/src/main/res/drawable-nodpi/leb.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/li.png b/src/main/res/drawable-nodpi/li.png
new file mode 100644
index 00000000..b7a8afbd
Binary files /dev/null and b/src/main/res/drawable-nodpi/li.png differ
diff --git a/src/main/res/drawable-nodpi/lib.png b/src/main/res/drawable-nodpi/lib.png
deleted file mode 100644
index a7e0ef8a..00000000
Binary files a/src/main/res/drawable-nodpi/lib.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/lie.png b/src/main/res/drawable-nodpi/lie.png
deleted file mode 100644
index b7a8afbd..00000000
Binary files a/src/main/res/drawable-nodpi/lie.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/lit.png b/src/main/res/drawable-nodpi/lit.png
deleted file mode 100644
index de10c6d2..00000000
Binary files a/src/main/res/drawable-nodpi/lit.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/lk.png b/src/main/res/drawable-nodpi/lk.png
new file mode 100644
index 00000000..950d4a42
Binary files /dev/null and b/src/main/res/drawable-nodpi/lk.png differ
diff --git a/src/main/res/drawable-nodpi/lt.png b/src/main/res/drawable-nodpi/lt.png
new file mode 100644
index 00000000..de10c6d2
Binary files /dev/null and b/src/main/res/drawable-nodpi/lt.png differ
diff --git a/src/main/res/drawable-nodpi/lu.png b/src/main/res/drawable-nodpi/lu.png
new file mode 100644
index 00000000..13228518
Binary files /dev/null and b/src/main/res/drawable-nodpi/lu.png differ
diff --git a/src/main/res/drawable-nodpi/lux.png b/src/main/res/drawable-nodpi/lux.png
deleted file mode 100644
index 13228518..00000000
Binary files a/src/main/res/drawable-nodpi/lux.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/lv.png b/src/main/res/drawable-nodpi/lv.png
new file mode 100644
index 00000000..d79dff14
Binary files /dev/null and b/src/main/res/drawable-nodpi/lv.png differ
diff --git a/src/main/res/drawable-nodpi/ly.png b/src/main/res/drawable-nodpi/ly.png
new file mode 100644
index 00000000..a7e0ef8a
Binary files /dev/null and b/src/main/res/drawable-nodpi/ly.png differ
diff --git a/src/main/res/drawable-nodpi/ma.png b/src/main/res/drawable-nodpi/ma.png
new file mode 100644
index 00000000..dd18c3da
Binary files /dev/null and b/src/main/res/drawable-nodpi/ma.png differ
diff --git a/src/main/res/drawable-nodpi/mac.png b/src/main/res/drawable-nodpi/mac.png
deleted file mode 100644
index db45de8b..00000000
Binary files a/src/main/res/drawable-nodpi/mac.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/mal.png b/src/main/res/drawable-nodpi/mal.png
deleted file mode 100644
index 3fad4410..00000000
Binary files a/src/main/res/drawable-nodpi/mal.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/mc.png b/src/main/res/drawable-nodpi/mc.png
new file mode 100644
index 00000000..c473b55d
Binary files /dev/null and b/src/main/res/drawable-nodpi/mc.png differ
diff --git a/src/main/res/drawable-nodpi/mco.png b/src/main/res/drawable-nodpi/mco.png
deleted file mode 100644
index c473b55d..00000000
Binary files a/src/main/res/drawable-nodpi/mco.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/md.png b/src/main/res/drawable-nodpi/md.png
new file mode 100644
index 00000000..1edfc892
Binary files /dev/null and b/src/main/res/drawable-nodpi/md.png differ
diff --git a/src/main/res/drawable-nodpi/mda.png b/src/main/res/drawable-nodpi/mda.png
deleted file mode 100644
index 1edfc892..00000000
Binary files a/src/main/res/drawable-nodpi/mda.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/me.png b/src/main/res/drawable-nodpi/me.png
new file mode 100644
index 00000000..87f9bcf8
Binary files /dev/null and b/src/main/res/drawable-nodpi/me.png differ
diff --git a/src/main/res/drawable-nodpi/mex.png b/src/main/res/drawable-nodpi/mex.png
deleted file mode 100644
index 4872e99f..00000000
Binary files a/src/main/res/drawable-nodpi/mex.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/miq.png b/src/main/res/drawable-nodpi/miq.png
deleted file mode 100644
index 06570ca4..00000000
Binary files a/src/main/res/drawable-nodpi/miq.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/mk.png b/src/main/res/drawable-nodpi/mk.png
new file mode 100644
index 00000000..a59c3233
Binary files /dev/null and b/src/main/res/drawable-nodpi/mk.png differ
diff --git a/src/main/res/drawable-nodpi/mld.png b/src/main/res/drawable-nodpi/mld.png
deleted file mode 100644
index 7f004fc7..00000000
Binary files a/src/main/res/drawable-nodpi/mld.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/mly.png b/src/main/res/drawable-nodpi/mly.png
deleted file mode 100644
index f9ea8b2f..00000000
Binary files a/src/main/res/drawable-nodpi/mly.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/mm.png b/src/main/res/drawable-nodpi/mm.png
new file mode 100644
index 00000000..09ccebdc
Binary files /dev/null and b/src/main/res/drawable-nodpi/mm.png differ
diff --git a/src/main/res/drawable-nodpi/mn.png b/src/main/res/drawable-nodpi/mn.png
new file mode 100644
index 00000000..2fd1ae71
Binary files /dev/null and b/src/main/res/drawable-nodpi/mn.png differ
diff --git a/src/main/res/drawable-nodpi/mna.png b/src/main/res/drawable-nodpi/mna.png
deleted file mode 100644
index a59c3233..00000000
Binary files a/src/main/res/drawable-nodpi/mna.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/mnt.png b/src/main/res/drawable-nodpi/mnt.png
deleted file mode 100644
index 87f9bcf8..00000000
Binary files a/src/main/res/drawable-nodpi/mnt.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/mo.png b/src/main/res/drawable-nodpi/mo.png
new file mode 100644
index 00000000..db45de8b
Binary files /dev/null and b/src/main/res/drawable-nodpi/mo.png differ
diff --git a/src/main/res/drawable-nodpi/mon.png b/src/main/res/drawable-nodpi/mon.png
deleted file mode 100644
index 2fd1ae71..00000000
Binary files a/src/main/res/drawable-nodpi/mon.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/mor.png b/src/main/res/drawable-nodpi/mor.png
deleted file mode 100644
index dd18c3da..00000000
Binary files a/src/main/res/drawable-nodpi/mor.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/mt.png b/src/main/res/drawable-nodpi/mt.png
new file mode 100644
index 00000000..3fad4410
Binary files /dev/null and b/src/main/res/drawable-nodpi/mt.png differ
diff --git a/src/main/res/drawable-nodpi/mv.png b/src/main/res/drawable-nodpi/mv.png
new file mode 100644
index 00000000..7f004fc7
Binary files /dev/null and b/src/main/res/drawable-nodpi/mv.png differ
diff --git a/src/main/res/drawable-nodpi/mx.png b/src/main/res/drawable-nodpi/mx.png
new file mode 100644
index 00000000..4872e99f
Binary files /dev/null and b/src/main/res/drawable-nodpi/mx.png differ
diff --git a/src/main/res/drawable-nodpi/my.png b/src/main/res/drawable-nodpi/my.png
new file mode 100644
index 00000000..f9ea8b2f
Binary files /dev/null and b/src/main/res/drawable-nodpi/my.png differ
diff --git a/src/main/res/drawable-nodpi/ned.png b/src/main/res/drawable-nodpi/ned.png
deleted file mode 100644
index c057a4b6..00000000
Binary files a/src/main/res/drawable-nodpi/ned.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/nep.png b/src/main/res/drawable-nodpi/nep.png
deleted file mode 100644
index df7ee60d..00000000
Binary files a/src/main/res/drawable-nodpi/nep.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ng.png b/src/main/res/drawable-nodpi/ng.png
new file mode 100644
index 00000000..bba41ff8
Binary files /dev/null and b/src/main/res/drawable-nodpi/ng.png differ
diff --git a/src/main/res/drawable-nodpi/ni.png b/src/main/res/drawable-nodpi/ni.png
new file mode 100644
index 00000000..b5092259
Binary files /dev/null and b/src/main/res/drawable-nodpi/ni.png differ
diff --git a/src/main/res/drawable-nodpi/nic.png b/src/main/res/drawable-nodpi/nic.png
deleted file mode 100644
index b5092259..00000000
Binary files a/src/main/res/drawable-nodpi/nic.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/nig.png b/src/main/res/drawable-nodpi/nig.png
deleted file mode 100644
index bba41ff8..00000000
Binary files a/src/main/res/drawable-nodpi/nig.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/nl.png b/src/main/res/drawable-nodpi/nl.png
new file mode 100644
index 00000000..c057a4b6
Binary files /dev/null and b/src/main/res/drawable-nodpi/nl.png differ
diff --git a/src/main/res/drawable-nodpi/no.png b/src/main/res/drawable-nodpi/no.png
new file mode 100644
index 00000000..5812bcb4
Binary files /dev/null and b/src/main/res/drawable-nodpi/no.png differ
diff --git a/src/main/res/drawable-nodpi/nor.png b/src/main/res/drawable-nodpi/nor.png
deleted file mode 100644
index 5812bcb4..00000000
Binary files a/src/main/res/drawable-nodpi/nor.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/np.png b/src/main/res/drawable-nodpi/np.png
new file mode 100644
index 00000000..df7ee60d
Binary files /dev/null and b/src/main/res/drawable-nodpi/np.png differ
diff --git a/src/main/res/drawable-nodpi/om.png b/src/main/res/drawable-nodpi/om.png
new file mode 100644
index 00000000..c9eb8c6f
Binary files /dev/null and b/src/main/res/drawable-nodpi/om.png differ
diff --git a/src/main/res/drawable-nodpi/omn.png b/src/main/res/drawable-nodpi/omn.png
deleted file mode 100644
index c9eb8c6f..00000000
Binary files a/src/main/res/drawable-nodpi/omn.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/pa.png b/src/main/res/drawable-nodpi/pa.png
new file mode 100644
index 00000000..2ad76338
Binary files /dev/null and b/src/main/res/drawable-nodpi/pa.png differ
diff --git a/src/main/res/drawable-nodpi/pak.png b/src/main/res/drawable-nodpi/pak.png
deleted file mode 100644
index cd5f87b5..00000000
Binary files a/src/main/res/drawable-nodpi/pak.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/pan.png b/src/main/res/drawable-nodpi/pan.png
deleted file mode 100644
index 2ad76338..00000000
Binary files a/src/main/res/drawable-nodpi/pan.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/pap.png b/src/main/res/drawable-nodpi/pap.png
deleted file mode 100644
index 85eb3163..00000000
Binary files a/src/main/res/drawable-nodpi/pap.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/par.png b/src/main/res/drawable-nodpi/par.png
deleted file mode 100644
index f9c955e4..00000000
Binary files a/src/main/res/drawable-nodpi/par.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/pe.png b/src/main/res/drawable-nodpi/pe.png
new file mode 100644
index 00000000..e8269e6b
Binary files /dev/null and b/src/main/res/drawable-nodpi/pe.png differ
diff --git a/src/main/res/drawable-nodpi/per.png b/src/main/res/drawable-nodpi/per.png
deleted file mode 100644
index e8269e6b..00000000
Binary files a/src/main/res/drawable-nodpi/per.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/pg.png b/src/main/res/drawable-nodpi/pg.png
new file mode 100644
index 00000000..85eb3163
Binary files /dev/null and b/src/main/res/drawable-nodpi/pg.png differ
diff --git a/src/main/res/drawable-nodpi/ph.png b/src/main/res/drawable-nodpi/ph.png
new file mode 100644
index 00000000..92c88363
Binary files /dev/null and b/src/main/res/drawable-nodpi/ph.png differ
diff --git a/src/main/res/drawable-nodpi/phi.png b/src/main/res/drawable-nodpi/phi.png
deleted file mode 100644
index 92c88363..00000000
Binary files a/src/main/res/drawable-nodpi/phi.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/pk.png b/src/main/res/drawable-nodpi/pk.png
new file mode 100644
index 00000000..cd5f87b5
Binary files /dev/null and b/src/main/res/drawable-nodpi/pk.png differ
diff --git a/src/main/res/drawable-nodpi/pl.png b/src/main/res/drawable-nodpi/pl.png
new file mode 100644
index 00000000..f2fc06c5
Binary files /dev/null and b/src/main/res/drawable-nodpi/pl.png differ
diff --git a/src/main/res/drawable-nodpi/pm.png b/src/main/res/drawable-nodpi/pm.png
new file mode 100644
index 00000000..06570ca4
Binary files /dev/null and b/src/main/res/drawable-nodpi/pm.png differ
diff --git a/src/main/res/drawable-nodpi/pol.png b/src/main/res/drawable-nodpi/pol.png
deleted file mode 100644
index f2fc06c5..00000000
Binary files a/src/main/res/drawable-nodpi/pol.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/por.png b/src/main/res/drawable-nodpi/por.png
deleted file mode 100644
index ca3a57a9..00000000
Binary files a/src/main/res/drawable-nodpi/por.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/prk.png b/src/main/res/drawable-nodpi/prk.png
deleted file mode 100644
index 831e215e..00000000
Binary files a/src/main/res/drawable-nodpi/prk.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/pt.png b/src/main/res/drawable-nodpi/pt.png
new file mode 100644
index 00000000..ca3a57a9
Binary files /dev/null and b/src/main/res/drawable-nodpi/pt.png differ
diff --git a/src/main/res/drawable-nodpi/py.png b/src/main/res/drawable-nodpi/py.png
new file mode 100644
index 00000000..f9c955e4
Binary files /dev/null and b/src/main/res/drawable-nodpi/py.png differ
diff --git a/src/main/res/drawable-nodpi/qat.png b/src/main/res/drawable-nodpi/qat.png
deleted file mode 100644
index 703c38b2..00000000
Binary files a/src/main/res/drawable-nodpi/qat.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/qq.png b/src/main/res/drawable-nodpi/qq.png
new file mode 100644
index 00000000..703c38b2
Binary files /dev/null and b/src/main/res/drawable-nodpi/qq.png differ
diff --git a/src/main/res/drawable-nodpi/ro.png b/src/main/res/drawable-nodpi/ro.png
new file mode 100644
index 00000000..8775c935
Binary files /dev/null and b/src/main/res/drawable-nodpi/ro.png differ
diff --git a/src/main/res/drawable-nodpi/rom.png b/src/main/res/drawable-nodpi/rom.png
deleted file mode 100644
index 8775c935..00000000
Binary files a/src/main/res/drawable-nodpi/rom.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/rs.png b/src/main/res/drawable-nodpi/rs.png
new file mode 100644
index 00000000..75834130
Binary files /dev/null and b/src/main/res/drawable-nodpi/rs.png differ
diff --git a/src/main/res/drawable-nodpi/ru.png b/src/main/res/drawable-nodpi/ru.png
new file mode 100644
index 00000000..b1291206
Binary files /dev/null and b/src/main/res/drawable-nodpi/ru.png differ
diff --git a/src/main/res/drawable-nodpi/rus.png b/src/main/res/drawable-nodpi/rus.png
deleted file mode 100644
index b1291206..00000000
Binary files a/src/main/res/drawable-nodpi/rus.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/sa.png b/src/main/res/drawable-nodpi/sa.png
new file mode 100644
index 00000000..2e71ddd5
Binary files /dev/null and b/src/main/res/drawable-nodpi/sa.png differ
diff --git a/src/main/res/drawable-nodpi/sal.png b/src/main/res/drawable-nodpi/sal.png
deleted file mode 100644
index 2b041420..00000000
Binary files a/src/main/res/drawable-nodpi/sal.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/sar.png b/src/main/res/drawable-nodpi/sar.png
deleted file mode 100644
index 2e71ddd5..00000000
Binary files a/src/main/res/drawable-nodpi/sar.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/se.png b/src/main/res/drawable-nodpi/se.png
new file mode 100644
index 00000000..02d667b7
Binary files /dev/null and b/src/main/res/drawable-nodpi/se.png differ
diff --git a/src/main/res/drawable-nodpi/sg.png b/src/main/res/drawable-nodpi/sg.png
new file mode 100644
index 00000000..03d7458f
Binary files /dev/null and b/src/main/res/drawable-nodpi/sg.png differ
diff --git a/src/main/res/drawable-nodpi/si.png b/src/main/res/drawable-nodpi/si.png
new file mode 100644
index 00000000..02cd892d
Binary files /dev/null and b/src/main/res/drawable-nodpi/si.png differ
diff --git a/src/main/res/drawable-nodpi/sin.png b/src/main/res/drawable-nodpi/sin.png
deleted file mode 100644
index 03d7458f..00000000
Binary files a/src/main/res/drawable-nodpi/sin.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/sk.png b/src/main/res/drawable-nodpi/sk.png
new file mode 100644
index 00000000..a67d1be9
Binary files /dev/null and b/src/main/res/drawable-nodpi/sk.png differ
diff --git a/src/main/res/drawable-nodpi/slo.png b/src/main/res/drawable-nodpi/slo.png
deleted file mode 100644
index 02cd892d..00000000
Binary files a/src/main/res/drawable-nodpi/slo.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/sm.png b/src/main/res/drawable-nodpi/sm.png
new file mode 100644
index 00000000..11729e67
Binary files /dev/null and b/src/main/res/drawable-nodpi/sm.png differ
diff --git a/src/main/res/drawable-nodpi/sma.png b/src/main/res/drawable-nodpi/sma.png
deleted file mode 100644
index 11729e67..00000000
Binary files a/src/main/res/drawable-nodpi/sma.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/sr.png b/src/main/res/drawable-nodpi/sr.png
new file mode 100644
index 00000000..db84bbd6
Binary files /dev/null and b/src/main/res/drawable-nodpi/sr.png differ
diff --git a/src/main/res/drawable-nodpi/srb.png b/src/main/res/drawable-nodpi/srb.png
deleted file mode 100644
index 75834130..00000000
Binary files a/src/main/res/drawable-nodpi/srb.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/sur.png b/src/main/res/drawable-nodpi/sur.png
deleted file mode 100644
index db84bbd6..00000000
Binary files a/src/main/res/drawable-nodpi/sur.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/sv.png b/src/main/res/drawable-nodpi/sv.png
new file mode 100644
index 00000000..2b041420
Binary files /dev/null and b/src/main/res/drawable-nodpi/sv.png differ
diff --git a/src/main/res/drawable-nodpi/svk.png b/src/main/res/drawable-nodpi/svk.png
deleted file mode 100644
index a67d1be9..00000000
Binary files a/src/main/res/drawable-nodpi/svk.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/swe.png b/src/main/res/drawable-nodpi/swe.png
deleted file mode 100644
index 02d667b7..00000000
Binary files a/src/main/res/drawable-nodpi/swe.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/swi.png b/src/main/res/drawable-nodpi/swi.png
deleted file mode 100644
index 0820cacf..00000000
Binary files a/src/main/res/drawable-nodpi/swi.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/sy.png b/src/main/res/drawable-nodpi/sy.png
new file mode 100644
index 00000000..fa6d0ee0
Binary files /dev/null and b/src/main/res/drawable-nodpi/sy.png differ
diff --git a/src/main/res/drawable-nodpi/syr.png b/src/main/res/drawable-nodpi/syr.png
deleted file mode 100644
index fa6d0ee0..00000000
Binary files a/src/main/res/drawable-nodpi/syr.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/th.png b/src/main/res/drawable-nodpi/th.png
new file mode 100644
index 00000000..969ee5da
Binary files /dev/null and b/src/main/res/drawable-nodpi/th.png differ
diff --git a/src/main/res/drawable-nodpi/tha.png b/src/main/res/drawable-nodpi/tha.png
deleted file mode 100644
index 969ee5da..00000000
Binary files a/src/main/res/drawable-nodpi/tha.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/tj.png b/src/main/res/drawable-nodpi/tj.png
new file mode 100644
index 00000000..41af7288
Binary files /dev/null and b/src/main/res/drawable-nodpi/tj.png differ
diff --git a/src/main/res/drawable-nodpi/tjk.png b/src/main/res/drawable-nodpi/tjk.png
deleted file mode 100644
index 41af7288..00000000
Binary files a/src/main/res/drawable-nodpi/tjk.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/tkm.png b/src/main/res/drawable-nodpi/tkm.png
deleted file mode 100644
index 43084817..00000000
Binary files a/src/main/res/drawable-nodpi/tkm.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/tm.png b/src/main/res/drawable-nodpi/tm.png
new file mode 100644
index 00000000..43084817
Binary files /dev/null and b/src/main/res/drawable-nodpi/tm.png differ
diff --git a/src/main/res/drawable-nodpi/tn.png b/src/main/res/drawable-nodpi/tn.png
new file mode 100644
index 00000000..1f21d35d
Binary files /dev/null and b/src/main/res/drawable-nodpi/tn.png differ
diff --git a/src/main/res/drawable-nodpi/tr.png b/src/main/res/drawable-nodpi/tr.png
new file mode 100644
index 00000000..5f4c4d89
Binary files /dev/null and b/src/main/res/drawable-nodpi/tr.png differ
diff --git a/src/main/res/drawable-nodpi/tun.png b/src/main/res/drawable-nodpi/tun.png
deleted file mode 100644
index 1f21d35d..00000000
Binary files a/src/main/res/drawable-nodpi/tun.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/tur.png b/src/main/res/drawable-nodpi/tur.png
deleted file mode 100644
index 5f4c4d89..00000000
Binary files a/src/main/res/drawable-nodpi/tur.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/tw.png b/src/main/res/drawable-nodpi/tw.png
new file mode 100644
index 00000000..09ca3687
Binary files /dev/null and b/src/main/res/drawable-nodpi/tw.png differ
diff --git a/src/main/res/drawable-nodpi/twn.png b/src/main/res/drawable-nodpi/twn.png
deleted file mode 100644
index 09ca3687..00000000
Binary files a/src/main/res/drawable-nodpi/twn.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ua.png b/src/main/res/drawable-nodpi/ua.png
new file mode 100644
index 00000000..22f0ccc2
Binary files /dev/null and b/src/main/res/drawable-nodpi/ua.png differ
diff --git a/src/main/res/drawable-nodpi/uae.png b/src/main/res/drawable-nodpi/uae.png
deleted file mode 100644
index f9e73ee1..00000000
Binary files a/src/main/res/drawable-nodpi/uae.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/uk.png b/src/main/res/drawable-nodpi/uk.png
deleted file mode 100644
index 4a6a762c..00000000
Binary files a/src/main/res/drawable-nodpi/uk.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ukr.png b/src/main/res/drawable-nodpi/ukr.png
deleted file mode 100644
index 22f0ccc2..00000000
Binary files a/src/main/res/drawable-nodpi/ukr.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/un.png b/src/main/res/drawable-nodpi/un.png
new file mode 100644
index 00000000..e7efd949
Binary files /dev/null and b/src/main/res/drawable-nodpi/un.png differ
diff --git a/src/main/res/drawable-nodpi/unk.png b/src/main/res/drawable-nodpi/unk.png
deleted file mode 100644
index e7efd949..00000000
Binary files a/src/main/res/drawable-nodpi/unk.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/uru.png b/src/main/res/drawable-nodpi/uru.png
deleted file mode 100644
index a4e637a2..00000000
Binary files a/src/main/res/drawable-nodpi/uru.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/us.png b/src/main/res/drawable-nodpi/us.png
new file mode 100644
index 00000000..10f433df
Binary files /dev/null and b/src/main/res/drawable-nodpi/us.png differ
diff --git a/src/main/res/drawable-nodpi/usa.png b/src/main/res/drawable-nodpi/usa.png
deleted file mode 100644
index 10f433df..00000000
Binary files a/src/main/res/drawable-nodpi/usa.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/uy.png b/src/main/res/drawable-nodpi/uy.png
new file mode 100644
index 00000000..a4e637a2
Binary files /dev/null and b/src/main/res/drawable-nodpi/uy.png differ
diff --git a/src/main/res/drawable-nodpi/uz.png b/src/main/res/drawable-nodpi/uz.png
new file mode 100644
index 00000000..c9363259
Binary files /dev/null and b/src/main/res/drawable-nodpi/uz.png differ
diff --git a/src/main/res/drawable-nodpi/uzb.png b/src/main/res/drawable-nodpi/uzb.png
deleted file mode 100644
index c9363259..00000000
Binary files a/src/main/res/drawable-nodpi/uzb.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ve.png b/src/main/res/drawable-nodpi/ve.png
new file mode 100644
index 00000000..0a9232d0
Binary files /dev/null and b/src/main/res/drawable-nodpi/ve.png differ
diff --git a/src/main/res/drawable-nodpi/ven.png b/src/main/res/drawable-nodpi/ven.png
deleted file mode 100644
index 0a9232d0..00000000
Binary files a/src/main/res/drawable-nodpi/ven.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/vie.png b/src/main/res/drawable-nodpi/vie.png
deleted file mode 100644
index 1256e365..00000000
Binary files a/src/main/res/drawable-nodpi/vie.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/vn.png b/src/main/res/drawable-nodpi/vn.png
new file mode 100644
index 00000000..1256e365
Binary files /dev/null and b/src/main/res/drawable-nodpi/vn.png differ
diff --git a/src/main/res/drawable-nodpi/ye.png b/src/main/res/drawable-nodpi/ye.png
new file mode 100644
index 00000000..0b23f0ad
Binary files /dev/null and b/src/main/res/drawable-nodpi/ye.png differ
diff --git a/src/main/res/drawable-nodpi/yem.png b/src/main/res/drawable-nodpi/yem.png
deleted file mode 100644
index 0b23f0ad..00000000
Binary files a/src/main/res/drawable-nodpi/yem.png and /dev/null differ
diff --git a/src/main/res/raw/pyraminx.png b/src/main/res/raw/pyraminx.png
deleted file mode 100644
index a39bd01c..00000000
Binary files a/src/main/res/raw/pyraminx.png and /dev/null differ