commit 61aa85e4de91a3b5b28c52a457cd245ab35c155b
Author: Leszek Koltunski <leszek@koltunski.pl>
Date:   Fri Oct 1 16:31:40 2021 +0200

    Simplify ObjectList: now there's just one object per size.

diff --git a/src/main/java/org/distorted/objectlib/main/ObjectList.java b/src/main/java/org/distorted/objectlib/main/ObjectList.java
index c492d386..09bee804 100644
--- a/src/main/java/org/distorted/objectlib/main/ObjectList.java
+++ b/src/main/java/org/distorted/objectlib/main/ObjectList.java
@@ -19,44 +19,6 @@
 
 package org.distorted.objectlib.main;
 
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-/*
-  CUBE_2 ( 0, new int[] {2 , 12, 12, R.raw.cube2, R.drawable.ui_small_cube2, R.drawable.ui_medium_cube2, R.drawable.ui_big_cube2, R.drawable.ui_huge_cube2} ),
-  CUBE_3 ( 0, new int[] {3 , 16, 17, R.raw.cube3, R.drawable.ui_small_cube3, R.drawable.ui_medium_cube3, R.drawable.ui_big_cube3, R.drawable.ui_huge_cube3} ),
-  CUBE_4 ( 0, new int[] {4 , 20, 24, R.raw.cube4, R.drawable.ui_small_cube4, R.drawable.ui_medium_cube4, R.drawable.ui_big_cube4, R.drawable.ui_huge_cube4} ),
-  CUBE_5 ( 0, new int[] {5 , 24, 28, R.raw.cube5, R.drawable.ui_small_cube5, R.drawable.ui_medium_cube5, R.drawable.ui_big_cube5, R.drawable.ui_huge_cube5} ),
-  JING_2 ( 1, new int[] {2 , 11, 11, R.raw.jing , R.drawable.ui_small_jing2, R.drawable.ui_medium_jing2, R.drawable.ui_big_jing2, R.drawable.ui_huge_jing2} ),
-  PYRA_3 ( 1, new int[] {3 , 10, 10, R.raw.pyra3, R.drawable.ui_small_pyra3, R.drawable.ui_medium_pyra3, R.drawable.ui_big_pyra3, R.drawable.ui_huge_pyra3} ),
-  PYRA_4 ( 1, new int[] {4 , 14, 17, R.raw.pyra4, R.drawable.ui_small_pyra4, R.drawable.ui_medium_pyra4, R.drawable.ui_big_pyra4, R.drawable.ui_huge_pyra4} ),
-  PYRA_5 ( 1, new int[] {5 , 20, 23, R.raw.pyra5, R.drawable.ui_small_pyra5, R.drawable.ui_medium_pyra5, R.drawable.ui_big_pyra5, R.drawable.ui_huge_pyra5} ),
-  KILO_3 ( 2, new int[] {3 , 18, 18, R.raw.kilo3, R.drawable.ui_small_kilo3, R.drawable.ui_medium_kilo3, R.drawable.ui_big_kilo3, R.drawable.ui_huge_kilo3} ),
-  KILO_5 ( 2, new int[] {5 , 33, 33, R.raw.kilo5, R.drawable.ui_small_kilo5, R.drawable.ui_medium_kilo5, R.drawable.ui_big_kilo5, R.drawable.ui_huge_kilo5} ),
-  MEGA_3 ( 2, new int[] {3 , 21, 21, R.raw.mega3, R.drawable.ui_small_mega3, R.drawable.ui_medium_mega3, R.drawable.ui_big_mega3, R.drawable.ui_huge_mega3} ),
-  MEGA_5 ( 2, new int[] {5 , 35, 37, R.raw.mega5, R.drawable.ui_small_mega5, R.drawable.ui_medium_mega5, R.drawable.ui_big_mega5, R.drawable.ui_huge_mega5} ),
-  ULTI_2 ( 3, new int[] {2 , 18, 18, R.raw.ulti , R.drawable.ui_small_ulti , R.drawable.ui_medium_ulti , R.drawable.ui_big_ulti , R.drawable.ui_huge_ulti } ),
-  DIAM_2 ( 3, new int[] {2 , 10, 12, R.raw.diam2, R.drawable.ui_small_diam2, R.drawable.ui_medium_diam2, R.drawable.ui_big_diam2, R.drawable.ui_huge_diam2} ),
-  DIAM_3 ( 3, new int[] {3 , 18, 24, R.raw.diam3, R.drawable.ui_small_diam3, R.drawable.ui_medium_diam3, R.drawable.ui_big_diam3, R.drawable.ui_huge_diam3} ),
-  DIAM_4 ( 3, new int[] {4 , 32, 32, R.raw.diam4, R.drawable.ui_small_diam4, R.drawable.ui_medium_diam4, R.drawable.ui_big_diam4, R.drawable.ui_huge_diam4} ),
-  DINO_3 ( 4, new int[] {3 , 10, 10, R.raw.dino , R.drawable.ui_small_dino , R.drawable.ui_medium_dino , R.drawable.ui_big_dino , R.drawable.ui_huge_dino } ),
-  DIN4_3 ( 4, new int[] {3 ,  7,  7, R.raw.dino , R.drawable.ui_small_din4 , R.drawable.ui_medium_din4 , R.drawable.ui_big_din4 , R.drawable.ui_huge_din4 } ),
-  REDI_3 ( 4, new int[] {3 , 14, 16, R.raw.redi , R.drawable.ui_small_redi , R.drawable.ui_medium_redi , R.drawable.ui_big_redi , R.drawable.ui_huge_redi } ),
-  HELI_3 ( 4, new int[] {3 , 18, 20, R.raw.heli , R.drawable.ui_small_heli , R.drawable.ui_medium_heli , R.drawable.ui_big_heli , R.drawable.ui_huge_heli } ),
-  SKEW_2 ( 5, new int[] {2 , 11, 11, R.raw.skew2, R.drawable.ui_small_skew2, R.drawable.ui_medium_skew2, R.drawable.ui_big_skew2, R.drawable.ui_huge_skew2} ),
-  SKEW_3 ( 5, new int[] {3 , 17, 21, R.raw.skew3, R.drawable.ui_small_skew3, R.drawable.ui_medium_skew3, R.drawable.ui_big_skew3, R.drawable.ui_huge_skew3} ),
-  IVY_2  ( 5, new int[] {2 ,  8,  8, R.raw.ivy  , R.drawable.ui_small_ivy  , R.drawable.ui_medium_ivy  , R.drawable.ui_big_ivy  , R.drawable.ui_huge_ivy  } ),
-  REX_3  ( 5, new int[] {3 , 16, 19, R.raw.rex  , R.drawable.ui_small_rex  , R.drawable.ui_medium_rex  , R.drawable.ui_big_rex  , R.drawable.ui_huge_rex  } ),
-  BAN1_3 ( 6, new int[] {3 , 16, 16, R.raw.ban1 , R.drawable.ui_small_ban1 , R.drawable.ui_medium_ban1 , R.drawable.ui_big_ban1 , R.drawable.ui_huge_ban1 } ),
-  BAN2_3 ( 6, new int[] {3 , 16, 16, R.raw.ban2 , R.drawable.ui_small_ban2 , R.drawable.ui_medium_ban2 , R.drawable.ui_big_ban2 , R.drawable.ui_huge_ban2 } ),
-  BAN3_3 ( 6, new int[] {3 , 16, 16, R.raw.ban3 , R.drawable.ui_small_ban3 , R.drawable.ui_medium_ban3 , R.drawable.ui_big_ban3 , R.drawable.ui_huge_ban3 } ),
-  BAN4_3 ( 6, new int[] {3 , 16, 16, R.raw.ban4 , R.drawable.ui_small_ban4 , R.drawable.ui_medium_ban4 , R.drawable.ui_big_ban4 , R.drawable.ui_huge_ban4 } ),
-  SQU1_3 ( 7, new int[] {3 , 24, 24, R.raw.squa1, R.drawable.ui_small_squa1, R.drawable.ui_medium_squa1, R.drawable.ui_big_squa1, R.drawable.ui_huge_squa1} ),
-  SQU2_3 ( 7, new int[] {3 , 24, 24, R.raw.squa2, R.drawable.ui_small_squa2, R.drawable.ui_medium_squa2, R.drawable.ui_big_squa2, R.drawable.ui_huge_squa2} ),
-  MIRR_2 ( 7, new int[] {2 , 12, 12, R.raw.mirr2, R.drawable.ui_small_mirr2, R.drawable.ui_medium_mirr2, R.drawable.ui_big_mirr2, R.drawable.ui_huge_mirr2} ),
-  MIRR_3 ( 7, new int[] {3 , 16, 17, R.raw.mirr3, R.drawable.ui_small_mirr3, R.drawable.ui_medium_mirr3, R.drawable.ui_big_mirr3, R.drawable.ui_huge_mirr3} ),
-  ;
-*/
-
 import android.content.res.Resources;
 
 import org.distorted.library.main.DistortedEffects;
@@ -86,210 +48,73 @@ import org.distorted.objectlib.objects.TwistySquare1;
 import org.distorted.objectlib.objects.TwistySquare2;
 import org.distorted.objectlib.objects.TwistyUltimate;
 
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
 public enum ObjectList
   {
-  ///////////////////// Size // DB Level // NumScrambles // Mesh // small icon // medium icon // big icon // huge icon
-
-  CUBE (
-         new int[][] {
-                       {2 , 12, 12, R.drawable.ui_small_cube2, R.drawable.ui_medium_cube2, R.drawable.ui_big_cube2, R.drawable.ui_huge_cube2} ,
-                       {3 , 16, 17, R.drawable.ui_small_cube3, R.drawable.ui_medium_cube3, R.drawable.ui_big_cube3, R.drawable.ui_huge_cube3} ,
-                       {4 , 20, 24, R.drawable.ui_small_cube4, R.drawable.ui_medium_cube4, R.drawable.ui_big_cube4, R.drawable.ui_huge_cube4} ,
-                       {5 , 24, 28, R.drawable.ui_small_cube5, R.drawable.ui_medium_cube5, R.drawable.ui_big_cube5, R.drawable.ui_huge_cube5}
-                     },
-         0
-       ),
-
-  JING (
-         new int[][] {
-                       {2 , 11, 11, R.drawable.ui_small_jing2, R.drawable.ui_medium_jing2, R.drawable.ui_big_jing2, R.drawable.ui_huge_jing2} ,
-                     },
-         1
-       ),
-
-  PYRA (
-         new int[][] {
-                       {3 , 10, 10, R.drawable.ui_small_pyra3, R.drawable.ui_medium_pyra3, R.drawable.ui_big_pyra3, R.drawable.ui_huge_pyra3} ,
-                       {4 , 15, 17, R.drawable.ui_small_pyra4, R.drawable.ui_medium_pyra4, R.drawable.ui_big_pyra4, R.drawable.ui_huge_pyra4} ,
-                       {5 , 20, 23, R.drawable.ui_small_pyra5, R.drawable.ui_medium_pyra5, R.drawable.ui_big_pyra5, R.drawable.ui_huge_pyra5}
-                     },
-         1
-       ),
-
-  KILO (
-         new int[][] {
-                       {3 , 18, 18, R.drawable.ui_small_kilo3, R.drawable.ui_medium_kilo3, R.drawable.ui_big_kilo3, R.drawable.ui_huge_kilo3} ,
-                       {5 , 33, 33, R.drawable.ui_small_kilo5, R.drawable.ui_medium_kilo5, R.drawable.ui_big_kilo5, R.drawable.ui_huge_kilo5} ,
-                     },
-         2
-       ),
-
-  MEGA (
-         new int[][] {
-                       {3 , 21, 21, R.drawable.ui_small_mega3, R.drawable.ui_medium_mega3, R.drawable.ui_big_mega3, R.drawable.ui_huge_mega3} ,
-                       {5 , 35, 37, R.drawable.ui_small_mega5, R.drawable.ui_medium_mega5, R.drawable.ui_big_mega5, R.drawable.ui_huge_mega5} ,
-                     },
-         2
-       ),
-
-  ULTI (
-         new int[][] {
-                       {2 , 18, 18, R.drawable.ui_small_ulti, R.drawable.ui_medium_ulti, R.drawable.ui_big_ulti, R.drawable.ui_huge_ulti} ,
-                     },
-         3
-       ),
-
-  DIAM (
-         new int[][] {
-                       {2 , 10, 12, R.drawable.ui_small_diam2, R.drawable.ui_medium_diam2, R.drawable.ui_big_diam2, R.drawable.ui_huge_diam2} ,
-                       {3 , 18, 24, R.drawable.ui_small_diam3, R.drawable.ui_medium_diam3, R.drawable.ui_big_diam3, R.drawable.ui_huge_diam3} ,
-                       {4 , 32, 32, R.drawable.ui_small_diam4, R.drawable.ui_medium_diam4, R.drawable.ui_big_diam4, R.drawable.ui_huge_diam4} ,
-                     },
-         3
-       ),
-
-  DINO (
-         new int[][] {
-                       {3 , 10, 10, R.drawable.ui_small_dino, R.drawable.ui_medium_dino, R.drawable.ui_big_dino, R.drawable.ui_huge_dino} ,
-                     },
-         4
-       ),
-
-  DIN4 (
-         new int[][] {
-                       {3 , 7, 7, R.drawable.ui_small_din4, R.drawable.ui_medium_din4, R.drawable.ui_big_din4, R.drawable.ui_huge_din4} ,
-                     },
-         4
-       ),
-
-  REDI (
-         new int[][] {
-                       {3 , 14, 16, R.drawable.ui_small_redi, R.drawable.ui_medium_redi, R.drawable.ui_big_redi, R.drawable.ui_huge_redi} ,
-                     },
-         4
-       ),
-
-  HELI (
-         new int[][] {
-                       {3 , 18, 20, R.drawable.ui_small_heli, R.drawable.ui_medium_heli, R.drawable.ui_big_heli, R.drawable.ui_huge_heli} ,
-                     },
-         4
-       ),
-
-  SKEW (
-         new int[][] {
-                       {2 , 11, 11, R.drawable.ui_small_skew2, R.drawable.ui_medium_skew2, R.drawable.ui_big_skew2, R.drawable.ui_huge_skew2} ,
-                       {3 , 17, 21, R.drawable.ui_small_skew3, R.drawable.ui_medium_skew3, R.drawable.ui_big_skew3, R.drawable.ui_huge_skew3} ,
-                     },
-         5
-       ),
-
-  IVY  (
-         new int[][] {
-                       {2 , 8, 8, R.drawable.ui_small_ivy, R.drawable.ui_medium_ivy, R.drawable.ui_big_ivy, R.drawable.ui_huge_ivy} ,
-                     },
-         5
-       ),
-
-  REX  (
-         new int[][] {
-                       {3 , 16, 19, R.drawable.ui_small_rex, R.drawable.ui_medium_rex, R.drawable.ui_big_rex, R.drawable.ui_huge_rex} ,
-                     },
-         5
-       ),
-
-  BAN1 (
-         new int[][] {
-                       {3 , 16, 16, R.drawable.ui_small_ban1, R.drawable.ui_medium_ban1, R.drawable.ui_big_ban1, R.drawable.ui_huge_ban1} ,
-                     },
-         6
-       ),
-
-  BAN2 (
-         new int[][] {
-                       {3 , 16, 16, R.drawable.ui_small_ban2, R.drawable.ui_medium_ban2, R.drawable.ui_big_ban2, R.drawable.ui_huge_ban2} ,
-                     },
-         6
-       ),
-
-  BAN3 (
-         new int[][] {
-                       {3 , 16, 16, R.drawable.ui_small_ban3, R.drawable.ui_medium_ban3, R.drawable.ui_big_ban3, R.drawable.ui_huge_ban3} ,
-                     },
-         6
-       ),
-
-  BAN4 (
-         new int[][] {
-                       {3 , 16, 16, R.drawable.ui_small_ban4, R.drawable.ui_medium_ban4, R.drawable.ui_big_ban4, R.drawable.ui_huge_ban4} ,
-                     },
-         6
-       ),
-
-  SQU1 (
-         new int[][] {
-                       {3 , 24, 24, R.drawable.ui_small_squa1, R.drawable.ui_medium_squa1, R.drawable.ui_big_squa1, R.drawable.ui_huge_squa1} ,
-                     },
-         7
-       ),
-
-  SQU2 (
-         new int[][] {
-                       {3 , 24, 24, R.drawable.ui_small_squa2, R.drawable.ui_medium_squa2, R.drawable.ui_big_squa2, R.drawable.ui_huge_squa2} ,
-                     },
-         7
-       ),
-
-  MIRR (
-         new int[][] {
-                       {2 , 12, 12, R.drawable.ui_small_mirr2, R.drawable.ui_medium_mirr2, R.drawable.ui_big_mirr2, R.drawable.ui_huge_mirr2} ,
-                       {3 , 16, 17, R.drawable.ui_small_mirr3, R.drawable.ui_medium_mirr3, R.drawable.ui_big_mirr3, R.drawable.ui_huge_mirr3} ,
-                     },
-         7
-       ),
+  CUBE_2 ( 0, 2, 12, 12, R.drawable.small_cube2, R.drawable.medium_cube2, R.drawable.big_cube2, R.drawable.huge_cube2),
+  CUBE_3 ( 0, 3, 16, 17, R.drawable.small_cube3, R.drawable.medium_cube3, R.drawable.big_cube3, R.drawable.huge_cube3),
+  CUBE_4 ( 0, 4, 20, 24, R.drawable.small_cube4, R.drawable.medium_cube4, R.drawable.big_cube4, R.drawable.huge_cube4),
+  CUBE_5 ( 0, 5, 24, 28, R.drawable.small_cube5, R.drawable.medium_cube5, R.drawable.big_cube5, R.drawable.huge_cube5),
+  JING_2 ( 1, 2, 11, 11, R.drawable.small_jing2, R.drawable.medium_jing2, R.drawable.big_jing2, R.drawable.huge_jing2),
+  PYRA_3 ( 1, 3, 10, 10, R.drawable.small_pyra3, R.drawable.medium_pyra3, R.drawable.big_pyra3, R.drawable.huge_pyra3),
+  PYRA_4 ( 1, 4, 14, 17, R.drawable.small_pyra4, R.drawable.medium_pyra4, R.drawable.big_pyra4, R.drawable.huge_pyra4),
+  PYRA_5 ( 1, 5, 20, 23, R.drawable.small_pyra5, R.drawable.medium_pyra5, R.drawable.big_pyra5, R.drawable.huge_pyra5),
+  KILO_3 ( 2, 3, 18, 18, R.drawable.small_kilo3, R.drawable.medium_kilo3, R.drawable.big_kilo3, R.drawable.huge_kilo3),
+  KILO_5 ( 2, 5, 33, 33, R.drawable.small_kilo5, R.drawable.medium_kilo5, R.drawable.big_kilo5, R.drawable.huge_kilo5),
+  MEGA_3 ( 2, 3, 21, 21, R.drawable.small_mega3, R.drawable.medium_mega3, R.drawable.big_mega3, R.drawable.huge_mega3),
+  MEGA_5 ( 2, 5, 35, 37, R.drawable.small_mega5, R.drawable.medium_mega5, R.drawable.big_mega5, R.drawable.huge_mega5),
+  ULTI_2 ( 3, 2, 18, 18, R.drawable.small_ulti , R.drawable.medium_ulti , R.drawable.big_ulti , R.drawable.huge_ulti ),
+  DIAM_2 ( 3, 2, 10, 12, R.drawable.small_diam2, R.drawable.medium_diam2, R.drawable.big_diam2, R.drawable.huge_diam2),
+  DIAM_3 ( 3, 3, 18, 24, R.drawable.small_diam3, R.drawable.medium_diam3, R.drawable.big_diam3, R.drawable.huge_diam3),
+  DIAM_4 ( 3, 4, 32, 32, R.drawable.small_diam4, R.drawable.medium_diam4, R.drawable.big_diam4, R.drawable.huge_diam4),
+  DINO_3 ( 4, 3, 10, 10, R.drawable.small_dino , R.drawable.medium_dino , R.drawable.big_dino , R.drawable.huge_dino ),
+  DIN4_3 ( 4, 3,  7,  7, R.drawable.small_din4 , R.drawable.medium_din4 , R.drawable.big_din4 , R.drawable.huge_din4 ),
+  REDI_3 ( 4, 3, 14, 16, R.drawable.small_redi , R.drawable.medium_redi , R.drawable.big_redi , R.drawable.huge_redi ),
+  HELI_3 ( 4, 3, 18, 20, R.drawable.small_heli , R.drawable.medium_heli , R.drawable.big_heli , R.drawable.huge_heli ),
+  SKEW_2 ( 5, 2, 11, 11, R.drawable.small_skew2, R.drawable.medium_skew2, R.drawable.big_skew2, R.drawable.huge_skew2),
+  SKEW_3 ( 5, 3, 17, 21, R.drawable.small_skew3, R.drawable.medium_skew3, R.drawable.big_skew3, R.drawable.huge_skew3),
+  IVY_2  ( 5, 2,  8,  8, R.drawable.small_ivy  , R.drawable.medium_ivy  , R.drawable.big_ivy  , R.drawable.huge_ivy  ),
+  REX_3  ( 5, 3, 16, 19, R.drawable.small_rex  , R.drawable.medium_rex  , R.drawable.big_rex  , R.drawable.huge_rex  ),
+  BAN1_3 ( 6, 3, 16, 16, R.drawable.small_ban1 , R.drawable.medium_ban1 , R.drawable.big_ban1 , R.drawable.huge_ban1 ),
+  BAN2_3 ( 6, 3, 16, 16, R.drawable.small_ban2 , R.drawable.medium_ban2 , R.drawable.big_ban2 , R.drawable.huge_ban2 ),
+  BAN3_3 ( 6, 3, 16, 16, R.drawable.small_ban3 , R.drawable.medium_ban3 , R.drawable.big_ban3 , R.drawable.huge_ban3 ),
+  BAN4_3 ( 6, 3, 16, 16, R.drawable.small_ban4 , R.drawable.medium_ban4 , R.drawable.big_ban4 , R.drawable.huge_ban4 ),
+  SQU1_3 ( 7, 3, 24, 24, R.drawable.small_squa1, R.drawable.medium_squa1, R.drawable.big_squa1, R.drawable.huge_squa1),
+  SQU2_3 ( 7, 3, 24, 24, R.drawable.small_squa2, R.drawable.medium_squa2, R.drawable.big_squa2, R.drawable.huge_squa2),
+  MIRR_2 ( 7, 2, 12, 12, R.drawable.small_mirr2, R.drawable.medium_mirr2, R.drawable.big_mirr2, R.drawable.huge_mirr2),
+  MIRR_3 ( 7, 3, 16, 17, R.drawable.small_mirr3, R.drawable.medium_mirr3, R.drawable.big_mirr3, R.drawable.huge_mirr3),
   ;
 
   public static final int NUM_OBJECTS = values().length;
-  public static final int MAX_NUM_OBJECTS;
   public static final int MAX_LEVEL;
   public static final int MAX_SCRAMBLE;
   public static final int MAX_OBJECT_SIZE;
 
-  private final int[] mObjectSizes, mDBLevels, mNumScrambles, mSmallIconIDs, mMediumIconIDs, mBigIconIDs, mHugeIconIDs;
-  private final int mRow, mNumSizes;
+  private final int mRow, mSize, mDBLevels, mNumScrambles;
+  private final int mSmallIconID, mMediumIconID, mBigIconID, mHugeIconID;
 
   private static final ObjectList[] objects;
-  private static int mNumAll;
   private static int[] mIndices;
   private static int mColCount, mRowCount;
 
   static
     {
-    mNumAll = 0;
-    int num, i = 0;
+    int i = 0;
     objects = new ObjectList[NUM_OBJECTS];
-    int maxNum     = Integer.MIN_VALUE;
     int maxLevel   = Integer.MIN_VALUE;
     int maxScramble= Integer.MIN_VALUE;
     int maxSize    = Integer.MIN_VALUE;
 
     for(ObjectList object: ObjectList.values())
       {
-      objects[i] = object;
-      i++;
-      num = object.mObjectSizes.length;
-      mNumAll += num;
-      if( num> maxNum ) maxNum = num;
-
-      for(int j=0; j<num; j++)
-        {
-        if( object.mNumScrambles[j]> maxScramble ) maxScramble= object.mNumScrambles[j];
-        if( object.mDBLevels[j]    > maxLevel    ) maxLevel   = object.mDBLevels[j];
-        if( object.mObjectSizes[j] > maxSize     ) maxSize    = object.mObjectSizes[j];
-        }
+      objects[i++] = object;
+
+      if( object.mNumScrambles> maxScramble ) maxScramble= object.mNumScrambles;
+      if( object.mDBLevels    > maxLevel    ) maxLevel   = object.mDBLevels;
+      if( object.mSize        > maxSize     ) maxSize    = object.mSize;
       }
 
-    MAX_NUM_OBJECTS = maxNum;
     MAX_LEVEL       = maxLevel;
     MAX_SCRAMBLE    = maxScramble;
     MAX_OBJECT_SIZE = maxSize;
@@ -325,10 +150,7 @@ public enum ObjectList
 
     for(int object=0; object<NUM_OBJECTS; object++)
       {
-      if( objects[object].mRow == row )
-        {
-        num += objects[object].mNumSizes;
-        }
+      if( objects[object].mRow == row ) num++;
       }
 
     return num;
@@ -365,71 +187,16 @@ public enum ObjectList
 
   public static ObjectList getObject(int ordinal)
     {
-    return ordinal>=0 && ordinal<NUM_OBJECTS ? objects[ordinal] : CUBE;
-    }
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-  public static int pack(int object, int sizeIndex)
-    {
-    int ret = 0;
-    for(int i=0; i<object; i++) ret += objects[i].mObjectSizes.length;
-
-    return ret+sizeIndex;
+    return ordinal>=0 && ordinal<NUM_OBJECTS ? objects[ordinal] : CUBE_3;
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-  public static int unpackSizeIndex(int number)
-    {
-    int num;
-
-    for(int i=0; i<NUM_OBJECTS; i++)
-      {
-      num = objects[i].mObjectSizes.length;
-      if( number<num ) return number;
-      number -= num;
-      }
-
-    return -1;
-    }
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-  public static int unpackObject(int number)
+  public static int getOrdinal(String name)
     {
-    int num;
-
     for(int i=0; i<NUM_OBJECTS; i++)
       {
-      num = objects[i].mObjectSizes.length;
-      if( number<num ) return i;
-      number -= num;
-      }
-
-    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 sizeIndex = getSizeIndex(i,size);
-          return pack(i,sizeIndex);
-          }
-        }
+      if( objects[i].name().equals(name) ) return i;
       }
 
     return -1;
@@ -439,24 +206,12 @@ public enum ObjectList
 
   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]);
-        }
+      if( i>0 ) list.append(',');
+      list.append(objects[i].name());
       }
 
     return list.toString();
@@ -464,120 +219,50 @@ public enum ObjectList
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-  public static int getTotal()
-    {
-    return mNumAll;
-    }
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-  public static int getDBLevel(int ordinal, int sizeIndex)
-    {
-    if( ordinal>=0 && ordinal<NUM_OBJECTS )
-      {
-      int num = objects[ordinal].mObjectSizes.length;
-      return sizeIndex>=0 && sizeIndex<num ? objects[ordinal].mDBLevels[sizeIndex] : 0;
-      }
-
-    return 0;
-    }
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-  public static int getNumScramble(int ordinal, int sizeIndex)
+  public static int getDBLevel(int ordinal)
     {
-    if( ordinal>=0 && ordinal<NUM_OBJECTS )
-      {
-      int num = objects[ordinal].mObjectSizes.length;
-      return sizeIndex>=0 && sizeIndex<num ? objects[ordinal].mNumScrambles[sizeIndex] : 0;
-      }
-
-    return 0;
+    return ordinal>=0 && ordinal<NUM_OBJECTS ? objects[ordinal].mDBLevels : 0;
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-  public static int getOrdinal(String name)
+  public static int getNumScramble(int ordinal)
     {
-    for(int i=0; i<NUM_OBJECTS; i++)
-      {
-      if(objects[i].name().equals(name)) return i;
-      }
-
-    return -1;
-    }
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-  public static int getSizeIndex(int ordinal, int size)
-    {
-    if( ordinal>=0 && ordinal<NUM_OBJECTS )
-      {
-      int[] sizes = objects[ordinal].getSizes();
-      int len = sizes.length;
-
-      for(int i=0; i<len; i++)
-        {
-        if( sizes[i]==size ) return i;
-        }
-      }
-
-    return -1;
-    }
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-  ObjectList(int[][] info, int row)
-    {
-    mNumSizes = info.length;
-
-    mObjectSizes  = new int[mNumSizes];
-    mDBLevels     = new int[mNumSizes];
-    mNumScrambles = new int[mNumSizes];
-    mSmallIconIDs = new int[mNumSizes];
-    mMediumIconIDs= new int[mNumSizes];
-    mBigIconIDs   = new int[mNumSizes];
-    mHugeIconIDs  = new int[mNumSizes];
-
-    for(int i=0; i<mNumSizes; i++)
-      {
-      mObjectSizes[i]  = info[i][0];
-      mDBLevels[i]     = info[i][1];
-      mNumScrambles[i] = info[i][2];
-      mSmallIconIDs[i] = info[i][3];
-      mMediumIconIDs[i]= info[i][4];
-      mBigIconIDs[i]   = info[i][5];
-      mHugeIconIDs[i]  = info[i][6];
-      }
-
-    mRow  = row;
+    return ordinal>=0 && ordinal<NUM_OBJECTS ? objects[ordinal].mNumScrambles : 0;
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-  public int[] getSizes()
+  ObjectList(int row, int size, int db, int scrambles, int smallIcon, int mediumIcon, int bigIcon, int hugeIcon)
     {
-    return mObjectSizes;
+    mRow         = row;
+    mSize        = size;
+    mDBLevels    = db;
+    mNumScrambles= scrambles;
+    mSmallIconID = smallIcon;
+    mMediumIconID= mediumIcon;
+    mBigIconID   = bigIcon;
+    mHugeIconID  = hugeIcon;
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-  public int[] getIconIDs(int size)
+  public int getIconID(int size)
     {
     switch(size)
       {
-      case 0: return mSmallIconIDs;
-      case 1: return mMediumIconIDs;
-      case 2: return mBigIconIDs;
-      case 3: return mHugeIconIDs;
+      case 0: return mSmallIconID;
+      case 1: return mMediumIconID;
+      case 2: return mBigIconID;
+      case 3: return mHugeIconID;
       }
 
-    return mSmallIconIDs;
+    return mSmallIconID;
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-  public TwistyObject create(int size, Static4D quat, int[][] moves, Resources res, int scrWidth)
+  public TwistyObject create(Static4D quat, int[][] moves, Resources res, int scrWidth)
     {
     DistortedTexture texture = new DistortedTexture();
     DistortedEffects effects = new DistortedEffects();
@@ -585,27 +270,38 @@ public enum ObjectList
 
     switch(ordinal())
       {
-      case  0: return new TwistyCube          (size, quat, texture, mesh, effects, moves, res, scrWidth);
-      case  1: return new TwistyJing          (size, quat, texture, mesh, effects, moves, res, scrWidth);
-      case  2: return new TwistyPyraminx      (size, quat, texture, mesh, effects, moves, res, scrWidth);
-      case  3: return new TwistyKilominx      (size, quat, texture, mesh, effects, moves, res, scrWidth);
-      case  4: return new TwistyMegaminx      (size, quat, texture, mesh, effects, moves, res, scrWidth);
-      case  5: return new TwistyUltimate      (size, quat, texture, mesh, effects, moves, res, scrWidth);
-      case  6: return new TwistyDiamond       (size, quat, texture, mesh, effects, moves, res, scrWidth);
-      case  7: return new TwistyDino6         (size, quat, texture, mesh, effects, moves, res, scrWidth);
-      case  8: return new TwistyDino4         (size, quat, texture, mesh, effects, moves, res, scrWidth);
-      case  9: return new TwistyRedi          (size, quat, texture, mesh, effects, moves, res, scrWidth);
-      case 10: return new TwistyHelicopter    (size, quat, texture, mesh, effects, moves, res, scrWidth);
-      case 11: return new TwistySkewb         (size, quat, texture, mesh, effects, moves, res, scrWidth);
-      case 12: return new TwistyIvy           (size, quat, texture, mesh, effects, moves, res, scrWidth);
-      case 13: return new TwistyRex           (size, quat, texture, mesh, effects, moves, res, scrWidth);
-      case 14: return new TwistyBandagedFused (size, quat, texture, mesh, effects, moves, res, scrWidth);
-      case 15: return new TwistyBandaged2Bar  (size, quat, texture, mesh, effects, moves, res, scrWidth);
-      case 16: return new TwistyBandaged3Plate(size, quat, texture, mesh, effects, moves, res, scrWidth);
-      case 17: return new TwistyBandagedEvil  (size, quat, texture, mesh, effects, moves, res, scrWidth);
-      case 18: return new TwistySquare1       (size, quat, texture, mesh, effects, moves, res, scrWidth);
-      case 19: return new TwistySquare2       (size, quat, texture, mesh, effects, moves, res, scrWidth);
-      case 20: return new TwistyMirror        (size, quat, texture, mesh, effects, moves, res, scrWidth);
+      case  0: return new TwistyCube          (objects[ 0].mSize, quat, texture, mesh, effects, moves, res, scrWidth);
+      case  1: return new TwistyCube          (objects[ 1].mSize, quat, texture, mesh, effects, moves, res, scrWidth);
+      case  2: return new TwistyCube          (objects[ 2].mSize, quat, texture, mesh, effects, moves, res, scrWidth);
+      case  3: return new TwistyCube          (objects[ 3].mSize, quat, texture, mesh, effects, moves, res, scrWidth);
+      case  4: return new TwistyJing          (objects[ 4].mSize, quat, texture, mesh, effects, moves, res, scrWidth);
+      case  5: return new TwistyPyraminx      (objects[ 5].mSize, quat, texture, mesh, effects, moves, res, scrWidth);
+      case  6: return new TwistyPyraminx      (objects[ 6].mSize, quat, texture, mesh, effects, moves, res, scrWidth);
+      case  7: return new TwistyPyraminx      (objects[ 7].mSize, quat, texture, mesh, effects, moves, res, scrWidth);
+      case  8: return new TwistyKilominx      (objects[ 8].mSize, quat, texture, mesh, effects, moves, res, scrWidth);
+      case  9: return new TwistyKilominx      (objects[ 9].mSize, quat, texture, mesh, effects, moves, res, scrWidth);
+      case 10: return new TwistyMegaminx      (objects[10].mSize, quat, texture, mesh, effects, moves, res, scrWidth);
+      case 11: return new TwistyMegaminx      (objects[11].mSize, quat, texture, mesh, effects, moves, res, scrWidth);
+      case 12: return new TwistyUltimate      (objects[12].mSize, quat, texture, mesh, effects, moves, res, scrWidth);
+      case 13: return new TwistyDiamond       (objects[13].mSize, quat, texture, mesh, effects, moves, res, scrWidth);
+      case 14: return new TwistyDiamond       (objects[14].mSize, quat, texture, mesh, effects, moves, res, scrWidth);
+      case 15: return new TwistyDiamond       (objects[15].mSize, quat, texture, mesh, effects, moves, res, scrWidth);
+      case 16: return new TwistyDino6         (objects[16].mSize, quat, texture, mesh, effects, moves, res, scrWidth);
+      case 17: return new TwistyDino4         (objects[17].mSize, quat, texture, mesh, effects, moves, res, scrWidth);
+      case 18: return new TwistyRedi          (objects[18].mSize, quat, texture, mesh, effects, moves, res, scrWidth);
+      case 19: return new TwistyHelicopter    (objects[19].mSize, quat, texture, mesh, effects, moves, res, scrWidth);
+      case 20: return new TwistySkewb         (objects[20].mSize, quat, texture, mesh, effects, moves, res, scrWidth);
+      case 21: return new TwistySkewb         (objects[21].mSize, quat, texture, mesh, effects, moves, res, scrWidth);
+      case 22: return new TwistyIvy           (objects[22].mSize, quat, texture, mesh, effects, moves, res, scrWidth);
+      case 23: return new TwistyRex           (objects[23].mSize, quat, texture, mesh, effects, moves, res, scrWidth);
+      case 24: return new TwistyBandagedFused (objects[24].mSize, quat, texture, mesh, effects, moves, res, scrWidth);
+      case 25: return new TwistyBandaged2Bar  (objects[25].mSize, quat, texture, mesh, effects, moves, res, scrWidth);
+      case 26: return new TwistyBandaged3Plate(objects[26].mSize, quat, texture, mesh, effects, moves, res, scrWidth);
+      case 27: return new TwistyBandagedEvil  (objects[27].mSize, quat, texture, mesh, effects, moves, res, scrWidth);
+      case 28: return new TwistySquare1       (objects[28].mSize, quat, texture, mesh, effects, moves, res, scrWidth);
+      case 29: return new TwistySquare2       (objects[29].mSize, quat, texture, mesh, effects, moves, res, scrWidth);
+      case 30: return new TwistyMirror        (objects[30].mSize, quat, texture, mesh, effects, moves, res, scrWidth);
+      case 31: return new TwistyMirror        (objects[31].mSize, quat, texture, mesh, effects, moves, res, scrWidth);
       }
 
     return null;
diff --git a/src/main/java/org/distorted/objectlib/main/Twisty12.java b/src/main/java/org/distorted/objectlib/main/Twisty12.java
index 7c37ec4a..97317951 100644
--- a/src/main/java/org/distorted/objectlib/main/Twisty12.java
+++ b/src/main/java/org/distorted/objectlib/main/Twisty12.java
@@ -53,9 +53,9 @@ public abstract class Twisty12 extends TwistyObject
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
   public Twisty12(int numLayers, int realSize, Static4D quat, DistortedTexture texture, MeshSquare mesh,
-           DistortedEffects effects, int[][] moves, ObjectList list, Resources res, int scrWidth)
+           DistortedEffects effects, int[][] moves, Resources res, int scrWidth)
     {
-    super(numLayers, realSize, quat, texture, mesh, effects, moves, list, res, scrWidth);
+    super(numLayers, realSize, quat, texture, mesh, effects, moves, res, scrWidth);
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/main/java/org/distorted/objectlib/main/Twisty4.java b/src/main/java/org/distorted/objectlib/main/Twisty4.java
index 2176fa05..2dcb2dd5 100644
--- a/src/main/java/org/distorted/objectlib/main/Twisty4.java
+++ b/src/main/java/org/distorted/objectlib/main/Twisty4.java
@@ -39,9 +39,9 @@ public abstract class Twisty4 extends TwistyObject
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
   public Twisty4(int numLayers, int realSize, Static4D quat, DistortedTexture texture, MeshSquare mesh,
-          DistortedEffects effects, int[][] moves, ObjectList list, Resources res, int scrWidth)
+          DistortedEffects effects, int[][] moves, Resources res, int scrWidth)
     {
-    super(numLayers, realSize, quat, texture, mesh, effects, moves, list, res, scrWidth);
+    super(numLayers, realSize, quat, texture, mesh, effects, moves, res, scrWidth);
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/main/java/org/distorted/objectlib/main/Twisty6.java b/src/main/java/org/distorted/objectlib/main/Twisty6.java
index 2308a529..4891bcd8 100644
--- a/src/main/java/org/distorted/objectlib/main/Twisty6.java
+++ b/src/main/java/org/distorted/objectlib/main/Twisty6.java
@@ -40,9 +40,9 @@ public abstract class Twisty6 extends TwistyObject
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
   public Twisty6(int numLayers, int realSize, Static4D quat, DistortedTexture texture, MeshSquare mesh,
-          DistortedEffects effects, int[][] moves, ObjectList list, Resources res, int scrWidth)
+          DistortedEffects effects, int[][] moves, Resources res, int scrWidth)
     {
-    super(numLayers, realSize, quat, texture, mesh, effects, moves, list, res, scrWidth);
+    super(numLayers, realSize, quat, texture, mesh, effects, moves, res, scrWidth);
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/main/java/org/distorted/objectlib/main/Twisty8.java b/src/main/java/org/distorted/objectlib/main/Twisty8.java
index 40b0d329..1bc12880 100644
--- a/src/main/java/org/distorted/objectlib/main/Twisty8.java
+++ b/src/main/java/org/distorted/objectlib/main/Twisty8.java
@@ -41,9 +41,9 @@ public abstract class Twisty8 extends TwistyObject
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
   public Twisty8(int numLayers, int realSize, Static4D quat, DistortedTexture texture, MeshSquare mesh,
-          DistortedEffects effects, int[][] moves, ObjectList list, Resources res, int scrWidth)
+          DistortedEffects effects, int[][] moves, Resources res, int scrWidth)
     {
-    super(numLayers, realSize, quat, texture, mesh, effects, moves, list, res, scrWidth);
+    super(numLayers, realSize, quat, texture, mesh, effects, moves, res, scrWidth);
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/main/java/org/distorted/objectlib/main/TwistyObject.java b/src/main/java/org/distorted/objectlib/main/TwistyObject.java
index c9d2f7a0..d47abdb5 100644
--- a/src/main/java/org/distorted/objectlib/main/TwistyObject.java
+++ b/src/main/java/org/distorted/objectlib/main/TwistyObject.java
@@ -102,7 +102,6 @@ public abstract class TwistyObject extends DistortedNode
   private final Static3D mNodeScale;
   private final Static4D mQuat;
   private final int mNumLayers, mRealSize;
-  private final ObjectList mList;
   private final DistortedEffects mEffects;
   private final VertexEffectRotate mRotateEffect;
   private final Dynamic1D mRotationAngle;
@@ -134,7 +133,7 @@ public abstract class TwistyObject extends DistortedNode
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
   TwistyObject(int numLayers, int realSize, Static4D quat, DistortedTexture nodeTexture, MeshSquare nodeMesh,
-               DistortedEffects nodeEffects, int[][] moves, ObjectList list, Resources res, int screenWidth)
+               DistortedEffects nodeEffects, int[][] moves, Resources res, int screenWidth)
     {
     super(nodeTexture,nodeEffects,nodeMesh);
 
@@ -144,7 +143,6 @@ public abstract class TwistyObject extends DistortedNode
 
     mNumLayers = numLayers;
     mRealSize = realSize;
-    mList = list;
     mOrigPos = getCubitPositions(mNumLayers);
     mAxis = getRotationAxis();
     mInitScreenRatio = getScreenRatio();
@@ -211,7 +209,7 @@ public abstract class TwistyObject extends DistortedNode
     if( mNumTexCols*mNumTexRows < NUM_TEXTURES+1 ) mNumTexRows++;
 
     CUBITS = new Cubit[NUM_CUBITS];
-    createMeshAndCubits(list,res);
+    createMeshAndCubits(res);
     createDataStructuresForSolved(numLayers);
 
     mTexture = new DistortedTexture();
@@ -268,7 +266,7 @@ public abstract class TwistyObject extends DistortedNode
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-  private void createMeshAndCubits(ObjectList list, Resources res)
+  private void createMeshAndCubits(Resources res)
     {
     int resourceID= getResource(mNumLayers);
 
@@ -999,17 +997,19 @@ public abstract class TwistyObject extends DistortedNode
       quats.append(" ");
       }
 
+    String name = intGetObjectList(mNumLayers).name();
+
     if( BuildConfig.DEBUG )
       {
       android.util.Log.e("quats" , quats.toString());
-      android.util.Log.e("object", mList.name()+"_"+mNumLayers);
+      android.util.Log.e("object", name);
       }
     else
       {
       Exception ex = new Exception(message);
       FirebaseCrashlytics crashlytics = FirebaseCrashlytics.getInstance();
       crashlytics.setCustomKey("quats" , quats.toString());
-      crashlytics.setCustomKey("object", mList.name()+"_"+mNumLayers );
+      crashlytics.setCustomKey("object", name);
       crashlytics.recordException(ex);
       }
     }
@@ -1272,7 +1272,7 @@ public abstract class TwistyObject extends DistortedNode
 
   public ObjectList getObjectList()
     {
-    return mList;
+    return intGetObjectList(mNumLayers);
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -1304,6 +1304,7 @@ public abstract class TwistyObject extends DistortedNode
   protected abstract ObjectSticker retSticker(int face);
   protected abstract int getFaceColor(int cubit, int cubitface, int numLayers);
   protected abstract int getResource(int mNumLayers);
+  protected abstract ObjectList intGetObjectList(int numLayers);
 
   public abstract Movement getMovement();
   public abstract Static3D[] getRotationAxis();
diff --git a/src/main/java/org/distorted/objectlib/objects/TwistyBandaged2Bar.java b/src/main/java/org/distorted/objectlib/objects/TwistyBandaged2Bar.java
index 8265b147..e03ff957 100644
--- a/src/main/java/org/distorted/objectlib/objects/TwistyBandaged2Bar.java
+++ b/src/main/java/org/distorted/objectlib/objects/TwistyBandaged2Bar.java
@@ -37,7 +37,7 @@ public class TwistyBandaged2Bar extends TwistyBandagedAbstract
   public TwistyBandaged2Bar(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh,
                             DistortedEffects effects, int[][] moves, Resources res, int scrWidth)
     {
-    super(size, quat, texture, mesh, effects, moves, ObjectList.BAN2, res, scrWidth);
+    super(size, quat, texture, mesh, effects, moves, res, scrWidth);
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -115,6 +115,13 @@ public class TwistyBandaged2Bar extends TwistyBandagedAbstract
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PUBLIC API
 
+  public ObjectList intGetObjectList(int numLayers)
+    {
+    return ObjectList.BAN2_3;
+    }
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
   public int getObjectName(int numLayers)
     {
     return R.string.bandaged_2bar;
diff --git a/src/main/java/org/distorted/objectlib/objects/TwistyBandaged3Plate.java b/src/main/java/org/distorted/objectlib/objects/TwistyBandaged3Plate.java
index e8a0a2bc..0e67bd08 100644
--- a/src/main/java/org/distorted/objectlib/objects/TwistyBandaged3Plate.java
+++ b/src/main/java/org/distorted/objectlib/objects/TwistyBandaged3Plate.java
@@ -37,7 +37,7 @@ public class TwistyBandaged3Plate extends TwistyBandagedAbstract
   public TwistyBandaged3Plate(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh,
                               DistortedEffects effects, int[][] moves, Resources res, int scrWidth)
     {
-    super(size, quat, texture, mesh, effects, moves, ObjectList.BAN3, res, scrWidth);
+    super(size, quat, texture, mesh, effects, moves, res, scrWidth);
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -122,6 +122,13 @@ public class TwistyBandaged3Plate extends TwistyBandagedAbstract
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PUBLIC API
 
+  public ObjectList intGetObjectList(int numLayers)
+    {
+    return ObjectList.BAN3_3;
+    }
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
   public int getObjectName(int numLayers)
     {
     return R.string.bandaged_3plate;
diff --git a/src/main/java/org/distorted/objectlib/objects/TwistyBandagedAbstract.java b/src/main/java/org/distorted/objectlib/objects/TwistyBandagedAbstract.java
index fab9d7ca..bf0857e2 100644
--- a/src/main/java/org/distorted/objectlib/objects/TwistyBandagedAbstract.java
+++ b/src/main/java/org/distorted/objectlib/objects/TwistyBandagedAbstract.java
@@ -31,7 +31,6 @@ import org.distorted.library.type.Static4D;
 
 import org.distorted.objectlib.main.Movement;
 import org.distorted.objectlib.main.Movement6;
-import org.distorted.objectlib.main.ObjectList;
 import org.distorted.objectlib.main.ObjectShape;
 import org.distorted.objectlib.main.ObjectSticker;
 import org.distorted.objectlib.main.ScrambleState;
@@ -81,9 +80,9 @@ abstract class TwistyBandagedAbstract extends Twisty6
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
   TwistyBandagedAbstract(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh,
-                         DistortedEffects effects, int[][] moves, ObjectList list, Resources res, int scrWidth)
+                         DistortedEffects effects, int[][] moves, Resources res, int scrWidth)
     {
-    super(size, size, quat, texture, mesh, effects, moves, list, res, scrWidth);
+    super(size, size, quat, texture, mesh, effects, moves, res, scrWidth);
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/main/java/org/distorted/objectlib/objects/TwistyBandagedEvil.java b/src/main/java/org/distorted/objectlib/objects/TwistyBandagedEvil.java
index c22e989d..eae3b9c1 100644
--- a/src/main/java/org/distorted/objectlib/objects/TwistyBandagedEvil.java
+++ b/src/main/java/org/distorted/objectlib/objects/TwistyBandagedEvil.java
@@ -37,7 +37,7 @@ public class TwistyBandagedEvil extends TwistyBandagedAbstract
   public TwistyBandagedEvil(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh,
                             DistortedEffects effects, int[][] moves, Resources res, int scrWidth)
     {
-    super(size, quat, texture, mesh, effects, moves, ObjectList.BAN4, res, scrWidth);
+    super(size, quat, texture, mesh, effects, moves, res, scrWidth);
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -246,6 +246,13 @@ public class TwistyBandagedEvil extends TwistyBandagedAbstract
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PUBLIC API
 
+  public ObjectList intGetObjectList(int numLayers)
+    {
+    return ObjectList.BAN4_3;
+    }
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
   public int getObjectName(int numLayers)
     {
     return R.string.bandaged_evil;
diff --git a/src/main/java/org/distorted/objectlib/objects/TwistyBandagedFused.java b/src/main/java/org/distorted/objectlib/objects/TwistyBandagedFused.java
index ef5c16bf..958186df 100644
--- a/src/main/java/org/distorted/objectlib/objects/TwistyBandagedFused.java
+++ b/src/main/java/org/distorted/objectlib/objects/TwistyBandagedFused.java
@@ -37,7 +37,7 @@ public class TwistyBandagedFused extends TwistyBandagedAbstract
   public TwistyBandagedFused(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh,
                              DistortedEffects effects, int[][] moves, Resources res, int scrWidth)
     {
-    super(size, quat, texture, mesh, effects, moves, ObjectList.BAN1, res, scrWidth);
+    super(size, quat, texture, mesh, effects, moves, res, scrWidth);
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -115,6 +115,13 @@ public class TwistyBandagedFused extends TwistyBandagedAbstract
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PUBLIC APi
 
+  public ObjectList intGetObjectList(int numLayers)
+    {
+    return ObjectList.BAN1_3;
+    }
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
   public int getObjectName(int numLayers)
     {
     return R.string.bandaged_fused;
diff --git a/src/main/java/org/distorted/objectlib/objects/TwistyCube.java b/src/main/java/org/distorted/objectlib/objects/TwistyCube.java
index 95bde7fb..3a7f1c2b 100644
--- a/src/main/java/org/distorted/objectlib/objects/TwistyCube.java
+++ b/src/main/java/org/distorted/objectlib/objects/TwistyCube.java
@@ -67,7 +67,7 @@ public class TwistyCube extends Twisty6
   public TwistyCube(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh,
                     DistortedEffects effects, int[][] moves, Resources res, int scrWidth)
     {
-    super(size, size, quat, texture, mesh, effects, moves, ObjectList.CUBE, res, scrWidth);
+    super(size, size, quat, texture, mesh, effects, moves, res, scrWidth);
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -394,6 +394,21 @@ public class TwistyCube extends Twisty6
     return mBasicAngle;
     }
 
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+  public ObjectList intGetObjectList(int numLayers)
+    {
+    switch(numLayers)
+      {
+      case 2: return ObjectList.CUBE_2;
+      case 3: return ObjectList.CUBE_3;
+      case 4: return ObjectList.CUBE_4;
+      case 5: return ObjectList.CUBE_5;
+      }
+
+    return ObjectList.CUBE_3;
+    }
+
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
   public int getObjectName(int numLayers)
diff --git a/src/main/java/org/distorted/objectlib/objects/TwistyDiamond.java b/src/main/java/org/distorted/objectlib/objects/TwistyDiamond.java
index 0e630478..3ad909a4 100644
--- a/src/main/java/org/distorted/objectlib/objects/TwistyDiamond.java
+++ b/src/main/java/org/distorted/objectlib/objects/TwistyDiamond.java
@@ -71,7 +71,7 @@ public class TwistyDiamond extends Twisty8
   public TwistyDiamond(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh,
                        DistortedEffects effects, int[][] moves, Resources res, int scrWidth)
     {
-    super(size, size, quat, texture, mesh, effects, moves, ObjectList.DIAM, res, scrWidth);
+    super(size, size, quat, texture, mesh, effects, moves, res, scrWidth);
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -536,6 +536,20 @@ public class TwistyDiamond extends Twisty8
     return mBasicAngle;
     }
 
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+  public ObjectList intGetObjectList(int numLayers)
+    {
+    switch(numLayers)
+      {
+      case 2: return ObjectList.DIAM_2;
+      case 3: return ObjectList.DIAM_3;
+      case 4: return ObjectList.DIAM_4;
+      }
+
+    return ObjectList.DIAM_2;
+    }
+
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
   public int getObjectName(int numLayers)
diff --git a/src/main/java/org/distorted/objectlib/objects/TwistyDino.java b/src/main/java/org/distorted/objectlib/objects/TwistyDino.java
index d6897e93..2af485c6 100644
--- a/src/main/java/org/distorted/objectlib/objects/TwistyDino.java
+++ b/src/main/java/org/distorted/objectlib/objects/TwistyDino.java
@@ -73,9 +73,9 @@ abstract class TwistyDino extends Twisty6
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
   TwistyDino(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh,
-             DistortedEffects effects, int[][] moves, ObjectList obj, Resources res, int scrWidth)
+             DistortedEffects effects, int[][] moves, Resources res, int scrWidth)
     {
-    super(size, size, quat, texture, mesh, effects, moves, obj, res, scrWidth);
+    super(size, size, quat, texture, mesh, effects, moves, res, scrWidth);
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/main/java/org/distorted/objectlib/objects/TwistyDino4.java b/src/main/java/org/distorted/objectlib/objects/TwistyDino4.java
index 991f77f8..603a33d5 100644
--- a/src/main/java/org/distorted/objectlib/objects/TwistyDino4.java
+++ b/src/main/java/org/distorted/objectlib/objects/TwistyDino4.java
@@ -41,7 +41,7 @@ public class TwistyDino4 extends TwistyDino
   public TwistyDino4(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh,
                      DistortedEffects effects, int[][] moves, Resources res, int scrWidth)
     {
-    super(size, quat, texture, mesh, effects, moves, ObjectList.DIN4, res, scrWidth);
+    super(size, quat, texture, mesh, effects, moves, res, scrWidth);
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -96,6 +96,13 @@ public class TwistyDino4 extends TwistyDino
     return true;
     }
 
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+  public ObjectList intGetObjectList(int numLayers)
+    {
+    return ObjectList.DIN4_3;
+    }
+
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
   public int getObjectName(int numLayers)
diff --git a/src/main/java/org/distorted/objectlib/objects/TwistyDino6.java b/src/main/java/org/distorted/objectlib/objects/TwistyDino6.java
index 12a90337..c3b3ed0c 100644
--- a/src/main/java/org/distorted/objectlib/objects/TwistyDino6.java
+++ b/src/main/java/org/distorted/objectlib/objects/TwistyDino6.java
@@ -41,7 +41,7 @@ public class TwistyDino6 extends TwistyDino
   public TwistyDino6(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh,
                      DistortedEffects effects, int[][] moves, Resources res, int scrWidth)
     {
-    super(size, quat, texture, mesh, effects, moves, ObjectList.DINO, res, scrWidth);
+    super(size, quat, texture, mesh, effects, moves, res, scrWidth);
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -98,6 +98,13 @@ public class TwistyDino6 extends TwistyDino
     return 2;
     }
 
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+  public ObjectList intGetObjectList(int numLayers)
+    {
+    return ObjectList.DINO_3;
+    }
+
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
   public int getObjectName(int numLayers)
diff --git a/src/main/java/org/distorted/objectlib/objects/TwistyHelicopter.java b/src/main/java/org/distorted/objectlib/objects/TwistyHelicopter.java
index b6567505..181b7ea3 100644
--- a/src/main/java/org/distorted/objectlib/objects/TwistyHelicopter.java
+++ b/src/main/java/org/distorted/objectlib/objects/TwistyHelicopter.java
@@ -79,7 +79,7 @@ public class TwistyHelicopter extends Twisty6
   public TwistyHelicopter(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh,
                           DistortedEffects effects, int[][] moves, Resources res, int scrWidth)
     {
-    super(size, size, quat, texture, mesh, effects, moves, ObjectList.HELI, res, scrWidth);
+    super(size, size, quat, texture, mesh, effects, moves, res, scrWidth);
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -456,6 +456,13 @@ public class TwistyHelicopter extends Twisty6
     return mBasicAngle;
     }
 
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+  public ObjectList intGetObjectList(int numLayers)
+    {
+    return ObjectList.HELI_3;
+    }
+
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
   public int getObjectName(int numLayers)
diff --git a/src/main/java/org/distorted/objectlib/objects/TwistyIvy.java b/src/main/java/org/distorted/objectlib/objects/TwistyIvy.java
index bfd4e748..53e25e8b 100644
--- a/src/main/java/org/distorted/objectlib/objects/TwistyIvy.java
+++ b/src/main/java/org/distorted/objectlib/objects/TwistyIvy.java
@@ -78,7 +78,7 @@ public class TwistyIvy extends Twisty6
   public TwistyIvy(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh,
                    DistortedEffects effects, int[][] moves, Resources res, int scrWidth)
     {
-    super(size, size, quat, texture, mesh, effects, moves, ObjectList.IVY, res, scrWidth);
+    super(size, size, quat, texture, mesh, effects, moves, res, scrWidth);
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -483,6 +483,13 @@ public class TwistyIvy extends Twisty6
     return mBasicAngle;
     }
 
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+  public ObjectList intGetObjectList(int numLayers)
+    {
+    return ObjectList.IVY_2;
+    }
+
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
   public int getObjectName(int numLayers)
diff --git a/src/main/java/org/distorted/objectlib/objects/TwistyJing.java b/src/main/java/org/distorted/objectlib/objects/TwistyJing.java
index c60670ab..b3163e47 100644
--- a/src/main/java/org/distorted/objectlib/objects/TwistyJing.java
+++ b/src/main/java/org/distorted/objectlib/objects/TwistyJing.java
@@ -75,7 +75,7 @@ public class TwistyJing extends Twisty4
   public TwistyJing(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh,
                     DistortedEffects effects, int[][] moves, Resources res, int scrWidth)
     {
-    super(size, size, quat, texture, mesh, effects, moves, ObjectList.JING, res, scrWidth);
+    super(size, size, quat, texture, mesh, effects, moves, res, scrWidth);
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -442,6 +442,13 @@ public class TwistyJing extends Twisty4
     return mBasicAngle;
     }
 
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+  public ObjectList intGetObjectList(int numLayers)
+    {
+    return ObjectList.JING_2;
+    }
+
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
   public int getObjectName(int numLayers)
diff --git a/src/main/java/org/distorted/objectlib/objects/TwistyKilominx.java b/src/main/java/org/distorted/objectlib/objects/TwistyKilominx.java
index cc718752..622b7c39 100644
--- a/src/main/java/org/distorted/objectlib/objects/TwistyKilominx.java
+++ b/src/main/java/org/distorted/objectlib/objects/TwistyKilominx.java
@@ -46,7 +46,7 @@ public class TwistyKilominx extends TwistyMinx
   public TwistyKilominx(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh,
                         DistortedEffects effects, int[][] moves, Resources res, int scrWidth)
     {
-    super(size, size, quat, texture, mesh, effects, moves, ObjectList.KILO, res, scrWidth);
+    super(size, size, quat, texture, mesh, effects, moves, res, scrWidth);
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -514,11 +514,13 @@ public class TwistyKilominx extends TwistyMinx
 
   protected int getNumCubitVariants(int numLayers)
     {
-    int[] sizes = ObjectList.KILO.getSizes();
-    int variants = sizes.length;
-    int highestSize = sizes[variants-1];
+    switch(numLayers)
+      {
+      case 3: return 1;
+      case 5: return 4;
+      }
 
-    return highestSize-1;
+    return 1;
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -537,11 +539,7 @@ public class TwistyKilominx extends TwistyMinx
       return type+1;
       }
 
-    int[] sizes = ObjectList.KILO.getSizes();
-    int variants = sizes.length;
-    int highestSize = sizes[variants-1];
-
-    return highestSize-2;
+    return getNumCubitVariants(numLayers)-1;
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -696,6 +694,19 @@ public class TwistyKilominx extends TwistyMinx
     return 2;
     }
 
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+  public ObjectList intGetObjectList(int numLayers)
+    {
+    switch(numLayers)
+      {
+      case 3: return ObjectList.KILO_3;
+      case 5: return ObjectList.KILO_5;
+      }
+
+    return ObjectList.KILO_3;
+    }
+
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
   public int getObjectName(int numLayers)
diff --git a/src/main/java/org/distorted/objectlib/objects/TwistyMegaminx.java b/src/main/java/org/distorted/objectlib/objects/TwistyMegaminx.java
index 17336459..82d065bf 100644
--- a/src/main/java/org/distorted/objectlib/objects/TwistyMegaminx.java
+++ b/src/main/java/org/distorted/objectlib/objects/TwistyMegaminx.java
@@ -47,7 +47,7 @@ public class TwistyMegaminx extends TwistyMinx
   public TwistyMegaminx(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh,
                         DistortedEffects effects, int[][] moves, Resources res, int scrWidth)
     {
-    super(size, size, quat, texture, mesh, effects, moves, ObjectList.MEGA, res, scrWidth);
+    super(size, size, quat, texture, mesh, effects, moves, res, scrWidth);
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -430,10 +430,13 @@ public class TwistyMegaminx extends TwistyMinx
 
   protected int getNumCubitVariants(int numLayers)
     {
-    int[] sizes = ObjectList.MEGA.getSizes();
-    int variants = sizes.length;
+    switch(numLayers)
+      {
+      case 3: return 3;
+      case 5: return 4;
+      }
 
-    return 2+(sizes[variants-1]-1)/2;
+    return 3;
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -452,11 +455,7 @@ public class TwistyMegaminx extends TwistyMinx
       return type+1;
       }
 
-    int[] sizes = ObjectList.MEGA.getSizes();
-    int variants = sizes.length;
-    int numShapes = 2+(sizes[variants-1]-1)/2;
-
-    return numShapes-1;
+    return getNumCubitVariants(numLayers)-1;
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -602,6 +601,19 @@ public class TwistyMegaminx extends TwistyMinx
     return 4;
     }
 
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+  public ObjectList intGetObjectList(int numLayers)
+    {
+    switch(numLayers)
+      {
+      case 3: return ObjectList.MEGA_3;
+      case 5: return ObjectList.MEGA_5;
+      }
+
+    return ObjectList.MEGA_3;
+    }
+
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
   public int getObjectName(int numLayers)
diff --git a/src/main/java/org/distorted/objectlib/objects/TwistyMinx.java b/src/main/java/org/distorted/objectlib/objects/TwistyMinx.java
index 3f618c36..2c9e1251 100644
--- a/src/main/java/org/distorted/objectlib/objects/TwistyMinx.java
+++ b/src/main/java/org/distorted/objectlib/objects/TwistyMinx.java
@@ -98,9 +98,9 @@ abstract class TwistyMinx extends Twisty12
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
   TwistyMinx(int numLayers, int realSize, Static4D quat, DistortedTexture texture, MeshSquare mesh,
-             DistortedEffects effects, int[][] moves, ObjectList obj, Resources res, int scrWidth)
+             DistortedEffects effects, int[][] moves, Resources res, int scrWidth)
     {
-    super(numLayers, realSize, quat, texture, mesh, effects, moves, obj, res, scrWidth);
+    super(numLayers, realSize, quat, texture, mesh, effects, moves, res, scrWidth);
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/main/java/org/distorted/objectlib/objects/TwistyMirror.java b/src/main/java/org/distorted/objectlib/objects/TwistyMirror.java
index f379d25e..0d8a8175 100644
--- a/src/main/java/org/distorted/objectlib/objects/TwistyMirror.java
+++ b/src/main/java/org/distorted/objectlib/objects/TwistyMirror.java
@@ -89,7 +89,7 @@ public class TwistyMirror extends Twisty6
   public TwistyMirror(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh,
                       DistortedEffects effects, int[][] moves, Resources res, int scrWidth)
     {
-    super(size, size, quat, texture, mesh, effects, moves, ObjectList.MIRR, res, scrWidth);
+    super(size, size, quat, texture, mesh, effects, moves, res, scrWidth);
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -629,6 +629,19 @@ public class TwistyMirror extends Twisty6
     return mBasicAngle;
     }
 
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+  public ObjectList intGetObjectList(int numLayers)
+    {
+    switch(numLayers)
+      {
+      case 2: return ObjectList.MIRR_2;
+      case 3: return ObjectList.MIRR_3;
+      }
+
+    return ObjectList.MIRR_2;
+    }
+
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
   public int getObjectName(int numLayers)
diff --git a/src/main/java/org/distorted/objectlib/objects/TwistyPyraminx.java b/src/main/java/org/distorted/objectlib/objects/TwistyPyraminx.java
index 28f59e26..5581fc2a 100644
--- a/src/main/java/org/distorted/objectlib/objects/TwistyPyraminx.java
+++ b/src/main/java/org/distorted/objectlib/objects/TwistyPyraminx.java
@@ -68,7 +68,7 @@ public class TwistyPyraminx extends Twisty4
   public TwistyPyraminx(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh,
                         DistortedEffects effects, int[][] moves, Resources res, int scrWidth)
     {
-    super(size, size, quat, texture, mesh, effects, moves, ObjectList.PYRA, res, scrWidth);
+    super(size, size, quat, texture, mesh, effects, moves, res, scrWidth);
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -420,6 +420,20 @@ public class TwistyPyraminx extends Twisty4
     return mBasicAngle;
     }
 
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+  public ObjectList intGetObjectList(int numLayers)
+    {
+    switch(numLayers)
+      {
+      case 3: return ObjectList.PYRA_3;
+      case 4: return ObjectList.PYRA_4;
+      case 5: return ObjectList.PYRA_5;
+      }
+
+    return ObjectList.PYRA_3;
+    }
+
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
   public int getObjectName(int numLayers)
diff --git a/src/main/java/org/distorted/objectlib/objects/TwistyRedi.java b/src/main/java/org/distorted/objectlib/objects/TwistyRedi.java
index f6af9bac..97174ea4 100644
--- a/src/main/java/org/distorted/objectlib/objects/TwistyRedi.java
+++ b/src/main/java/org/distorted/objectlib/objects/TwistyRedi.java
@@ -75,7 +75,7 @@ public class TwistyRedi extends Twisty6
   public TwistyRedi(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh,
                     DistortedEffects effects, int[][] moves, Resources res, int scrWidth)
     {
-    super(size, size, quat, texture, mesh, effects, moves, ObjectList.REDI, res, scrWidth);
+    super(size, size, quat, texture, mesh, effects, moves, res, scrWidth);
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -453,6 +453,13 @@ public class TwistyRedi extends Twisty6
     return mBasicAngle;
     }
 
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+  public ObjectList intGetObjectList(int numLayers)
+    {
+    return ObjectList.REDI_3;
+    }
+
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
   public int getObjectName(int numLayers)
diff --git a/src/main/java/org/distorted/objectlib/objects/TwistyRex.java b/src/main/java/org/distorted/objectlib/objects/TwistyRex.java
index 48ca09f7..d0c68890 100644
--- a/src/main/java/org/distorted/objectlib/objects/TwistyRex.java
+++ b/src/main/java/org/distorted/objectlib/objects/TwistyRex.java
@@ -76,7 +76,7 @@ public class TwistyRex extends Twisty6
   public TwistyRex(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh,
                    DistortedEffects effects, int[][] moves, Resources res, int scrWidth)
     {
-    super(size, size, quat, texture, mesh, effects, moves, ObjectList.REX, res, scrWidth);
+    super(size, size, quat, texture, mesh, effects, moves, res, scrWidth);
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -486,6 +486,13 @@ public class TwistyRex extends Twisty6
     return mBasicAngle;
     }
 
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+  public ObjectList intGetObjectList(int numLayers)
+    {
+    return ObjectList.REX_3;
+    }
+
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
   public int getObjectName(int numLayers)
diff --git a/src/main/java/org/distorted/objectlib/objects/TwistySkewb.java b/src/main/java/org/distorted/objectlib/objects/TwistySkewb.java
index 223eac94..f61dae20 100644
--- a/src/main/java/org/distorted/objectlib/objects/TwistySkewb.java
+++ b/src/main/java/org/distorted/objectlib/objects/TwistySkewb.java
@@ -74,7 +74,7 @@ public class TwistySkewb extends Twisty6
   public TwistySkewb(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh,
                      DistortedEffects effects, int[][] moves, Resources res, int scrWidth)
     {
-    super(size, 2*size-2, quat, texture, mesh, effects, moves, ObjectList.SKEW, res, scrWidth);
+    super(size, 2*size-2, quat, texture, mesh, effects, moves, res, scrWidth);
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -595,6 +595,19 @@ public class TwistySkewb extends Twisty6
     return mBasicAngle;
     }
 
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+  public ObjectList intGetObjectList(int numLayers)
+    {
+    switch(numLayers)
+      {
+      case 2: return ObjectList.SKEW_2;
+      case 3: return ObjectList.SKEW_3;
+      }
+
+    return ObjectList.SKEW_2;
+    }
+
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
   public int getObjectName(int numLayers)
diff --git a/src/main/java/org/distorted/objectlib/objects/TwistySquare.java b/src/main/java/org/distorted/objectlib/objects/TwistySquare.java
index 70fc663c..4c400c0f 100644
--- a/src/main/java/org/distorted/objectlib/objects/TwistySquare.java
+++ b/src/main/java/org/distorted/objectlib/objects/TwistySquare.java
@@ -66,9 +66,9 @@ abstract class TwistySquare extends Twisty6
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
   TwistySquare(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh,
-               DistortedEffects effects, int[][] moves, ObjectList obj, Resources res, int scrWidth)
+               DistortedEffects effects, int[][] moves, Resources res, int scrWidth)
     {
-    super(size, size, quat, texture, mesh, effects, moves, obj, res, scrWidth);
+    super(size, size, quat, texture, mesh, effects, moves, res, scrWidth);
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/main/java/org/distorted/objectlib/objects/TwistySquare1.java b/src/main/java/org/distorted/objectlib/objects/TwistySquare1.java
index e5d3b893..a66cab6e 100644
--- a/src/main/java/org/distorted/objectlib/objects/TwistySquare1.java
+++ b/src/main/java/org/distorted/objectlib/objects/TwistySquare1.java
@@ -50,7 +50,7 @@ public class TwistySquare1 extends TwistySquare
   public TwistySquare1(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh,
                        DistortedEffects effects, int[][] moves, Resources res, int scrWidth)
     {
-    super(size, quat, texture, mesh, effects, moves, ObjectList.SQU1, res, scrWidth);
+    super(size, quat, texture, mesh, effects, moves, res, scrWidth);
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -350,6 +350,13 @@ public class TwistySquare1 extends TwistySquare
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PUBLIC API
 
+  public ObjectList intGetObjectList(int numLayers)
+    {
+    return ObjectList.SQU1_3;
+    }
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
   public int getObjectName(int numLayers)
     {
     return R.string.squa1;
diff --git a/src/main/java/org/distorted/objectlib/objects/TwistySquare2.java b/src/main/java/org/distorted/objectlib/objects/TwistySquare2.java
index 26f84f73..6bb9a28e 100644
--- a/src/main/java/org/distorted/objectlib/objects/TwistySquare2.java
+++ b/src/main/java/org/distorted/objectlib/objects/TwistySquare2.java
@@ -50,7 +50,7 @@ public class TwistySquare2 extends TwistySquare
   public TwistySquare2(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh,
                        DistortedEffects effects, int[][] moves, Resources res, int scrWidth)
     {
-    super(size, quat, texture, mesh, effects, moves, ObjectList.SQU2, res, scrWidth);
+    super(size, quat, texture, mesh, effects, moves, res, scrWidth);
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -383,6 +383,13 @@ public class TwistySquare2 extends TwistySquare
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PUBLIC API
 
+  public ObjectList intGetObjectList(int numLayers)
+    {
+    return ObjectList.SQU2_3;
+    }
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
   public int getObjectName(int numLayers)
     {
     return R.string.squa2;
diff --git a/src/main/java/org/distorted/objectlib/objects/TwistyUltimate.java b/src/main/java/org/distorted/objectlib/objects/TwistyUltimate.java
index 5d197dd3..bf1420ce 100644
--- a/src/main/java/org/distorted/objectlib/objects/TwistyUltimate.java
+++ b/src/main/java/org/distorted/objectlib/objects/TwistyUltimate.java
@@ -79,7 +79,7 @@ public class TwistyUltimate extends Twisty12
   public TwistyUltimate(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh,
                         DistortedEffects effects, int[][] moves, Resources res, int scrWidth)
     {
-    super(size, size, quat, texture, mesh, effects, moves, ObjectList.ULTI, res, scrWidth);
+    super(size, size, quat, texture, mesh, effects, moves, res, scrWidth);
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -441,6 +441,13 @@ public class TwistyUltimate extends Twisty12
     return mBasicAngle;
     }
 
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+  public ObjectList intGetObjectList(int numLayers)
+    {
+    return ObjectList.ULTI_2;
+    }
+
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
   public int getObjectName(int numLayers)
diff --git a/src/main/res/drawable-nodpi/big_ban1.png b/src/main/res/drawable-nodpi/big_ban1.png
new file mode 100644
index 00000000..188a6ec4
Binary files /dev/null and b/src/main/res/drawable-nodpi/big_ban1.png differ
diff --git a/src/main/res/drawable-nodpi/big_ban2.png b/src/main/res/drawable-nodpi/big_ban2.png
new file mode 100644
index 00000000..5d7ad6e1
Binary files /dev/null and b/src/main/res/drawable-nodpi/big_ban2.png differ
diff --git a/src/main/res/drawable-nodpi/big_ban3.png b/src/main/res/drawable-nodpi/big_ban3.png
new file mode 100644
index 00000000..b2b5cafd
Binary files /dev/null and b/src/main/res/drawable-nodpi/big_ban3.png differ
diff --git a/src/main/res/drawable-nodpi/big_ban4.png b/src/main/res/drawable-nodpi/big_ban4.png
new file mode 100644
index 00000000..6a1643e5
Binary files /dev/null and b/src/main/res/drawable-nodpi/big_ban4.png differ
diff --git a/src/main/res/drawable-nodpi/big_cube2.png b/src/main/res/drawable-nodpi/big_cube2.png
new file mode 100644
index 00000000..53e89cf2
Binary files /dev/null and b/src/main/res/drawable-nodpi/big_cube2.png differ
diff --git a/src/main/res/drawable-nodpi/big_cube3.png b/src/main/res/drawable-nodpi/big_cube3.png
new file mode 100644
index 00000000..a22d8a4d
Binary files /dev/null and b/src/main/res/drawable-nodpi/big_cube3.png differ
diff --git a/src/main/res/drawable-nodpi/big_cube4.png b/src/main/res/drawable-nodpi/big_cube4.png
new file mode 100644
index 00000000..472b70df
Binary files /dev/null and b/src/main/res/drawable-nodpi/big_cube4.png differ
diff --git a/src/main/res/drawable-nodpi/big_cube5.png b/src/main/res/drawable-nodpi/big_cube5.png
new file mode 100644
index 00000000..46fee585
Binary files /dev/null and b/src/main/res/drawable-nodpi/big_cube5.png differ
diff --git a/src/main/res/drawable-nodpi/big_diam2.png b/src/main/res/drawable-nodpi/big_diam2.png
new file mode 100644
index 00000000..f0c27ea3
Binary files /dev/null and b/src/main/res/drawable-nodpi/big_diam2.png differ
diff --git a/src/main/res/drawable-nodpi/big_diam3.png b/src/main/res/drawable-nodpi/big_diam3.png
new file mode 100644
index 00000000..e5892e7a
Binary files /dev/null and b/src/main/res/drawable-nodpi/big_diam3.png differ
diff --git a/src/main/res/drawable-nodpi/big_diam4.png b/src/main/res/drawable-nodpi/big_diam4.png
new file mode 100644
index 00000000..167b52d0
Binary files /dev/null and b/src/main/res/drawable-nodpi/big_diam4.png differ
diff --git a/src/main/res/drawable-nodpi/big_din4.png b/src/main/res/drawable-nodpi/big_din4.png
new file mode 100644
index 00000000..212fd55b
Binary files /dev/null and b/src/main/res/drawable-nodpi/big_din4.png differ
diff --git a/src/main/res/drawable-nodpi/big_dino.png b/src/main/res/drawable-nodpi/big_dino.png
new file mode 100644
index 00000000..d60ecd88
Binary files /dev/null and b/src/main/res/drawable-nodpi/big_dino.png differ
diff --git a/src/main/res/drawable-nodpi/big_heli.png b/src/main/res/drawable-nodpi/big_heli.png
new file mode 100644
index 00000000..2ec198ac
Binary files /dev/null and b/src/main/res/drawable-nodpi/big_heli.png differ
diff --git a/src/main/res/drawable-nodpi/big_ivy.png b/src/main/res/drawable-nodpi/big_ivy.png
new file mode 100644
index 00000000..dde87775
Binary files /dev/null and b/src/main/res/drawable-nodpi/big_ivy.png differ
diff --git a/src/main/res/drawable-nodpi/big_jing2.png b/src/main/res/drawable-nodpi/big_jing2.png
new file mode 100644
index 00000000..f9f80516
Binary files /dev/null and b/src/main/res/drawable-nodpi/big_jing2.png differ
diff --git a/src/main/res/drawable-nodpi/big_kilo3.png b/src/main/res/drawable-nodpi/big_kilo3.png
new file mode 100644
index 00000000..7e5779fd
Binary files /dev/null and b/src/main/res/drawable-nodpi/big_kilo3.png differ
diff --git a/src/main/res/drawable-nodpi/big_kilo5.png b/src/main/res/drawable-nodpi/big_kilo5.png
new file mode 100644
index 00000000..6ce95cb4
Binary files /dev/null and b/src/main/res/drawable-nodpi/big_kilo5.png differ
diff --git a/src/main/res/drawable-nodpi/big_mega3.png b/src/main/res/drawable-nodpi/big_mega3.png
new file mode 100644
index 00000000..4e7aa6cf
Binary files /dev/null and b/src/main/res/drawable-nodpi/big_mega3.png differ
diff --git a/src/main/res/drawable-nodpi/big_mega5.png b/src/main/res/drawable-nodpi/big_mega5.png
new file mode 100644
index 00000000..0363ee35
Binary files /dev/null and b/src/main/res/drawable-nodpi/big_mega5.png differ
diff --git a/src/main/res/drawable-nodpi/big_mirr2.png b/src/main/res/drawable-nodpi/big_mirr2.png
new file mode 100644
index 00000000..3a5d3e8f
Binary files /dev/null and b/src/main/res/drawable-nodpi/big_mirr2.png differ
diff --git a/src/main/res/drawable-nodpi/big_mirr3.png b/src/main/res/drawable-nodpi/big_mirr3.png
new file mode 100644
index 00000000..d3dcf556
Binary files /dev/null and b/src/main/res/drawable-nodpi/big_mirr3.png differ
diff --git a/src/main/res/drawable-nodpi/big_pyra2.png b/src/main/res/drawable-nodpi/big_pyra2.png
new file mode 100644
index 00000000..11358f12
Binary files /dev/null and b/src/main/res/drawable-nodpi/big_pyra2.png differ
diff --git a/src/main/res/drawable-nodpi/big_pyra3.png b/src/main/res/drawable-nodpi/big_pyra3.png
new file mode 100644
index 00000000..7d76defb
Binary files /dev/null and b/src/main/res/drawable-nodpi/big_pyra3.png differ
diff --git a/src/main/res/drawable-nodpi/big_pyra4.png b/src/main/res/drawable-nodpi/big_pyra4.png
new file mode 100644
index 00000000..a1a7a377
Binary files /dev/null and b/src/main/res/drawable-nodpi/big_pyra4.png differ
diff --git a/src/main/res/drawable-nodpi/big_pyra5.png b/src/main/res/drawable-nodpi/big_pyra5.png
new file mode 100644
index 00000000..fcc4b751
Binary files /dev/null and b/src/main/res/drawable-nodpi/big_pyra5.png differ
diff --git a/src/main/res/drawable-nodpi/big_redi.png b/src/main/res/drawable-nodpi/big_redi.png
new file mode 100644
index 00000000..4f054b9d
Binary files /dev/null and b/src/main/res/drawable-nodpi/big_redi.png differ
diff --git a/src/main/res/drawable-nodpi/big_rex.png b/src/main/res/drawable-nodpi/big_rex.png
new file mode 100644
index 00000000..7703be3d
Binary files /dev/null and b/src/main/res/drawable-nodpi/big_rex.png differ
diff --git a/src/main/res/drawable-nodpi/big_skew2.png b/src/main/res/drawable-nodpi/big_skew2.png
new file mode 100644
index 00000000..654d457c
Binary files /dev/null and b/src/main/res/drawable-nodpi/big_skew2.png differ
diff --git a/src/main/res/drawable-nodpi/big_skew3.png b/src/main/res/drawable-nodpi/big_skew3.png
new file mode 100644
index 00000000..c4072f44
Binary files /dev/null and b/src/main/res/drawable-nodpi/big_skew3.png differ
diff --git a/src/main/res/drawable-nodpi/big_squa1.png b/src/main/res/drawable-nodpi/big_squa1.png
new file mode 100644
index 00000000..92892943
Binary files /dev/null and b/src/main/res/drawable-nodpi/big_squa1.png differ
diff --git a/src/main/res/drawable-nodpi/big_squa2.png b/src/main/res/drawable-nodpi/big_squa2.png
new file mode 100644
index 00000000..f9cfa71d
Binary files /dev/null and b/src/main/res/drawable-nodpi/big_squa2.png differ
diff --git a/src/main/res/drawable-nodpi/big_ulti.png b/src/main/res/drawable-nodpi/big_ulti.png
new file mode 100644
index 00000000..7da0c0e1
Binary files /dev/null and b/src/main/res/drawable-nodpi/big_ulti.png differ
diff --git a/src/main/res/drawable-nodpi/huge_ban1.png b/src/main/res/drawable-nodpi/huge_ban1.png
new file mode 100644
index 00000000..b70e0ba8
Binary files /dev/null and b/src/main/res/drawable-nodpi/huge_ban1.png differ
diff --git a/src/main/res/drawable-nodpi/huge_ban2.png b/src/main/res/drawable-nodpi/huge_ban2.png
new file mode 100644
index 00000000..a6a91af4
Binary files /dev/null and b/src/main/res/drawable-nodpi/huge_ban2.png differ
diff --git a/src/main/res/drawable-nodpi/huge_ban3.png b/src/main/res/drawable-nodpi/huge_ban3.png
new file mode 100644
index 00000000..9312aef7
Binary files /dev/null and b/src/main/res/drawable-nodpi/huge_ban3.png differ
diff --git a/src/main/res/drawable-nodpi/huge_ban4.png b/src/main/res/drawable-nodpi/huge_ban4.png
new file mode 100644
index 00000000..e5f69eed
Binary files /dev/null and b/src/main/res/drawable-nodpi/huge_ban4.png differ
diff --git a/src/main/res/drawable-nodpi/huge_cube2.png b/src/main/res/drawable-nodpi/huge_cube2.png
new file mode 100644
index 00000000..1d541de4
Binary files /dev/null and b/src/main/res/drawable-nodpi/huge_cube2.png differ
diff --git a/src/main/res/drawable-nodpi/huge_cube3.png b/src/main/res/drawable-nodpi/huge_cube3.png
new file mode 100644
index 00000000..1000bb32
Binary files /dev/null and b/src/main/res/drawable-nodpi/huge_cube3.png differ
diff --git a/src/main/res/drawable-nodpi/huge_cube4.png b/src/main/res/drawable-nodpi/huge_cube4.png
new file mode 100644
index 00000000..89ef3641
Binary files /dev/null and b/src/main/res/drawable-nodpi/huge_cube4.png differ
diff --git a/src/main/res/drawable-nodpi/huge_cube5.png b/src/main/res/drawable-nodpi/huge_cube5.png
new file mode 100644
index 00000000..d44cb93c
Binary files /dev/null and b/src/main/res/drawable-nodpi/huge_cube5.png differ
diff --git a/src/main/res/drawable-nodpi/huge_diam2.png b/src/main/res/drawable-nodpi/huge_diam2.png
new file mode 100644
index 00000000..1339c979
Binary files /dev/null and b/src/main/res/drawable-nodpi/huge_diam2.png differ
diff --git a/src/main/res/drawable-nodpi/huge_diam3.png b/src/main/res/drawable-nodpi/huge_diam3.png
new file mode 100644
index 00000000..c7164160
Binary files /dev/null and b/src/main/res/drawable-nodpi/huge_diam3.png differ
diff --git a/src/main/res/drawable-nodpi/huge_diam4.png b/src/main/res/drawable-nodpi/huge_diam4.png
new file mode 100644
index 00000000..6c9d024e
Binary files /dev/null and b/src/main/res/drawable-nodpi/huge_diam4.png differ
diff --git a/src/main/res/drawable-nodpi/huge_din4.png b/src/main/res/drawable-nodpi/huge_din4.png
new file mode 100644
index 00000000..e4388e79
Binary files /dev/null and b/src/main/res/drawable-nodpi/huge_din4.png differ
diff --git a/src/main/res/drawable-nodpi/huge_dino.png b/src/main/res/drawable-nodpi/huge_dino.png
new file mode 100644
index 00000000..af221779
Binary files /dev/null and b/src/main/res/drawable-nodpi/huge_dino.png differ
diff --git a/src/main/res/drawable-nodpi/huge_heli.png b/src/main/res/drawable-nodpi/huge_heli.png
new file mode 100644
index 00000000..a7cfb34a
Binary files /dev/null and b/src/main/res/drawable-nodpi/huge_heli.png differ
diff --git a/src/main/res/drawable-nodpi/huge_ivy.png b/src/main/res/drawable-nodpi/huge_ivy.png
new file mode 100644
index 00000000..f021dc4f
Binary files /dev/null and b/src/main/res/drawable-nodpi/huge_ivy.png differ
diff --git a/src/main/res/drawable-nodpi/huge_jing2.png b/src/main/res/drawable-nodpi/huge_jing2.png
new file mode 100644
index 00000000..ad7bc551
Binary files /dev/null and b/src/main/res/drawable-nodpi/huge_jing2.png differ
diff --git a/src/main/res/drawable-nodpi/huge_kilo3.png b/src/main/res/drawable-nodpi/huge_kilo3.png
new file mode 100644
index 00000000..7babb464
Binary files /dev/null and b/src/main/res/drawable-nodpi/huge_kilo3.png differ
diff --git a/src/main/res/drawable-nodpi/huge_kilo5.png b/src/main/res/drawable-nodpi/huge_kilo5.png
new file mode 100644
index 00000000..a1cabfae
Binary files /dev/null and b/src/main/res/drawable-nodpi/huge_kilo5.png differ
diff --git a/src/main/res/drawable-nodpi/huge_mega3.png b/src/main/res/drawable-nodpi/huge_mega3.png
new file mode 100644
index 00000000..620777b2
Binary files /dev/null and b/src/main/res/drawable-nodpi/huge_mega3.png differ
diff --git a/src/main/res/drawable-nodpi/huge_mega5.png b/src/main/res/drawable-nodpi/huge_mega5.png
new file mode 100644
index 00000000..e86abd24
Binary files /dev/null and b/src/main/res/drawable-nodpi/huge_mega5.png differ
diff --git a/src/main/res/drawable-nodpi/huge_mirr2.png b/src/main/res/drawable-nodpi/huge_mirr2.png
new file mode 100644
index 00000000..a1af6f6a
Binary files /dev/null and b/src/main/res/drawable-nodpi/huge_mirr2.png differ
diff --git a/src/main/res/drawable-nodpi/huge_mirr3.png b/src/main/res/drawable-nodpi/huge_mirr3.png
new file mode 100644
index 00000000..bfa71f6c
Binary files /dev/null and b/src/main/res/drawable-nodpi/huge_mirr3.png differ
diff --git a/src/main/res/drawable-nodpi/huge_pyra2.png b/src/main/res/drawable-nodpi/huge_pyra2.png
new file mode 100644
index 00000000..987469bb
Binary files /dev/null and b/src/main/res/drawable-nodpi/huge_pyra2.png differ
diff --git a/src/main/res/drawable-nodpi/huge_pyra3.png b/src/main/res/drawable-nodpi/huge_pyra3.png
new file mode 100644
index 00000000..b3d64fe1
Binary files /dev/null and b/src/main/res/drawable-nodpi/huge_pyra3.png differ
diff --git a/src/main/res/drawable-nodpi/huge_pyra4.png b/src/main/res/drawable-nodpi/huge_pyra4.png
new file mode 100644
index 00000000..0e55237c
Binary files /dev/null and b/src/main/res/drawable-nodpi/huge_pyra4.png differ
diff --git a/src/main/res/drawable-nodpi/huge_pyra5.png b/src/main/res/drawable-nodpi/huge_pyra5.png
new file mode 100644
index 00000000..7a83df5b
Binary files /dev/null and b/src/main/res/drawable-nodpi/huge_pyra5.png differ
diff --git a/src/main/res/drawable-nodpi/huge_redi.png b/src/main/res/drawable-nodpi/huge_redi.png
new file mode 100644
index 00000000..b6b3502f
Binary files /dev/null and b/src/main/res/drawable-nodpi/huge_redi.png differ
diff --git a/src/main/res/drawable-nodpi/huge_rex.png b/src/main/res/drawable-nodpi/huge_rex.png
new file mode 100644
index 00000000..7b352855
Binary files /dev/null and b/src/main/res/drawable-nodpi/huge_rex.png differ
diff --git a/src/main/res/drawable-nodpi/huge_skew2.png b/src/main/res/drawable-nodpi/huge_skew2.png
new file mode 100644
index 00000000..f431b1e6
Binary files /dev/null and b/src/main/res/drawable-nodpi/huge_skew2.png differ
diff --git a/src/main/res/drawable-nodpi/huge_skew3.png b/src/main/res/drawable-nodpi/huge_skew3.png
new file mode 100644
index 00000000..8c096b81
Binary files /dev/null and b/src/main/res/drawable-nodpi/huge_skew3.png differ
diff --git a/src/main/res/drawable-nodpi/huge_squa1.png b/src/main/res/drawable-nodpi/huge_squa1.png
new file mode 100644
index 00000000..f57d8ec6
Binary files /dev/null and b/src/main/res/drawable-nodpi/huge_squa1.png differ
diff --git a/src/main/res/drawable-nodpi/huge_squa2.png b/src/main/res/drawable-nodpi/huge_squa2.png
new file mode 100644
index 00000000..16772218
Binary files /dev/null and b/src/main/res/drawable-nodpi/huge_squa2.png differ
diff --git a/src/main/res/drawable-nodpi/huge_ulti.png b/src/main/res/drawable-nodpi/huge_ulti.png
new file mode 100644
index 00000000..fcfda055
Binary files /dev/null and b/src/main/res/drawable-nodpi/huge_ulti.png differ
diff --git a/src/main/res/drawable-nodpi/medium_ban1.png b/src/main/res/drawable-nodpi/medium_ban1.png
new file mode 100644
index 00000000..9429379e
Binary files /dev/null and b/src/main/res/drawable-nodpi/medium_ban1.png differ
diff --git a/src/main/res/drawable-nodpi/medium_ban2.png b/src/main/res/drawable-nodpi/medium_ban2.png
new file mode 100644
index 00000000..79ea3141
Binary files /dev/null and b/src/main/res/drawable-nodpi/medium_ban2.png differ
diff --git a/src/main/res/drawable-nodpi/medium_ban3.png b/src/main/res/drawable-nodpi/medium_ban3.png
new file mode 100644
index 00000000..9bc05620
Binary files /dev/null and b/src/main/res/drawable-nodpi/medium_ban3.png differ
diff --git a/src/main/res/drawable-nodpi/medium_ban4.png b/src/main/res/drawable-nodpi/medium_ban4.png
new file mode 100644
index 00000000..4f249d0b
Binary files /dev/null and b/src/main/res/drawable-nodpi/medium_ban4.png differ
diff --git a/src/main/res/drawable-nodpi/medium_cube2.png b/src/main/res/drawable-nodpi/medium_cube2.png
new file mode 100644
index 00000000..e081b29d
Binary files /dev/null and b/src/main/res/drawable-nodpi/medium_cube2.png differ
diff --git a/src/main/res/drawable-nodpi/medium_cube3.png b/src/main/res/drawable-nodpi/medium_cube3.png
new file mode 100644
index 00000000..3c0185d3
Binary files /dev/null and b/src/main/res/drawable-nodpi/medium_cube3.png differ
diff --git a/src/main/res/drawable-nodpi/medium_cube4.png b/src/main/res/drawable-nodpi/medium_cube4.png
new file mode 100644
index 00000000..bf1db71c
Binary files /dev/null and b/src/main/res/drawable-nodpi/medium_cube4.png differ
diff --git a/src/main/res/drawable-nodpi/medium_cube5.png b/src/main/res/drawable-nodpi/medium_cube5.png
new file mode 100644
index 00000000..8efa6dd8
Binary files /dev/null and b/src/main/res/drawable-nodpi/medium_cube5.png differ
diff --git a/src/main/res/drawable-nodpi/medium_diam2.png b/src/main/res/drawable-nodpi/medium_diam2.png
new file mode 100644
index 00000000..c4e4e7ac
Binary files /dev/null and b/src/main/res/drawable-nodpi/medium_diam2.png differ
diff --git a/src/main/res/drawable-nodpi/medium_diam3.png b/src/main/res/drawable-nodpi/medium_diam3.png
new file mode 100644
index 00000000..864864fb
Binary files /dev/null and b/src/main/res/drawable-nodpi/medium_diam3.png differ
diff --git a/src/main/res/drawable-nodpi/medium_diam4.png b/src/main/res/drawable-nodpi/medium_diam4.png
new file mode 100644
index 00000000..5c2822d9
Binary files /dev/null and b/src/main/res/drawable-nodpi/medium_diam4.png differ
diff --git a/src/main/res/drawable-nodpi/medium_din4.png b/src/main/res/drawable-nodpi/medium_din4.png
new file mode 100644
index 00000000..66a81806
Binary files /dev/null and b/src/main/res/drawable-nodpi/medium_din4.png differ
diff --git a/src/main/res/drawable-nodpi/medium_dino.png b/src/main/res/drawable-nodpi/medium_dino.png
new file mode 100644
index 00000000..f4eb1ba4
Binary files /dev/null and b/src/main/res/drawable-nodpi/medium_dino.png differ
diff --git a/src/main/res/drawable-nodpi/medium_heli.png b/src/main/res/drawable-nodpi/medium_heli.png
new file mode 100644
index 00000000..7b917554
Binary files /dev/null and b/src/main/res/drawable-nodpi/medium_heli.png differ
diff --git a/src/main/res/drawable-nodpi/medium_ivy.png b/src/main/res/drawable-nodpi/medium_ivy.png
new file mode 100644
index 00000000..d56a5068
Binary files /dev/null and b/src/main/res/drawable-nodpi/medium_ivy.png differ
diff --git a/src/main/res/drawable-nodpi/medium_jing2.png b/src/main/res/drawable-nodpi/medium_jing2.png
new file mode 100644
index 00000000..6ddc93ea
Binary files /dev/null and b/src/main/res/drawable-nodpi/medium_jing2.png differ
diff --git a/src/main/res/drawable-nodpi/medium_kilo3.png b/src/main/res/drawable-nodpi/medium_kilo3.png
new file mode 100644
index 00000000..99ea4b3d
Binary files /dev/null and b/src/main/res/drawable-nodpi/medium_kilo3.png differ
diff --git a/src/main/res/drawable-nodpi/medium_kilo5.png b/src/main/res/drawable-nodpi/medium_kilo5.png
new file mode 100644
index 00000000..940cac29
Binary files /dev/null and b/src/main/res/drawable-nodpi/medium_kilo5.png differ
diff --git a/src/main/res/drawable-nodpi/medium_mega3.png b/src/main/res/drawable-nodpi/medium_mega3.png
new file mode 100644
index 00000000..f1611980
Binary files /dev/null and b/src/main/res/drawable-nodpi/medium_mega3.png differ
diff --git a/src/main/res/drawable-nodpi/medium_mega5.png b/src/main/res/drawable-nodpi/medium_mega5.png
new file mode 100644
index 00000000..7337cb03
Binary files /dev/null and b/src/main/res/drawable-nodpi/medium_mega5.png differ
diff --git a/src/main/res/drawable-nodpi/medium_mirr2.png b/src/main/res/drawable-nodpi/medium_mirr2.png
new file mode 100644
index 00000000..123eafd9
Binary files /dev/null and b/src/main/res/drawable-nodpi/medium_mirr2.png differ
diff --git a/src/main/res/drawable-nodpi/medium_mirr3.png b/src/main/res/drawable-nodpi/medium_mirr3.png
new file mode 100644
index 00000000..f17bad5e
Binary files /dev/null and b/src/main/res/drawable-nodpi/medium_mirr3.png differ
diff --git a/src/main/res/drawable-nodpi/medium_pyra2.png b/src/main/res/drawable-nodpi/medium_pyra2.png
new file mode 100644
index 00000000..d11cf90e
Binary files /dev/null and b/src/main/res/drawable-nodpi/medium_pyra2.png differ
diff --git a/src/main/res/drawable-nodpi/medium_pyra3.png b/src/main/res/drawable-nodpi/medium_pyra3.png
new file mode 100644
index 00000000..61ebdbc4
Binary files /dev/null and b/src/main/res/drawable-nodpi/medium_pyra3.png differ
diff --git a/src/main/res/drawable-nodpi/medium_pyra4.png b/src/main/res/drawable-nodpi/medium_pyra4.png
new file mode 100644
index 00000000..6bb90d54
Binary files /dev/null and b/src/main/res/drawable-nodpi/medium_pyra4.png differ
diff --git a/src/main/res/drawable-nodpi/medium_pyra5.png b/src/main/res/drawable-nodpi/medium_pyra5.png
new file mode 100644
index 00000000..569ab4fe
Binary files /dev/null and b/src/main/res/drawable-nodpi/medium_pyra5.png differ
diff --git a/src/main/res/drawable-nodpi/medium_redi.png b/src/main/res/drawable-nodpi/medium_redi.png
new file mode 100644
index 00000000..0adaa838
Binary files /dev/null and b/src/main/res/drawable-nodpi/medium_redi.png differ
diff --git a/src/main/res/drawable-nodpi/medium_rex.png b/src/main/res/drawable-nodpi/medium_rex.png
new file mode 100644
index 00000000..6c861927
Binary files /dev/null and b/src/main/res/drawable-nodpi/medium_rex.png differ
diff --git a/src/main/res/drawable-nodpi/medium_skew2.png b/src/main/res/drawable-nodpi/medium_skew2.png
new file mode 100644
index 00000000..1dd3b3ef
Binary files /dev/null and b/src/main/res/drawable-nodpi/medium_skew2.png differ
diff --git a/src/main/res/drawable-nodpi/medium_skew3.png b/src/main/res/drawable-nodpi/medium_skew3.png
new file mode 100644
index 00000000..bf6c510b
Binary files /dev/null and b/src/main/res/drawable-nodpi/medium_skew3.png differ
diff --git a/src/main/res/drawable-nodpi/medium_squa1.png b/src/main/res/drawable-nodpi/medium_squa1.png
new file mode 100644
index 00000000..ed4e7c56
Binary files /dev/null and b/src/main/res/drawable-nodpi/medium_squa1.png differ
diff --git a/src/main/res/drawable-nodpi/medium_squa2.png b/src/main/res/drawable-nodpi/medium_squa2.png
new file mode 100644
index 00000000..37312fdf
Binary files /dev/null and b/src/main/res/drawable-nodpi/medium_squa2.png differ
diff --git a/src/main/res/drawable-nodpi/medium_ulti.png b/src/main/res/drawable-nodpi/medium_ulti.png
new file mode 100644
index 00000000..5a3d3d16
Binary files /dev/null and b/src/main/res/drawable-nodpi/medium_ulti.png differ
diff --git a/src/main/res/drawable-nodpi/small_ban1.png b/src/main/res/drawable-nodpi/small_ban1.png
new file mode 100644
index 00000000..579fd1bb
Binary files /dev/null and b/src/main/res/drawable-nodpi/small_ban1.png differ
diff --git a/src/main/res/drawable-nodpi/small_ban2.png b/src/main/res/drawable-nodpi/small_ban2.png
new file mode 100644
index 00000000..543bf379
Binary files /dev/null and b/src/main/res/drawable-nodpi/small_ban2.png differ
diff --git a/src/main/res/drawable-nodpi/small_ban3.png b/src/main/res/drawable-nodpi/small_ban3.png
new file mode 100644
index 00000000..105def04
Binary files /dev/null and b/src/main/res/drawable-nodpi/small_ban3.png differ
diff --git a/src/main/res/drawable-nodpi/small_ban4.png b/src/main/res/drawable-nodpi/small_ban4.png
new file mode 100644
index 00000000..416c2c9a
Binary files /dev/null and b/src/main/res/drawable-nodpi/small_ban4.png differ
diff --git a/src/main/res/drawable-nodpi/small_cube2.png b/src/main/res/drawable-nodpi/small_cube2.png
new file mode 100644
index 00000000..eb781e64
Binary files /dev/null and b/src/main/res/drawable-nodpi/small_cube2.png differ
diff --git a/src/main/res/drawable-nodpi/small_cube3.png b/src/main/res/drawable-nodpi/small_cube3.png
new file mode 100644
index 00000000..dae0f164
Binary files /dev/null and b/src/main/res/drawable-nodpi/small_cube3.png differ
diff --git a/src/main/res/drawable-nodpi/small_cube4.png b/src/main/res/drawable-nodpi/small_cube4.png
new file mode 100644
index 00000000..c37a2e75
Binary files /dev/null and b/src/main/res/drawable-nodpi/small_cube4.png differ
diff --git a/src/main/res/drawable-nodpi/small_cube5.png b/src/main/res/drawable-nodpi/small_cube5.png
new file mode 100644
index 00000000..c6c5ff3a
Binary files /dev/null and b/src/main/res/drawable-nodpi/small_cube5.png differ
diff --git a/src/main/res/drawable-nodpi/small_diam2.png b/src/main/res/drawable-nodpi/small_diam2.png
new file mode 100644
index 00000000..1c849467
Binary files /dev/null and b/src/main/res/drawable-nodpi/small_diam2.png differ
diff --git a/src/main/res/drawable-nodpi/small_diam3.png b/src/main/res/drawable-nodpi/small_diam3.png
new file mode 100644
index 00000000..d8b719ec
Binary files /dev/null and b/src/main/res/drawable-nodpi/small_diam3.png differ
diff --git a/src/main/res/drawable-nodpi/small_diam4.png b/src/main/res/drawable-nodpi/small_diam4.png
new file mode 100644
index 00000000..a8b13ead
Binary files /dev/null and b/src/main/res/drawable-nodpi/small_diam4.png differ
diff --git a/src/main/res/drawable-nodpi/small_din4.png b/src/main/res/drawable-nodpi/small_din4.png
new file mode 100644
index 00000000..8c68e947
Binary files /dev/null and b/src/main/res/drawable-nodpi/small_din4.png differ
diff --git a/src/main/res/drawable-nodpi/small_dino.png b/src/main/res/drawable-nodpi/small_dino.png
new file mode 100644
index 00000000..7b81d9d8
Binary files /dev/null and b/src/main/res/drawable-nodpi/small_dino.png differ
diff --git a/src/main/res/drawable-nodpi/small_heli.png b/src/main/res/drawable-nodpi/small_heli.png
new file mode 100644
index 00000000..f39099c8
Binary files /dev/null and b/src/main/res/drawable-nodpi/small_heli.png differ
diff --git a/src/main/res/drawable-nodpi/small_ivy.png b/src/main/res/drawable-nodpi/small_ivy.png
new file mode 100644
index 00000000..ccb45204
Binary files /dev/null and b/src/main/res/drawable-nodpi/small_ivy.png differ
diff --git a/src/main/res/drawable-nodpi/small_jing2.png b/src/main/res/drawable-nodpi/small_jing2.png
new file mode 100644
index 00000000..20c31754
Binary files /dev/null and b/src/main/res/drawable-nodpi/small_jing2.png differ
diff --git a/src/main/res/drawable-nodpi/small_kilo3.png b/src/main/res/drawable-nodpi/small_kilo3.png
new file mode 100644
index 00000000..5895fcb8
Binary files /dev/null and b/src/main/res/drawable-nodpi/small_kilo3.png differ
diff --git a/src/main/res/drawable-nodpi/small_kilo5.png b/src/main/res/drawable-nodpi/small_kilo5.png
new file mode 100644
index 00000000..87616aa7
Binary files /dev/null and b/src/main/res/drawable-nodpi/small_kilo5.png differ
diff --git a/src/main/res/drawable-nodpi/small_mega3.png b/src/main/res/drawable-nodpi/small_mega3.png
new file mode 100644
index 00000000..09e6b796
Binary files /dev/null and b/src/main/res/drawable-nodpi/small_mega3.png differ
diff --git a/src/main/res/drawable-nodpi/small_mega5.png b/src/main/res/drawable-nodpi/small_mega5.png
new file mode 100644
index 00000000..618d2508
Binary files /dev/null and b/src/main/res/drawable-nodpi/small_mega5.png differ
diff --git a/src/main/res/drawable-nodpi/small_mirr2.png b/src/main/res/drawable-nodpi/small_mirr2.png
new file mode 100644
index 00000000..f47570aa
Binary files /dev/null and b/src/main/res/drawable-nodpi/small_mirr2.png differ
diff --git a/src/main/res/drawable-nodpi/small_mirr3.png b/src/main/res/drawable-nodpi/small_mirr3.png
new file mode 100644
index 00000000..7fcb8b67
Binary files /dev/null and b/src/main/res/drawable-nodpi/small_mirr3.png differ
diff --git a/src/main/res/drawable-nodpi/small_pyra2.png b/src/main/res/drawable-nodpi/small_pyra2.png
new file mode 100644
index 00000000..239d380a
Binary files /dev/null and b/src/main/res/drawable-nodpi/small_pyra2.png differ
diff --git a/src/main/res/drawable-nodpi/small_pyra3.png b/src/main/res/drawable-nodpi/small_pyra3.png
new file mode 100644
index 00000000..e7fa6640
Binary files /dev/null and b/src/main/res/drawable-nodpi/small_pyra3.png differ
diff --git a/src/main/res/drawable-nodpi/small_pyra4.png b/src/main/res/drawable-nodpi/small_pyra4.png
new file mode 100644
index 00000000..11b2e7fa
Binary files /dev/null and b/src/main/res/drawable-nodpi/small_pyra4.png differ
diff --git a/src/main/res/drawable-nodpi/small_pyra5.png b/src/main/res/drawable-nodpi/small_pyra5.png
new file mode 100644
index 00000000..55aa5dba
Binary files /dev/null and b/src/main/res/drawable-nodpi/small_pyra5.png differ
diff --git a/src/main/res/drawable-nodpi/small_redi.png b/src/main/res/drawable-nodpi/small_redi.png
new file mode 100644
index 00000000..16db11a8
Binary files /dev/null and b/src/main/res/drawable-nodpi/small_redi.png differ
diff --git a/src/main/res/drawable-nodpi/small_rex.png b/src/main/res/drawable-nodpi/small_rex.png
new file mode 100644
index 00000000..0e6513cb
Binary files /dev/null and b/src/main/res/drawable-nodpi/small_rex.png differ
diff --git a/src/main/res/drawable-nodpi/small_skew2.png b/src/main/res/drawable-nodpi/small_skew2.png
new file mode 100644
index 00000000..e7d5f56a
Binary files /dev/null and b/src/main/res/drawable-nodpi/small_skew2.png differ
diff --git a/src/main/res/drawable-nodpi/small_skew3.png b/src/main/res/drawable-nodpi/small_skew3.png
new file mode 100644
index 00000000..8d675a93
Binary files /dev/null and b/src/main/res/drawable-nodpi/small_skew3.png differ
diff --git a/src/main/res/drawable-nodpi/small_squa1.png b/src/main/res/drawable-nodpi/small_squa1.png
new file mode 100644
index 00000000..f53f0b56
Binary files /dev/null and b/src/main/res/drawable-nodpi/small_squa1.png differ
diff --git a/src/main/res/drawable-nodpi/small_squa2.png b/src/main/res/drawable-nodpi/small_squa2.png
new file mode 100644
index 00000000..9d2757b3
Binary files /dev/null and b/src/main/res/drawable-nodpi/small_squa2.png differ
diff --git a/src/main/res/drawable-nodpi/small_ulti.png b/src/main/res/drawable-nodpi/small_ulti.png
new file mode 100644
index 00000000..1b5c4be6
Binary files /dev/null and b/src/main/res/drawable-nodpi/small_ulti.png differ
diff --git a/src/main/res/drawable-nodpi/ui_big_ban1.png b/src/main/res/drawable-nodpi/ui_big_ban1.png
deleted file mode 100644
index 188a6ec4..00000000
Binary files a/src/main/res/drawable-nodpi/ui_big_ban1.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_big_ban2.png b/src/main/res/drawable-nodpi/ui_big_ban2.png
deleted file mode 100644
index 5d7ad6e1..00000000
Binary files a/src/main/res/drawable-nodpi/ui_big_ban2.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_big_ban3.png b/src/main/res/drawable-nodpi/ui_big_ban3.png
deleted file mode 100644
index b2b5cafd..00000000
Binary files a/src/main/res/drawable-nodpi/ui_big_ban3.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_big_ban4.png b/src/main/res/drawable-nodpi/ui_big_ban4.png
deleted file mode 100644
index 6a1643e5..00000000
Binary files a/src/main/res/drawable-nodpi/ui_big_ban4.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_big_cube2.png b/src/main/res/drawable-nodpi/ui_big_cube2.png
deleted file mode 100644
index 53e89cf2..00000000
Binary files a/src/main/res/drawable-nodpi/ui_big_cube2.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_big_cube3.png b/src/main/res/drawable-nodpi/ui_big_cube3.png
deleted file mode 100644
index a22d8a4d..00000000
Binary files a/src/main/res/drawable-nodpi/ui_big_cube3.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_big_cube4.png b/src/main/res/drawable-nodpi/ui_big_cube4.png
deleted file mode 100644
index 472b70df..00000000
Binary files a/src/main/res/drawable-nodpi/ui_big_cube4.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_big_cube5.png b/src/main/res/drawable-nodpi/ui_big_cube5.png
deleted file mode 100644
index 46fee585..00000000
Binary files a/src/main/res/drawable-nodpi/ui_big_cube5.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_big_diam2.png b/src/main/res/drawable-nodpi/ui_big_diam2.png
deleted file mode 100644
index f0c27ea3..00000000
Binary files a/src/main/res/drawable-nodpi/ui_big_diam2.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_big_diam3.png b/src/main/res/drawable-nodpi/ui_big_diam3.png
deleted file mode 100644
index e5892e7a..00000000
Binary files a/src/main/res/drawable-nodpi/ui_big_diam3.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_big_diam4.png b/src/main/res/drawable-nodpi/ui_big_diam4.png
deleted file mode 100644
index 167b52d0..00000000
Binary files a/src/main/res/drawable-nodpi/ui_big_diam4.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_big_din4.png b/src/main/res/drawable-nodpi/ui_big_din4.png
deleted file mode 100644
index 212fd55b..00000000
Binary files a/src/main/res/drawable-nodpi/ui_big_din4.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_big_dino.png b/src/main/res/drawable-nodpi/ui_big_dino.png
deleted file mode 100644
index d60ecd88..00000000
Binary files a/src/main/res/drawable-nodpi/ui_big_dino.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_big_heli.png b/src/main/res/drawable-nodpi/ui_big_heli.png
deleted file mode 100644
index 2ec198ac..00000000
Binary files a/src/main/res/drawable-nodpi/ui_big_heli.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_big_ivy.png b/src/main/res/drawable-nodpi/ui_big_ivy.png
deleted file mode 100644
index dde87775..00000000
Binary files a/src/main/res/drawable-nodpi/ui_big_ivy.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_big_jing2.png b/src/main/res/drawable-nodpi/ui_big_jing2.png
deleted file mode 100644
index f9f80516..00000000
Binary files a/src/main/res/drawable-nodpi/ui_big_jing2.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_big_kilo3.png b/src/main/res/drawable-nodpi/ui_big_kilo3.png
deleted file mode 100644
index 7e5779fd..00000000
Binary files a/src/main/res/drawable-nodpi/ui_big_kilo3.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_big_kilo5.png b/src/main/res/drawable-nodpi/ui_big_kilo5.png
deleted file mode 100644
index 6ce95cb4..00000000
Binary files a/src/main/res/drawable-nodpi/ui_big_kilo5.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_big_mega3.png b/src/main/res/drawable-nodpi/ui_big_mega3.png
deleted file mode 100644
index 4e7aa6cf..00000000
Binary files a/src/main/res/drawable-nodpi/ui_big_mega3.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_big_mega5.png b/src/main/res/drawable-nodpi/ui_big_mega5.png
deleted file mode 100644
index 0363ee35..00000000
Binary files a/src/main/res/drawable-nodpi/ui_big_mega5.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_big_mirr2.png b/src/main/res/drawable-nodpi/ui_big_mirr2.png
deleted file mode 100644
index 3a5d3e8f..00000000
Binary files a/src/main/res/drawable-nodpi/ui_big_mirr2.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_big_mirr3.png b/src/main/res/drawable-nodpi/ui_big_mirr3.png
deleted file mode 100644
index d3dcf556..00000000
Binary files a/src/main/res/drawable-nodpi/ui_big_mirr3.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_big_pyra2.png b/src/main/res/drawable-nodpi/ui_big_pyra2.png
deleted file mode 100644
index 11358f12..00000000
Binary files a/src/main/res/drawable-nodpi/ui_big_pyra2.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_big_pyra3.png b/src/main/res/drawable-nodpi/ui_big_pyra3.png
deleted file mode 100644
index 7d76defb..00000000
Binary files a/src/main/res/drawable-nodpi/ui_big_pyra3.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_big_pyra4.png b/src/main/res/drawable-nodpi/ui_big_pyra4.png
deleted file mode 100644
index a1a7a377..00000000
Binary files a/src/main/res/drawable-nodpi/ui_big_pyra4.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_big_pyra5.png b/src/main/res/drawable-nodpi/ui_big_pyra5.png
deleted file mode 100644
index fcc4b751..00000000
Binary files a/src/main/res/drawable-nodpi/ui_big_pyra5.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_big_redi.png b/src/main/res/drawable-nodpi/ui_big_redi.png
deleted file mode 100644
index 4f054b9d..00000000
Binary files a/src/main/res/drawable-nodpi/ui_big_redi.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_big_rex.png b/src/main/res/drawable-nodpi/ui_big_rex.png
deleted file mode 100644
index 7703be3d..00000000
Binary files a/src/main/res/drawable-nodpi/ui_big_rex.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_big_skew2.png b/src/main/res/drawable-nodpi/ui_big_skew2.png
deleted file mode 100644
index 654d457c..00000000
Binary files a/src/main/res/drawable-nodpi/ui_big_skew2.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_big_skew3.png b/src/main/res/drawable-nodpi/ui_big_skew3.png
deleted file mode 100644
index c4072f44..00000000
Binary files a/src/main/res/drawable-nodpi/ui_big_skew3.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_big_squa1.png b/src/main/res/drawable-nodpi/ui_big_squa1.png
deleted file mode 100644
index 92892943..00000000
Binary files a/src/main/res/drawable-nodpi/ui_big_squa1.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_big_squa2.png b/src/main/res/drawable-nodpi/ui_big_squa2.png
deleted file mode 100644
index f9cfa71d..00000000
Binary files a/src/main/res/drawable-nodpi/ui_big_squa2.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_big_ulti.png b/src/main/res/drawable-nodpi/ui_big_ulti.png
deleted file mode 100644
index 7da0c0e1..00000000
Binary files a/src/main/res/drawable-nodpi/ui_big_ulti.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_huge_ban1.png b/src/main/res/drawable-nodpi/ui_huge_ban1.png
deleted file mode 100644
index b70e0ba8..00000000
Binary files a/src/main/res/drawable-nodpi/ui_huge_ban1.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_huge_ban2.png b/src/main/res/drawable-nodpi/ui_huge_ban2.png
deleted file mode 100644
index a6a91af4..00000000
Binary files a/src/main/res/drawable-nodpi/ui_huge_ban2.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_huge_ban3.png b/src/main/res/drawable-nodpi/ui_huge_ban3.png
deleted file mode 100644
index 9312aef7..00000000
Binary files a/src/main/res/drawable-nodpi/ui_huge_ban3.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_huge_ban4.png b/src/main/res/drawable-nodpi/ui_huge_ban4.png
deleted file mode 100644
index e5f69eed..00000000
Binary files a/src/main/res/drawable-nodpi/ui_huge_ban4.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_huge_cube2.png b/src/main/res/drawable-nodpi/ui_huge_cube2.png
deleted file mode 100644
index 1d541de4..00000000
Binary files a/src/main/res/drawable-nodpi/ui_huge_cube2.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_huge_cube3.png b/src/main/res/drawable-nodpi/ui_huge_cube3.png
deleted file mode 100644
index 1000bb32..00000000
Binary files a/src/main/res/drawable-nodpi/ui_huge_cube3.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_huge_cube4.png b/src/main/res/drawable-nodpi/ui_huge_cube4.png
deleted file mode 100644
index 89ef3641..00000000
Binary files a/src/main/res/drawable-nodpi/ui_huge_cube4.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_huge_cube5.png b/src/main/res/drawable-nodpi/ui_huge_cube5.png
deleted file mode 100644
index d44cb93c..00000000
Binary files a/src/main/res/drawable-nodpi/ui_huge_cube5.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_huge_diam2.png b/src/main/res/drawable-nodpi/ui_huge_diam2.png
deleted file mode 100644
index 1339c979..00000000
Binary files a/src/main/res/drawable-nodpi/ui_huge_diam2.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_huge_diam3.png b/src/main/res/drawable-nodpi/ui_huge_diam3.png
deleted file mode 100644
index c7164160..00000000
Binary files a/src/main/res/drawable-nodpi/ui_huge_diam3.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_huge_diam4.png b/src/main/res/drawable-nodpi/ui_huge_diam4.png
deleted file mode 100644
index 6c9d024e..00000000
Binary files a/src/main/res/drawable-nodpi/ui_huge_diam4.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_huge_din4.png b/src/main/res/drawable-nodpi/ui_huge_din4.png
deleted file mode 100644
index e4388e79..00000000
Binary files a/src/main/res/drawable-nodpi/ui_huge_din4.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_huge_dino.png b/src/main/res/drawable-nodpi/ui_huge_dino.png
deleted file mode 100644
index af221779..00000000
Binary files a/src/main/res/drawable-nodpi/ui_huge_dino.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_huge_heli.png b/src/main/res/drawable-nodpi/ui_huge_heli.png
deleted file mode 100644
index a7cfb34a..00000000
Binary files a/src/main/res/drawable-nodpi/ui_huge_heli.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_huge_ivy.png b/src/main/res/drawable-nodpi/ui_huge_ivy.png
deleted file mode 100644
index f021dc4f..00000000
Binary files a/src/main/res/drawable-nodpi/ui_huge_ivy.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_huge_jing2.png b/src/main/res/drawable-nodpi/ui_huge_jing2.png
deleted file mode 100644
index ad7bc551..00000000
Binary files a/src/main/res/drawable-nodpi/ui_huge_jing2.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_huge_kilo3.png b/src/main/res/drawable-nodpi/ui_huge_kilo3.png
deleted file mode 100644
index 7babb464..00000000
Binary files a/src/main/res/drawable-nodpi/ui_huge_kilo3.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_huge_kilo5.png b/src/main/res/drawable-nodpi/ui_huge_kilo5.png
deleted file mode 100644
index a1cabfae..00000000
Binary files a/src/main/res/drawable-nodpi/ui_huge_kilo5.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_huge_mega3.png b/src/main/res/drawable-nodpi/ui_huge_mega3.png
deleted file mode 100644
index 620777b2..00000000
Binary files a/src/main/res/drawable-nodpi/ui_huge_mega3.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_huge_mega5.png b/src/main/res/drawable-nodpi/ui_huge_mega5.png
deleted file mode 100644
index e86abd24..00000000
Binary files a/src/main/res/drawable-nodpi/ui_huge_mega5.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_huge_mirr2.png b/src/main/res/drawable-nodpi/ui_huge_mirr2.png
deleted file mode 100644
index a1af6f6a..00000000
Binary files a/src/main/res/drawable-nodpi/ui_huge_mirr2.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_huge_mirr3.png b/src/main/res/drawable-nodpi/ui_huge_mirr3.png
deleted file mode 100644
index bfa71f6c..00000000
Binary files a/src/main/res/drawable-nodpi/ui_huge_mirr3.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_huge_pyra2.png b/src/main/res/drawable-nodpi/ui_huge_pyra2.png
deleted file mode 100644
index 987469bb..00000000
Binary files a/src/main/res/drawable-nodpi/ui_huge_pyra2.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_huge_pyra3.png b/src/main/res/drawable-nodpi/ui_huge_pyra3.png
deleted file mode 100644
index b3d64fe1..00000000
Binary files a/src/main/res/drawable-nodpi/ui_huge_pyra3.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_huge_pyra4.png b/src/main/res/drawable-nodpi/ui_huge_pyra4.png
deleted file mode 100644
index 0e55237c..00000000
Binary files a/src/main/res/drawable-nodpi/ui_huge_pyra4.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_huge_pyra5.png b/src/main/res/drawable-nodpi/ui_huge_pyra5.png
deleted file mode 100644
index 7a83df5b..00000000
Binary files a/src/main/res/drawable-nodpi/ui_huge_pyra5.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_huge_redi.png b/src/main/res/drawable-nodpi/ui_huge_redi.png
deleted file mode 100644
index b6b3502f..00000000
Binary files a/src/main/res/drawable-nodpi/ui_huge_redi.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_huge_rex.png b/src/main/res/drawable-nodpi/ui_huge_rex.png
deleted file mode 100644
index 7b352855..00000000
Binary files a/src/main/res/drawable-nodpi/ui_huge_rex.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_huge_skew2.png b/src/main/res/drawable-nodpi/ui_huge_skew2.png
deleted file mode 100644
index f431b1e6..00000000
Binary files a/src/main/res/drawable-nodpi/ui_huge_skew2.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_huge_skew3.png b/src/main/res/drawable-nodpi/ui_huge_skew3.png
deleted file mode 100644
index 8c096b81..00000000
Binary files a/src/main/res/drawable-nodpi/ui_huge_skew3.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_huge_squa1.png b/src/main/res/drawable-nodpi/ui_huge_squa1.png
deleted file mode 100644
index f57d8ec6..00000000
Binary files a/src/main/res/drawable-nodpi/ui_huge_squa1.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_huge_squa2.png b/src/main/res/drawable-nodpi/ui_huge_squa2.png
deleted file mode 100644
index 16772218..00000000
Binary files a/src/main/res/drawable-nodpi/ui_huge_squa2.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_huge_ulti.png b/src/main/res/drawable-nodpi/ui_huge_ulti.png
deleted file mode 100644
index fcfda055..00000000
Binary files a/src/main/res/drawable-nodpi/ui_huge_ulti.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_medium_ban1.png b/src/main/res/drawable-nodpi/ui_medium_ban1.png
deleted file mode 100644
index 9429379e..00000000
Binary files a/src/main/res/drawable-nodpi/ui_medium_ban1.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_medium_ban2.png b/src/main/res/drawable-nodpi/ui_medium_ban2.png
deleted file mode 100644
index 79ea3141..00000000
Binary files a/src/main/res/drawable-nodpi/ui_medium_ban2.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_medium_ban3.png b/src/main/res/drawable-nodpi/ui_medium_ban3.png
deleted file mode 100644
index 9bc05620..00000000
Binary files a/src/main/res/drawable-nodpi/ui_medium_ban3.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_medium_ban4.png b/src/main/res/drawable-nodpi/ui_medium_ban4.png
deleted file mode 100644
index 4f249d0b..00000000
Binary files a/src/main/res/drawable-nodpi/ui_medium_ban4.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_medium_cube2.png b/src/main/res/drawable-nodpi/ui_medium_cube2.png
deleted file mode 100644
index e081b29d..00000000
Binary files a/src/main/res/drawable-nodpi/ui_medium_cube2.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_medium_cube3.png b/src/main/res/drawable-nodpi/ui_medium_cube3.png
deleted file mode 100644
index 3c0185d3..00000000
Binary files a/src/main/res/drawable-nodpi/ui_medium_cube3.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_medium_cube4.png b/src/main/res/drawable-nodpi/ui_medium_cube4.png
deleted file mode 100644
index bf1db71c..00000000
Binary files a/src/main/res/drawable-nodpi/ui_medium_cube4.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_medium_cube5.png b/src/main/res/drawable-nodpi/ui_medium_cube5.png
deleted file mode 100644
index 8efa6dd8..00000000
Binary files a/src/main/res/drawable-nodpi/ui_medium_cube5.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_medium_diam2.png b/src/main/res/drawable-nodpi/ui_medium_diam2.png
deleted file mode 100644
index c4e4e7ac..00000000
Binary files a/src/main/res/drawable-nodpi/ui_medium_diam2.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_medium_diam3.png b/src/main/res/drawable-nodpi/ui_medium_diam3.png
deleted file mode 100644
index 864864fb..00000000
Binary files a/src/main/res/drawable-nodpi/ui_medium_diam3.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_medium_diam4.png b/src/main/res/drawable-nodpi/ui_medium_diam4.png
deleted file mode 100644
index 5c2822d9..00000000
Binary files a/src/main/res/drawable-nodpi/ui_medium_diam4.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_medium_din4.png b/src/main/res/drawable-nodpi/ui_medium_din4.png
deleted file mode 100644
index 66a81806..00000000
Binary files a/src/main/res/drawable-nodpi/ui_medium_din4.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_medium_dino.png b/src/main/res/drawable-nodpi/ui_medium_dino.png
deleted file mode 100644
index f4eb1ba4..00000000
Binary files a/src/main/res/drawable-nodpi/ui_medium_dino.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_medium_heli.png b/src/main/res/drawable-nodpi/ui_medium_heli.png
deleted file mode 100644
index 7b917554..00000000
Binary files a/src/main/res/drawable-nodpi/ui_medium_heli.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_medium_ivy.png b/src/main/res/drawable-nodpi/ui_medium_ivy.png
deleted file mode 100644
index d56a5068..00000000
Binary files a/src/main/res/drawable-nodpi/ui_medium_ivy.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_medium_jing2.png b/src/main/res/drawable-nodpi/ui_medium_jing2.png
deleted file mode 100644
index 6ddc93ea..00000000
Binary files a/src/main/res/drawable-nodpi/ui_medium_jing2.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_medium_kilo3.png b/src/main/res/drawable-nodpi/ui_medium_kilo3.png
deleted file mode 100644
index 99ea4b3d..00000000
Binary files a/src/main/res/drawable-nodpi/ui_medium_kilo3.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_medium_kilo5.png b/src/main/res/drawable-nodpi/ui_medium_kilo5.png
deleted file mode 100644
index 940cac29..00000000
Binary files a/src/main/res/drawable-nodpi/ui_medium_kilo5.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_medium_mega3.png b/src/main/res/drawable-nodpi/ui_medium_mega3.png
deleted file mode 100644
index f1611980..00000000
Binary files a/src/main/res/drawable-nodpi/ui_medium_mega3.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_medium_mega5.png b/src/main/res/drawable-nodpi/ui_medium_mega5.png
deleted file mode 100644
index 7337cb03..00000000
Binary files a/src/main/res/drawable-nodpi/ui_medium_mega5.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_medium_mirr2.png b/src/main/res/drawable-nodpi/ui_medium_mirr2.png
deleted file mode 100644
index 123eafd9..00000000
Binary files a/src/main/res/drawable-nodpi/ui_medium_mirr2.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_medium_mirr3.png b/src/main/res/drawable-nodpi/ui_medium_mirr3.png
deleted file mode 100644
index f17bad5e..00000000
Binary files a/src/main/res/drawable-nodpi/ui_medium_mirr3.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_medium_pyra2.png b/src/main/res/drawable-nodpi/ui_medium_pyra2.png
deleted file mode 100644
index d11cf90e..00000000
Binary files a/src/main/res/drawable-nodpi/ui_medium_pyra2.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_medium_pyra3.png b/src/main/res/drawable-nodpi/ui_medium_pyra3.png
deleted file mode 100644
index 61ebdbc4..00000000
Binary files a/src/main/res/drawable-nodpi/ui_medium_pyra3.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_medium_pyra4.png b/src/main/res/drawable-nodpi/ui_medium_pyra4.png
deleted file mode 100644
index 6bb90d54..00000000
Binary files a/src/main/res/drawable-nodpi/ui_medium_pyra4.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_medium_pyra5.png b/src/main/res/drawable-nodpi/ui_medium_pyra5.png
deleted file mode 100644
index 569ab4fe..00000000
Binary files a/src/main/res/drawable-nodpi/ui_medium_pyra5.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_medium_redi.png b/src/main/res/drawable-nodpi/ui_medium_redi.png
deleted file mode 100644
index 0adaa838..00000000
Binary files a/src/main/res/drawable-nodpi/ui_medium_redi.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_medium_rex.png b/src/main/res/drawable-nodpi/ui_medium_rex.png
deleted file mode 100644
index 6c861927..00000000
Binary files a/src/main/res/drawable-nodpi/ui_medium_rex.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_medium_skew2.png b/src/main/res/drawable-nodpi/ui_medium_skew2.png
deleted file mode 100644
index 1dd3b3ef..00000000
Binary files a/src/main/res/drawable-nodpi/ui_medium_skew2.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_medium_skew3.png b/src/main/res/drawable-nodpi/ui_medium_skew3.png
deleted file mode 100644
index bf6c510b..00000000
Binary files a/src/main/res/drawable-nodpi/ui_medium_skew3.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_medium_squa1.png b/src/main/res/drawable-nodpi/ui_medium_squa1.png
deleted file mode 100644
index ed4e7c56..00000000
Binary files a/src/main/res/drawable-nodpi/ui_medium_squa1.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_medium_squa2.png b/src/main/res/drawable-nodpi/ui_medium_squa2.png
deleted file mode 100644
index 37312fdf..00000000
Binary files a/src/main/res/drawable-nodpi/ui_medium_squa2.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_medium_ulti.png b/src/main/res/drawable-nodpi/ui_medium_ulti.png
deleted file mode 100644
index 5a3d3d16..00000000
Binary files a/src/main/res/drawable-nodpi/ui_medium_ulti.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_small_ban1.png b/src/main/res/drawable-nodpi/ui_small_ban1.png
deleted file mode 100644
index 579fd1bb..00000000
Binary files a/src/main/res/drawable-nodpi/ui_small_ban1.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_small_ban2.png b/src/main/res/drawable-nodpi/ui_small_ban2.png
deleted file mode 100644
index 543bf379..00000000
Binary files a/src/main/res/drawable-nodpi/ui_small_ban2.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_small_ban3.png b/src/main/res/drawable-nodpi/ui_small_ban3.png
deleted file mode 100644
index 105def04..00000000
Binary files a/src/main/res/drawable-nodpi/ui_small_ban3.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_small_ban4.png b/src/main/res/drawable-nodpi/ui_small_ban4.png
deleted file mode 100644
index 416c2c9a..00000000
Binary files a/src/main/res/drawable-nodpi/ui_small_ban4.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_small_cube2.png b/src/main/res/drawable-nodpi/ui_small_cube2.png
deleted file mode 100644
index eb781e64..00000000
Binary files a/src/main/res/drawable-nodpi/ui_small_cube2.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_small_cube3.png b/src/main/res/drawable-nodpi/ui_small_cube3.png
deleted file mode 100644
index dae0f164..00000000
Binary files a/src/main/res/drawable-nodpi/ui_small_cube3.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_small_cube4.png b/src/main/res/drawable-nodpi/ui_small_cube4.png
deleted file mode 100644
index c37a2e75..00000000
Binary files a/src/main/res/drawable-nodpi/ui_small_cube4.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_small_cube5.png b/src/main/res/drawable-nodpi/ui_small_cube5.png
deleted file mode 100644
index c6c5ff3a..00000000
Binary files a/src/main/res/drawable-nodpi/ui_small_cube5.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_small_diam2.png b/src/main/res/drawable-nodpi/ui_small_diam2.png
deleted file mode 100644
index 1c849467..00000000
Binary files a/src/main/res/drawable-nodpi/ui_small_diam2.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_small_diam3.png b/src/main/res/drawable-nodpi/ui_small_diam3.png
deleted file mode 100644
index d8b719ec..00000000
Binary files a/src/main/res/drawable-nodpi/ui_small_diam3.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_small_diam4.png b/src/main/res/drawable-nodpi/ui_small_diam4.png
deleted file mode 100644
index a8b13ead..00000000
Binary files a/src/main/res/drawable-nodpi/ui_small_diam4.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_small_din4.png b/src/main/res/drawable-nodpi/ui_small_din4.png
deleted file mode 100644
index 8c68e947..00000000
Binary files a/src/main/res/drawable-nodpi/ui_small_din4.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_small_dino.png b/src/main/res/drawable-nodpi/ui_small_dino.png
deleted file mode 100644
index 7b81d9d8..00000000
Binary files a/src/main/res/drawable-nodpi/ui_small_dino.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_small_heli.png b/src/main/res/drawable-nodpi/ui_small_heli.png
deleted file mode 100644
index f39099c8..00000000
Binary files a/src/main/res/drawable-nodpi/ui_small_heli.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_small_ivy.png b/src/main/res/drawable-nodpi/ui_small_ivy.png
deleted file mode 100644
index ccb45204..00000000
Binary files a/src/main/res/drawable-nodpi/ui_small_ivy.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_small_jing2.png b/src/main/res/drawable-nodpi/ui_small_jing2.png
deleted file mode 100644
index 20c31754..00000000
Binary files a/src/main/res/drawable-nodpi/ui_small_jing2.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_small_kilo3.png b/src/main/res/drawable-nodpi/ui_small_kilo3.png
deleted file mode 100644
index 5895fcb8..00000000
Binary files a/src/main/res/drawable-nodpi/ui_small_kilo3.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_small_kilo5.png b/src/main/res/drawable-nodpi/ui_small_kilo5.png
deleted file mode 100644
index 87616aa7..00000000
Binary files a/src/main/res/drawable-nodpi/ui_small_kilo5.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_small_mega3.png b/src/main/res/drawable-nodpi/ui_small_mega3.png
deleted file mode 100644
index 09e6b796..00000000
Binary files a/src/main/res/drawable-nodpi/ui_small_mega3.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_small_mega5.png b/src/main/res/drawable-nodpi/ui_small_mega5.png
deleted file mode 100644
index 618d2508..00000000
Binary files a/src/main/res/drawable-nodpi/ui_small_mega5.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_small_mirr2.png b/src/main/res/drawable-nodpi/ui_small_mirr2.png
deleted file mode 100644
index f47570aa..00000000
Binary files a/src/main/res/drawable-nodpi/ui_small_mirr2.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_small_mirr3.png b/src/main/res/drawable-nodpi/ui_small_mirr3.png
deleted file mode 100644
index 7fcb8b67..00000000
Binary files a/src/main/res/drawable-nodpi/ui_small_mirr3.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_small_pyra2.png b/src/main/res/drawable-nodpi/ui_small_pyra2.png
deleted file mode 100644
index 239d380a..00000000
Binary files a/src/main/res/drawable-nodpi/ui_small_pyra2.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_small_pyra3.png b/src/main/res/drawable-nodpi/ui_small_pyra3.png
deleted file mode 100644
index e7fa6640..00000000
Binary files a/src/main/res/drawable-nodpi/ui_small_pyra3.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_small_pyra4.png b/src/main/res/drawable-nodpi/ui_small_pyra4.png
deleted file mode 100644
index 11b2e7fa..00000000
Binary files a/src/main/res/drawable-nodpi/ui_small_pyra4.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_small_pyra5.png b/src/main/res/drawable-nodpi/ui_small_pyra5.png
deleted file mode 100644
index 55aa5dba..00000000
Binary files a/src/main/res/drawable-nodpi/ui_small_pyra5.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_small_redi.png b/src/main/res/drawable-nodpi/ui_small_redi.png
deleted file mode 100644
index 16db11a8..00000000
Binary files a/src/main/res/drawable-nodpi/ui_small_redi.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_small_rex.png b/src/main/res/drawable-nodpi/ui_small_rex.png
deleted file mode 100644
index 0e6513cb..00000000
Binary files a/src/main/res/drawable-nodpi/ui_small_rex.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_small_skew2.png b/src/main/res/drawable-nodpi/ui_small_skew2.png
deleted file mode 100644
index e7d5f56a..00000000
Binary files a/src/main/res/drawable-nodpi/ui_small_skew2.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_small_skew3.png b/src/main/res/drawable-nodpi/ui_small_skew3.png
deleted file mode 100644
index 8d675a93..00000000
Binary files a/src/main/res/drawable-nodpi/ui_small_skew3.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_small_squa1.png b/src/main/res/drawable-nodpi/ui_small_squa1.png
deleted file mode 100644
index f53f0b56..00000000
Binary files a/src/main/res/drawable-nodpi/ui_small_squa1.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_small_squa2.png b/src/main/res/drawable-nodpi/ui_small_squa2.png
deleted file mode 100644
index 9d2757b3..00000000
Binary files a/src/main/res/drawable-nodpi/ui_small_squa2.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_small_ulti.png b/src/main/res/drawable-nodpi/ui_small_ulti.png
deleted file mode 100644
index 1b5c4be6..00000000
Binary files a/src/main/res/drawable-nodpi/ui_small_ulti.png and /dev/null differ
