diff --git a/FModel/FModel.csproj b/FModel/FModel.csproj
index 3c8a56d2..468059d7 100644
--- a/FModel/FModel.csproj
+++ b/FModel/FModel.csproj
@@ -256,14 +256,16 @@
     <Content Include="DLLs\csharp-wick.dll" />
     <Content Include="DLLs\ScintillaNET FindReplaceDialog.dll" />
     <Content Include="FModel.ico" />
+    <None Include="Resources\Template_M_N.png" />
+    <None Include="Resources\Template_M_F.png" />
+    <None Include="Resources\Template_F_N.png" />
+    <None Include="Resources\Template_F_F.png" />
+    <None Include="Resources\Template_D_N.png" />
+    <None Include="Resources\Template_D_F.png" />
     <None Include="Resources\cTemplate.png" />
     <None Include="Resources\LBolt64.png" />
-    <None Include="Resources\wTemplatev1.png" />
-    <None Include="Resources\wTemplateFv1.png" />
     <None Include="Resources\FModel.ico" />
     <None Include="Resources\FModel_Logo.png" />
-    <None Include="Resources\wTemplateF.png" />
-    <None Include="Resources\wTemplate.png" />
     <None Include="Resources\twitter.ico" />
     <None Include="Resources\BurbankBigCondensed-Black-vJapanese.otf" />
     <None Include="Resources\reload64.png" />
diff --git a/FModel/Forms/Settings.Designer.cs b/FModel/Forms/Settings.Designer.cs
index 3408c4c7..f3c56f1f 100644
--- a/FModel/Forms/Settings.Designer.cs
+++ b/FModel/Forms/Settings.Designer.cs
@@ -169,7 +169,8 @@ namespace FModel.Forms
             this.comboBox2.FormattingEnabled = true;
             this.comboBox2.Items.AddRange(new object[] {
             "Default",
-            "Flat"});
+            "Flat",
+            "Minimalist"});
             this.comboBox2.Location = new System.Drawing.Point(85, 48);
             this.comboBox2.Name = "comboBox2";
             this.comboBox2.Size = new System.Drawing.Size(294, 21);
@@ -305,7 +306,7 @@ namespace FModel.Forms
             // wPictureBox
             // 
             this.wPictureBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.wPictureBox.Image = global::FModel.Properties.Resources.wTemplatev1;
+            this.wPictureBox.Image = global::FModel.Properties.Resources.Template_D_N;
             this.wPictureBox.Location = new System.Drawing.Point(389, 19);
             this.wPictureBox.Name = "wPictureBox";
             this.wPictureBox.Size = new System.Drawing.Size(165, 165);
diff --git a/FModel/Forms/Settings.cs b/FModel/Forms/Settings.cs
index d27dc0b8..64e10659 100644
--- a/FModel/Forms/Settings.cs
+++ b/FModel/Forms/Settings.cs
@@ -72,11 +72,11 @@ namespace FModel.Forms
                 Bitmap bmp = null;
                 if (Properties.Settings.Default.loadFeaturedImage)
                 {
-                    bmp = new Bitmap(string.Equals(Properties.Settings.Default.rarityDesign, "Flat") ? new Bitmap(Resources.wTemplateF) : new Bitmap(Resources.wTemplateFv1));
+                    bmp = new Bitmap(string.Equals(Properties.Settings.Default.rarityDesign, "Flat") ? new Bitmap(Resources.Template_F_F) : string.Equals(Properties.Settings.Default.rarityDesign, "Minimalist") ? new Bitmap(Resources.Template_M_F) : new Bitmap(Resources.Template_D_F));
                 }
                 else
                 {
-                    bmp = new Bitmap(string.Equals(Properties.Settings.Default.rarityDesign, "Flat") ? new Bitmap(Resources.wTemplate) : new Bitmap(Resources.wTemplatev1));
+                    bmp = new Bitmap(string.Equals(Properties.Settings.Default.rarityDesign, "Flat") ? new Bitmap(Resources.Template_F_N) : string.Equals(Properties.Settings.Default.rarityDesign, "Minimalist") ? new Bitmap(Resources.Template_M_N) : new Bitmap(Resources.Template_D_N));
                 }
                 Graphics g = Graphics.FromImage(bmp);
 
@@ -161,11 +161,11 @@ namespace FModel.Forms
                     Bitmap bmp = null;
                     if (Properties.Settings.Default.loadFeaturedImage)
                     {
-                        bmp = new Bitmap(string.Equals(comboBox2.SelectedItem.ToString(), "Flat") ? new Bitmap(Resources.wTemplateF) : new Bitmap(Resources.wTemplateFv1));
+                        bmp = new Bitmap(string.Equals(comboBox2.SelectedItem.ToString(), "Flat") ? new Bitmap(Resources.Template_F_F) : string.Equals(comboBox2.SelectedItem.ToString(), "Minimalist") ? new Bitmap(Resources.Template_M_F) : new Bitmap(Resources.Template_D_F));
                     }
                     else
                     {
-                        bmp = new Bitmap(string.Equals(comboBox2.SelectedItem.ToString(), "Flat") ? new Bitmap(Resources.wTemplate) : new Bitmap(Resources.wTemplatev1));
+                        bmp = new Bitmap(string.Equals(comboBox2.SelectedItem.ToString(), "Flat") ? new Bitmap(Resources.Template_F_N) : string.Equals(comboBox2.SelectedItem.ToString(), "Minimalist") ? new Bitmap(Resources.Template_M_N) : new Bitmap(Resources.Template_D_N));
                     }
                     Graphics g = Graphics.FromImage(bmp);
 
@@ -187,11 +187,11 @@ namespace FModel.Forms
                 Bitmap bmp = null;
                 if (checkBox8.Checked)
                 {
-                    bmp = new Bitmap(string.Equals(comboBox2.SelectedItem.ToString(), "Flat") ? new Bitmap(Resources.wTemplateF) : new Bitmap(Resources.wTemplateFv1));
+                    bmp = new Bitmap(string.Equals(comboBox2.SelectedItem.ToString(), "Flat") ? new Bitmap(Resources.Template_F_F) : string.Equals(comboBox2.SelectedItem.ToString(), "Minimalist") ? new Bitmap(Resources.Template_M_F) : new Bitmap(Resources.Template_D_F));
                 }
                 else
                 {
-                    bmp = new Bitmap(string.Equals(comboBox2.SelectedItem.ToString(), "Flat") ? new Bitmap(Resources.wTemplate) : new Bitmap(Resources.wTemplatev1));
+                    bmp = new Bitmap(string.Equals(comboBox2.SelectedItem.ToString(), "Flat") ? new Bitmap(Resources.Template_F_N) : string.Equals(comboBox2.SelectedItem.ToString(), "Minimalist") ? new Bitmap(Resources.Template_M_N) : new Bitmap(Resources.Template_D_N));
                 }
                 Graphics g = Graphics.FromImage(bmp);
 
@@ -210,11 +210,11 @@ namespace FModel.Forms
                 Bitmap bmp = null;
                 if (checkBox8.Checked)
                 {
-                    bmp = new Bitmap(string.Equals(comboBox2.SelectedItem.ToString(), "Flat") ? new Bitmap(Resources.wTemplateF) : new Bitmap(Resources.wTemplateFv1));
+                    bmp = new Bitmap(string.Equals(comboBox2.SelectedItem.ToString(), "Flat") ? new Bitmap(Resources.Template_F_F) : string.Equals(comboBox2.SelectedItem.ToString(), "Minimalist") ? new Bitmap(Resources.Template_M_F) : new Bitmap(Resources.Template_D_F));
                 }
                 else
                 {
-                    bmp = new Bitmap(string.Equals(comboBox2.SelectedItem.ToString(), "Flat") ? new Bitmap(Resources.wTemplate) : new Bitmap(Resources.wTemplatev1));
+                    bmp = new Bitmap(string.Equals(comboBox2.SelectedItem.ToString(), "Flat") ? new Bitmap(Resources.Template_F_N) : string.Equals(comboBox2.SelectedItem.ToString(), "Minimalist") ? new Bitmap(Resources.Template_M_N) : new Bitmap(Resources.Template_D_N));
                 }
                 Graphics g = Graphics.FromImage(bmp);
 
@@ -239,7 +239,7 @@ namespace FModel.Forms
         {
             if (!checkBox8.Checked)
             {
-                Bitmap bmp = string.Equals(comboBox2.SelectedItem.ToString(), "Flat") ? new Bitmap(Resources.wTemplate) : new Bitmap(Resources.wTemplatev1);
+                Bitmap bmp = string.Equals(comboBox2.SelectedItem.ToString(), "Flat") ? new Bitmap(Resources.Template_F_N) : string.Equals(comboBox2.SelectedItem.ToString(), "Minimalist") ? new Bitmap(Resources.Template_M_N) : new Bitmap(Resources.Template_D_N);
                 Graphics g = Graphics.FromImage(bmp);
                 if (File.Exists(Properties.Settings.Default.wFilename))
                 {
@@ -251,7 +251,7 @@ namespace FModel.Forms
             }
             if (checkBox8.Checked)
             {
-                Bitmap bmp = string.Equals(comboBox2.SelectedItem.ToString(), "Flat") ? new Bitmap(Resources.wTemplateF) : new Bitmap(Resources.wTemplateFv1);
+                Bitmap bmp = string.Equals(comboBox2.SelectedItem.ToString(), "Flat") ? new Bitmap(Resources.Template_F_F) : string.Equals(comboBox2.SelectedItem.ToString(), "Minimalist") ? new Bitmap(Resources.Template_M_F) : new Bitmap(Resources.Template_D_F);
                 Graphics g = Graphics.FromImage(bmp);
                 if (File.Exists(Properties.Settings.Default.wFilename))
                 {
@@ -265,30 +265,28 @@ namespace FModel.Forms
 
         private void ComboBox2_SelectedIndexChanged(object sender, EventArgs e)
         {
-            if (string.Equals(comboBox2.SelectedItem.ToString(), "Default"))
+            Bitmap bmp = null;
+            switch (comboBox2.SelectedItem.ToString())
             {
-                Bitmap bmp = checkBox8.Checked ? new Bitmap(Resources.wTemplateFv1) : new Bitmap(Resources.wTemplatev1);
-                Graphics g = Graphics.FromImage(bmp);
-                if (File.Exists(Properties.Settings.Default.wFilename))
-                {
-                    Image watermark = Image.FromFile(Properties.Settings.Default.wFilename);
-                    var opacityImage = ImageUtilities.SetImageOpacity(watermark, (float)trackBar1.Value / 100);
-                    g.DrawImage(ImageUtilities.ResizeImage(opacityImage, trackBar2.Value, trackBar2.Value), (522 - trackBar2.Value) / 2, (522 - trackBar2.Value) / 2, trackBar2.Value, trackBar2.Value);
-                }
-                wPictureBox.Image = bmp;
+                case "Default":
+                    bmp = checkBox8.Checked ? new Bitmap(Resources.Template_D_F) : new Bitmap(Resources.Template_D_N);
+                    break;
+                case "Flat":
+                    bmp = checkBox8.Checked ? new Bitmap(Resources.Template_F_F) : new Bitmap(Resources.Template_F_N);
+                    break;
+                case "Minimalist":
+                    bmp = checkBox8.Checked ? new Bitmap(Resources.Template_M_F) : new Bitmap(Resources.Template_M_N);
+                    break;
             }
-            if (string.Equals(comboBox2.SelectedItem.ToString(), "Flat"))
+
+            Graphics g = Graphics.FromImage(bmp);
+            if (File.Exists(Properties.Settings.Default.wFilename))
             {
-                Bitmap bmp = checkBox8.Checked ? new Bitmap(Resources.wTemplateF) : new Bitmap(Resources.wTemplate);
-                Graphics g = Graphics.FromImage(bmp);
-                if (File.Exists(Properties.Settings.Default.wFilename))
-                {
-                    Image watermark = Image.FromFile(Properties.Settings.Default.wFilename);
-                    var opacityImage = ImageUtilities.SetImageOpacity(watermark, (float)trackBar1.Value / 100);
-                    g.DrawImage(ImageUtilities.ResizeImage(opacityImage, trackBar2.Value, trackBar2.Value), (522 - trackBar2.Value) / 2, (522 - trackBar2.Value) / 2, trackBar2.Value, trackBar2.Value);
-                }
-                wPictureBox.Image = bmp;
+                Image watermark = Image.FromFile(Properties.Settings.Default.wFilename);
+                var opacityImage = ImageUtilities.SetImageOpacity(watermark, (float)trackBar1.Value / 100);
+                g.DrawImage(ImageUtilities.ResizeImage(opacityImage, trackBar2.Value, trackBar2.Value), (522 - trackBar2.Value) / 2, (522 - trackBar2.Value) / 2, trackBar2.Value, trackBar2.Value);
             }
+            wPictureBox.Image = bmp;
         }
 
         private void Button2_Click(object sender, EventArgs e)
diff --git a/FModel/Forms/UpdateModeSettings.Designer.cs b/FModel/Forms/UpdateModeSettings.Designer.cs
index a88152ed..ea0461b2 100644
--- a/FModel/Forms/UpdateModeSettings.Designer.cs
+++ b/FModel/Forms/UpdateModeSettings.Designer.cs
@@ -177,7 +177,8 @@ namespace FModel.Forms
             this.comboBox2.FormattingEnabled = true;
             this.comboBox2.Items.AddRange(new object[] {
             "Default",
-            "Flat"});
+            "Flat",
+            "Minimalist"});
             this.comboBox2.Location = new System.Drawing.Point(85, 48);
             this.comboBox2.Name = "comboBox2";
             this.comboBox2.Size = new System.Drawing.Size(294, 21);
@@ -313,7 +314,7 @@ namespace FModel.Forms
             // wPictureBox
             // 
             this.wPictureBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.wPictureBox.Image = global::FModel.Properties.Resources.wTemplatev1;
+            this.wPictureBox.Image = global::FModel.Properties.Resources.Template_D_N;
             this.wPictureBox.Location = new System.Drawing.Point(389, 19);
             this.wPictureBox.Name = "wPictureBox";
             this.wPictureBox.Size = new System.Drawing.Size(165, 165);
diff --git a/FModel/Forms/UpdateModeSettings.cs b/FModel/Forms/UpdateModeSettings.cs
index d708f1b1..3691fa5f 100644
--- a/FModel/Forms/UpdateModeSettings.cs
+++ b/FModel/Forms/UpdateModeSettings.cs
@@ -45,11 +45,11 @@ namespace FModel.Forms
                 Bitmap bmp = null;
                 if (Properties.Settings.Default.UMFeatured)
                 {
-                    bmp = new Bitmap(string.Equals(Properties.Settings.Default.rarityDesign, "Flat") ? new Bitmap(Resources.wTemplateF) : new Bitmap(Resources.wTemplateFv1));
+                    bmp = new Bitmap(string.Equals(Properties.Settings.Default.rarityDesign, "Flat") ? new Bitmap(Resources.Template_F_F) : string.Equals(Properties.Settings.Default.rarityDesign, "Minimalist") ? new Bitmap(Resources.Template_M_F) : new Bitmap(Resources.Template_D_F));
                 }
                 else
                 {
-                    bmp = new Bitmap(string.Equals(Properties.Settings.Default.rarityDesign, "Flat") ? new Bitmap(Resources.wTemplate) : new Bitmap(Resources.wTemplatev1));
+                    bmp = new Bitmap(string.Equals(Properties.Settings.Default.rarityDesign, "Flat") ? new Bitmap(Resources.Template_F_N) : string.Equals(Properties.Settings.Default.rarityDesign, "Minimalist") ? new Bitmap(Resources.Template_M_N) : new Bitmap(Resources.Template_D_N));
                 }
                 Graphics g = Graphics.FromImage(bmp);
 
@@ -212,7 +212,15 @@ namespace FModel.Forms
 
                 if (!string.IsNullOrEmpty(Properties.Settings.Default.UMFilename))
                 {
-                    Bitmap bmp = new Bitmap(checkBox8.Checked ? Resources.wTemplateF : Resources.wTemplate);
+                    Bitmap bmp = null;
+                    if (Properties.Settings.Default.loadFeaturedImage)
+                    {
+                        bmp = new Bitmap(string.Equals(comboBox2.SelectedItem.ToString(), "Flat") ? new Bitmap(Resources.Template_F_F) : string.Equals(comboBox2.SelectedItem.ToString(), "Minimalist") ? new Bitmap(Resources.Template_M_F) : new Bitmap(Resources.Template_D_F));
+                    }
+                    else
+                    {
+                        bmp = new Bitmap(string.Equals(comboBox2.SelectedItem.ToString(), "Flat") ? new Bitmap(Resources.Template_F_N) : string.Equals(comboBox2.SelectedItem.ToString(), "Minimalist") ? new Bitmap(Resources.Template_M_N) : new Bitmap(Resources.Template_D_N));
+                    }
                     Graphics g = Graphics.FromImage(bmp);
 
                     Image watermark = Image.FromFile(Properties.Settings.Default.UMFilename);
@@ -230,7 +238,15 @@ namespace FModel.Forms
         {
             if (!string.IsNullOrEmpty(Properties.Settings.Default.UMFilename))
             {
-                Bitmap bmp = new Bitmap(checkBox8.Checked ? Resources.wTemplateF : Resources.wTemplate);
+                Bitmap bmp = null;
+                if (checkBox8.Checked)
+                {
+                    bmp = new Bitmap(string.Equals(comboBox2.SelectedItem.ToString(), "Flat") ? new Bitmap(Resources.Template_F_F) : string.Equals(comboBox2.SelectedItem.ToString(), "Minimalist") ? new Bitmap(Resources.Template_M_F) : new Bitmap(Resources.Template_D_F));
+                }
+                else
+                {
+                    bmp = new Bitmap(string.Equals(comboBox2.SelectedItem.ToString(), "Flat") ? new Bitmap(Resources.Template_F_N) : string.Equals(comboBox2.SelectedItem.ToString(), "Minimalist") ? new Bitmap(Resources.Template_M_N) : new Bitmap(Resources.Template_D_N));
+                }
                 Graphics g = Graphics.FromImage(bmp);
 
                 Image watermark = Image.FromFile(Properties.Settings.Default.UMFilename);
@@ -245,7 +261,15 @@ namespace FModel.Forms
         {
             if (!string.IsNullOrEmpty(Properties.Settings.Default.UMFilename))
             {
-                Bitmap bmp = new Bitmap(checkBox8.Checked ? Resources.wTemplateF : Resources.wTemplate);
+                Bitmap bmp = null;
+                if (checkBox8.Checked)
+                {
+                    bmp = new Bitmap(string.Equals(comboBox2.SelectedItem.ToString(), "Flat") ? new Bitmap(Resources.Template_F_F) : string.Equals(comboBox2.SelectedItem.ToString(), "Minimalist") ? new Bitmap(Resources.Template_M_F) : new Bitmap(Resources.Template_D_F));
+                }
+                else
+                {
+                    bmp = new Bitmap(string.Equals(comboBox2.SelectedItem.ToString(), "Flat") ? new Bitmap(Resources.Template_F_N) : string.Equals(comboBox2.SelectedItem.ToString(), "Minimalist") ? new Bitmap(Resources.Template_M_N) : new Bitmap(Resources.Template_D_N));
+                }
                 Graphics g = Graphics.FromImage(bmp);
 
                 Image watermark = Image.FromFile(Properties.Settings.Default.UMFilename);
@@ -269,7 +293,7 @@ namespace FModel.Forms
         {
             if (!checkBox8.Checked)
             {
-                Bitmap bmp = string.Equals(comboBox2.SelectedItem.ToString(), "Flat") ? new Bitmap(Resources.wTemplate) : new Bitmap(Resources.wTemplatev1);
+                Bitmap bmp = string.Equals(comboBox2.SelectedItem.ToString(), "Flat") ? new Bitmap(Resources.Template_F_N) : string.Equals(comboBox2.SelectedItem.ToString(), "Minimalist") ? new Bitmap(Resources.Template_M_N) : new Bitmap(Resources.Template_D_N);
                 Graphics g = Graphics.FromImage(bmp);
                 if (File.Exists(Properties.Settings.Default.UMFilename))
                 {
@@ -281,7 +305,7 @@ namespace FModel.Forms
             }
             if (checkBox8.Checked)
             {
-                Bitmap bmp = string.Equals(comboBox2.SelectedItem.ToString(), "Flat") ? new Bitmap(Resources.wTemplateF) : new Bitmap(Resources.wTemplateFv1);
+                Bitmap bmp = string.Equals(comboBox2.SelectedItem.ToString(), "Flat") ? new Bitmap(Resources.Template_F_F) : string.Equals(comboBox2.SelectedItem.ToString(), "Minimalist") ? new Bitmap(Resources.Template_M_F) : new Bitmap(Resources.Template_D_F);
                 Graphics g = Graphics.FromImage(bmp);
                 if (File.Exists(Properties.Settings.Default.UMFilename))
                 {
@@ -295,30 +319,28 @@ namespace FModel.Forms
 
         private void ComboBox2_SelectedIndexChanged(object sender, EventArgs e)
         {
-            if (string.Equals(comboBox2.SelectedItem.ToString(), "Default"))
+            Bitmap bmp = null;
+            switch (comboBox2.SelectedItem.ToString())
             {
-                Bitmap bmp = checkBox8.Checked ? new Bitmap(Resources.wTemplateFv1) : new Bitmap(Resources.wTemplatev1);
-                Graphics g = Graphics.FromImage(bmp);
-                if (File.Exists(Properties.Settings.Default.UMFilename))
-                {
-                    Image watermark = Image.FromFile(Properties.Settings.Default.UMFilename);
-                    var opacityImage = ImageUtilities.SetImageOpacity(watermark, (float)trackBar1.Value / 100);
-                    g.DrawImage(ImageUtilities.ResizeImage(opacityImage, trackBar2.Value, trackBar2.Value), (522 - trackBar2.Value) / 2, (522 - trackBar2.Value) / 2, trackBar2.Value, trackBar2.Value);
-                }
-                wPictureBox.Image = bmp;
+                case "Default":
+                    bmp = checkBox8.Checked ? new Bitmap(Resources.Template_D_F) : new Bitmap(Resources.Template_D_N);
+                    break;
+                case "Flat":
+                    bmp = checkBox8.Checked ? new Bitmap(Resources.Template_F_F) : new Bitmap(Resources.Template_F_N);
+                    break;
+                case "Minimalist":
+                    bmp = checkBox8.Checked ? new Bitmap(Resources.Template_M_F) : new Bitmap(Resources.Template_M_N);
+                    break;
             }
-            if (string.Equals(comboBox2.SelectedItem.ToString(), "Flat"))
+
+            Graphics g = Graphics.FromImage(bmp);
+            if (File.Exists(Properties.Settings.Default.UMFilename))
             {
-                Bitmap bmp = checkBox8.Checked ? new Bitmap(Resources.wTemplateF) : new Bitmap(Resources.wTemplate);
-                Graphics g = Graphics.FromImage(bmp);
-                if (File.Exists(Properties.Settings.Default.UMFilename))
-                {
-                    Image watermark = Image.FromFile(Properties.Settings.Default.UMFilename);
-                    var opacityImage = ImageUtilities.SetImageOpacity(watermark, (float)trackBar1.Value / 100);
-                    g.DrawImage(ImageUtilities.ResizeImage(opacityImage, trackBar2.Value, trackBar2.Value), (522 - trackBar2.Value) / 2, (522 - trackBar2.Value) / 2, trackBar2.Value, trackBar2.Value);
-                }
-                wPictureBox.Image = bmp;
+                Image watermark = Image.FromFile(Properties.Settings.Default.UMFilename);
+                var opacityImage = ImageUtilities.SetImageOpacity(watermark, (float)trackBar1.Value / 100);
+                g.DrawImage(ImageUtilities.ResizeImage(opacityImage, trackBar2.Value, trackBar2.Value), (522 - trackBar2.Value) / 2, (522 - trackBar2.Value) / 2, trackBar2.Value, trackBar2.Value);
             }
+            wPictureBox.Image = bmp;
         }
     }
 }
diff --git a/FModel/MainWindow.Designer.cs b/FModel/MainWindow.Designer.cs
index f67c4469..221d986c 100644
--- a/FModel/MainWindow.Designer.cs
+++ b/FModel/MainWindow.Designer.cs
@@ -52,8 +52,6 @@ namespace FModel
             this.saveAsJSONToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.autoSaveAsJSONToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
-            this.copySelectedFilePathToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
             this.openExtractionFolderToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.imageToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.saveImageToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -169,46 +167,46 @@ namespace FModel
             // loadOneToolStripMenuItem
             // 
             this.loadOneToolStripMenuItem.Name = "loadOneToolStripMenuItem";
-            this.loadOneToolStripMenuItem.Size = new System.Drawing.Size(175, 22);
+            this.loadOneToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
             this.loadOneToolStripMenuItem.Text = "Load One PAK";
             this.loadOneToolStripMenuItem.DropDownItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.loadOneToolStripMenuItem_DropDownItemClicked);
             // 
             // loadAllToolStripMenuItem
             // 
             this.loadAllToolStripMenuItem.Name = "loadAllToolStripMenuItem";
-            this.loadAllToolStripMenuItem.Size = new System.Drawing.Size(175, 22);
+            this.loadAllToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
             this.loadAllToolStripMenuItem.Text = "Load All PAKs";
             this.loadAllToolStripMenuItem.Click += new System.EventHandler(this.loadAllToolStripMenuItem_Click);
             // 
             // toolStripSeparator1
             // 
             this.toolStripSeparator1.Name = "toolStripSeparator1";
-            this.toolStripSeparator1.Size = new System.Drawing.Size(172, 6);
+            this.toolStripSeparator1.Size = new System.Drawing.Size(177, 6);
             // 
             // downloadBackupsToolStripMenuItem
             // 
             this.downloadBackupsToolStripMenuItem.Name = "downloadBackupsToolStripMenuItem";
-            this.downloadBackupsToolStripMenuItem.Size = new System.Drawing.Size(175, 22);
+            this.downloadBackupsToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
             this.downloadBackupsToolStripMenuItem.Text = "Download Backups";
             this.downloadBackupsToolStripMenuItem.DropDownItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.DownloadBackupsToolStripMenuItem_DropDownItemClicked);
             // 
             // backupPAKsToolStripMenuItem
             // 
             this.backupPAKsToolStripMenuItem.Name = "backupPAKsToolStripMenuItem";
-            this.backupPAKsToolStripMenuItem.Size = new System.Drawing.Size(175, 22);
+            this.backupPAKsToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
             this.backupPAKsToolStripMenuItem.Text = "Backup PAKs";
             this.backupPAKsToolStripMenuItem.Click += new System.EventHandler(this.backupPAKsToolStripMenuItem_Click);
             // 
             // toolStripSeparator8
             // 
             this.toolStripSeparator8.Name = "toolStripSeparator8";
-            this.toolStripSeparator8.Size = new System.Drawing.Size(172, 6);
+            this.toolStripSeparator8.Size = new System.Drawing.Size(177, 6);
             // 
             // differenceModeToolStripMenuItem
             // 
             this.differenceModeToolStripMenuItem.CheckOnClick = true;
             this.differenceModeToolStripMenuItem.Name = "differenceModeToolStripMenuItem";
-            this.differenceModeToolStripMenuItem.Size = new System.Drawing.Size(175, 22);
+            this.differenceModeToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
             this.differenceModeToolStripMenuItem.Text = "Difference Mode";
             this.differenceModeToolStripMenuItem.CheckedChanged += new System.EventHandler(this.differenceModeToolStripMenuItem_CheckedChanged);
             // 
@@ -217,21 +215,21 @@ namespace FModel
             this.updateModeToolStripMenuItem.CheckOnClick = true;
             this.updateModeToolStripMenuItem.Enabled = false;
             this.updateModeToolStripMenuItem.Name = "updateModeToolStripMenuItem";
-            this.updateModeToolStripMenuItem.Size = new System.Drawing.Size(175, 22);
+            this.updateModeToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
             this.updateModeToolStripMenuItem.Text = "Update Mode";
             this.updateModeToolStripMenuItem.CheckedChanged += new System.EventHandler(this.updateModeToolStripMenuItem_CheckedChanged);
             // 
             // toolStripSeparator2
             // 
             this.toolStripSeparator2.Name = "toolStripSeparator2";
-            this.toolStripSeparator2.Size = new System.Drawing.Size(172, 6);
+            this.toolStripSeparator2.Size = new System.Drawing.Size(177, 6);
             // 
             // settingsToolStripMenuItem
             // 
             this.settingsToolStripMenuItem.Image = global::FModel.Properties.Resources.properties_16xLG;
             this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem";
             this.settingsToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F1;
-            this.settingsToolStripMenuItem.Size = new System.Drawing.Size(175, 22);
+            this.settingsToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
             this.settingsToolStripMenuItem.Text = "Settings";
             this.settingsToolStripMenuItem.Click += new System.EventHandler(this.settingsToolStripMenuItem_Click);
             // 
@@ -243,8 +241,6 @@ namespace FModel
             this.saveAsJSONToolStripMenuItem,
             this.autoSaveAsJSONToolStripMenuItem,
             this.toolStripSeparator5,
-            this.copySelectedFilePathToolStripMenuItem,
-            this.toolStripSeparator6,
             this.openExtractionFolderToolStripMenuItem});
             this.filesToolStripMenuItem.Name = "filesToolStripMenuItem";
             this.filesToolStripMenuItem.Size = new System.Drawing.Size(42, 20);
@@ -254,20 +250,20 @@ namespace FModel
             // 
             this.searchToolStripMenuItem.Name = "searchToolStripMenuItem";
             this.searchToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F2;
-            this.searchToolStripMenuItem.Size = new System.Drawing.Size(197, 22);
+            this.searchToolStripMenuItem.Size = new System.Drawing.Size(194, 22);
             this.searchToolStripMenuItem.Text = "Search";
             this.searchToolStripMenuItem.Click += new System.EventHandler(this.searchToolStripMenuItem_Click);
             // 
             // toolStripSeparator7
             // 
             this.toolStripSeparator7.Name = "toolStripSeparator7";
-            this.toolStripSeparator7.Size = new System.Drawing.Size(194, 6);
+            this.toolStripSeparator7.Size = new System.Drawing.Size(191, 6);
             // 
             // saveAsJSONToolStripMenuItem
             // 
             this.saveAsJSONToolStripMenuItem.Name = "saveAsJSONToolStripMenuItem";
             this.saveAsJSONToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F3;
-            this.saveAsJSONToolStripMenuItem.Size = new System.Drawing.Size(197, 22);
+            this.saveAsJSONToolStripMenuItem.Size = new System.Drawing.Size(194, 22);
             this.saveAsJSONToolStripMenuItem.Text = "Save as JSON";
             this.saveAsJSONToolStripMenuItem.Click += new System.EventHandler(this.SaveAsJSONToolStripMenuItem_Click);
             // 
@@ -275,30 +271,19 @@ namespace FModel
             // 
             this.autoSaveAsJSONToolStripMenuItem.CheckOnClick = true;
             this.autoSaveAsJSONToolStripMenuItem.Name = "autoSaveAsJSONToolStripMenuItem";
-            this.autoSaveAsJSONToolStripMenuItem.Size = new System.Drawing.Size(197, 22);
+            this.autoSaveAsJSONToolStripMenuItem.Size = new System.Drawing.Size(194, 22);
             this.autoSaveAsJSONToolStripMenuItem.Text = "Auto Save as JSON";
             // 
             // toolStripSeparator5
             // 
             this.toolStripSeparator5.Name = "toolStripSeparator5";
-            this.toolStripSeparator5.Size = new System.Drawing.Size(194, 6);
-            // 
-            // copySelectedFilePathToolStripMenuItem
-            // 
-            this.copySelectedFilePathToolStripMenuItem.Name = "copySelectedFilePathToolStripMenuItem";
-            this.copySelectedFilePathToolStripMenuItem.Size = new System.Drawing.Size(197, 22);
-            this.copySelectedFilePathToolStripMenuItem.Text = "Copy Selected File Path";
-            this.copySelectedFilePathToolStripMenuItem.Click += new System.EventHandler(this.CopySelectedFilePathToolStripMenuItem_Click);
-            // 
-            // toolStripSeparator6
-            // 
-            this.toolStripSeparator6.Name = "toolStripSeparator6";
-            this.toolStripSeparator6.Size = new System.Drawing.Size(194, 6);
+            this.toolStripSeparator5.Size = new System.Drawing.Size(191, 6);
             // 
             // openExtractionFolderToolStripMenuItem
             // 
+            this.openExtractionFolderToolStripMenuItem.Image = global::FModel.Properties.Resources.folder_16x;
             this.openExtractionFolderToolStripMenuItem.Name = "openExtractionFolderToolStripMenuItem";
-            this.openExtractionFolderToolStripMenuItem.Size = new System.Drawing.Size(197, 22);
+            this.openExtractionFolderToolStripMenuItem.Size = new System.Drawing.Size(194, 22);
             this.openExtractionFolderToolStripMenuItem.Text = "Open Extraction Folder";
             this.openExtractionFolderToolStripMenuItem.Click += new System.EventHandler(this.openExtractionFolderToolStripMenuItem_Click);
             // 
@@ -316,7 +301,7 @@ namespace FModel
             // saveImageToolStripMenuItem
             // 
             this.saveImageToolStripMenuItem.Name = "saveImageToolStripMenuItem";
-            this.saveImageToolStripMenuItem.Size = new System.Drawing.Size(168, 22);
+            this.saveImageToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
             this.saveImageToolStripMenuItem.Text = "Save Image";
             this.saveImageToolStripMenuItem.Click += new System.EventHandler(this.saveImageToolStripMenuItem_Click);
             // 
@@ -324,18 +309,18 @@ namespace FModel
             // 
             this.autoSaveImagesToolStripMenuItem.CheckOnClick = true;
             this.autoSaveImagesToolStripMenuItem.Name = "autoSaveImagesToolStripMenuItem";
-            this.autoSaveImagesToolStripMenuItem.Size = new System.Drawing.Size(168, 22);
+            this.autoSaveImagesToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
             this.autoSaveImagesToolStripMenuItem.Text = "Auto Save Images";
             // 
             // toolStripSeparator3
             // 
             this.toolStripSeparator3.Name = "toolStripSeparator3";
-            this.toolStripSeparator3.Size = new System.Drawing.Size(165, 6);
+            this.toolStripSeparator3.Size = new System.Drawing.Size(177, 6);
             // 
             // mergeImagesToolStripMenuItem
             // 
             this.mergeImagesToolStripMenuItem.Name = "mergeImagesToolStripMenuItem";
-            this.mergeImagesToolStripMenuItem.Size = new System.Drawing.Size(168, 22);
+            this.mergeImagesToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
             this.mergeImagesToolStripMenuItem.Text = "Merge Images";
             this.mergeImagesToolStripMenuItem.Click += new System.EventHandler(this.mergeImagesToolStripMenuItem_Click);
             // 
@@ -351,7 +336,7 @@ namespace FModel
             // 
             this.aboutFModelToolStripMenuItem.Image = global::FModel.Properties.Resources.StatusAnnotations_Information_16xLG_color;
             this.aboutFModelToolStripMenuItem.Name = "aboutFModelToolStripMenuItem";
-            this.aboutFModelToolStripMenuItem.Size = new System.Drawing.Size(150, 22);
+            this.aboutFModelToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
             this.aboutFModelToolStripMenuItem.Text = "About FModel";
             this.aboutFModelToolStripMenuItem.Click += new System.EventHandler(this.aboutFModelToolStripMenuItem_Click);
             // 
@@ -705,7 +690,6 @@ namespace FModel
         private System.Windows.Forms.ToolStripMenuItem filesToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem searchToolStripMenuItem;
         private System.Windows.Forms.Button AESManagerButton;
-        private System.Windows.Forms.ToolStripMenuItem copySelectedFilePathToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem saveAsJSONToolStripMenuItem;
         private System.Windows.Forms.ContextMenuStrip contextMenuStrip1;
         private System.Windows.Forms.ToolStripMenuItem extractToolStripMenuItem;
@@ -718,7 +702,6 @@ namespace FModel
         private System.Windows.Forms.ContextMenuStrip contextMenuStrip2;
         private System.Windows.Forms.ToolStripMenuItem extractFolderContentsToolStripMenuItem;
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator5;
-        private System.Windows.Forms.ToolStripSeparator toolStripSeparator6;
         private System.Windows.Forms.ToolStripMenuItem openExtractionFolderToolStripMenuItem;
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator7;
         private System.Windows.Forms.ToolStripMenuItem autoSaveAsJSONToolStripMenuItem;
diff --git a/FModel/MainWindow.cs b/FModel/MainWindow.cs
index b0a2acba..52352b16 100644
--- a/FModel/MainWindow.cs
+++ b/FModel/MainWindow.cs
@@ -1028,7 +1028,7 @@ namespace FModel
                 p.CloseFigure();
                 g.FillPath(new SolidBrush(Color.FromArgb(70, 0, 0, 50)), p);
             }
-            else { g.FillRectangle(new SolidBrush(Color.FromArgb(70, 0, 0, 50)), new Rectangle(5, 383, 512, 134)); }
+            else { g.FillRectangle(new SolidBrush(Color.FromArgb(70, 0, 0, 50)), new Rectangle(5, string.Equals(Settings.Default.rarityDesign, "Minimalist") ? 393 : 383, 512, 134)); }
 
             DrawText.DrawTexts(theItem, g, specialMode);
 
@@ -1478,10 +1478,6 @@ namespace FModel
                 OpenMe();
             };
         }
-        private void CopySelectedFilePathToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            CopySelectedFile();
-        }
         private void CopySelectedFile(bool isName = false, bool withExtension = true)
         {
             if (listBox1.SelectedItem != null)
diff --git a/FModel/MainWindow.resx b/FModel/MainWindow.resx
index 7ab45bf0..662cfaaf 100644
--- a/FModel/MainWindow.resx
+++ b/FModel/MainWindow.resx
@@ -131,7 +131,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABa
-        CAAAAk1TRnQBSQFMAgEBAgEAAUgBAgFIAQIBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CAAAAk1TRnQBSQFMAgEBAgEAAVABAgFQAQIBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
diff --git a/FModel/Methods/IconGenerator/ItemGenerator/DrawText.cs b/FModel/Methods/IconGenerator/ItemGenerator/DrawText.cs
index 6762358c..b71484bd 100644
--- a/FModel/Methods/IconGenerator/ItemGenerator/DrawText.cs
+++ b/FModel/Methods/IconGenerator/ItemGenerator/DrawText.cs
@@ -358,7 +358,12 @@ namespace FModel
 
                     Size rectSize = string.Equals(Settings.Default.rarityDesign, "Flat") ? new Rectangle(5, 405, 512, 55).Size : new Rectangle(5, 395, 512, 49).Size;
                     Point textPoint = string.Equals(Settings.Default.rarityDesign, "Flat") ? new Point(522, 405) : new Point(522 / 2, 395);
-                    if (Settings.Default.IconLanguage == "Russian")
+                    if (string.Equals(Settings.Default.rarityDesign, "Minimalist"))
+                    {
+                        rectSize = string.Equals(Settings.Default.rarityDesign, "Flat") ? new Rectangle(5, 395, 512, 55).Size : string.Equals(Settings.Default.IconLanguage, "Russian") ? new Rectangle(5, 385, 512, 69).Size : new Rectangle(5, 385, 512, 59).Size;
+                        textPoint = string.Equals(Settings.Default.rarityDesign, "Flat") ? new Point(522, 405) : string.Equals(Settings.Default.IconLanguage, "Russian") ? new Point(522 / 2, 400) : new Point(522 / 2, 408);
+                    }
+                    else if (Settings.Default.IconLanguage == "Russian")
                     {
                         rectSize = string.Equals(Settings.Default.rarityDesign, "Flat") ? new Rectangle(5, 395, 512, 55).Size : new Rectangle(5, 385, 512, 59).Size;
                         textPoint = string.Equals(Settings.Default.rarityDesign, "Flat") ? new Point(522, 405) : new Point(522 / 2, 390);
@@ -366,15 +371,25 @@ namespace FModel
 
                     string text = SearchResource.getTextByKey(key.Value<string>(), sourceString.Value<string>());
 
+                    float size = 35;
+                    if (string.Equals(Settings.Default.rarityDesign, "Minimalist"))
+                    {
+                        size = string.Equals(Settings.Default.IconLanguage, "Russian") ? 55 : 45;
+                    }
+                    else if (string.Equals(Settings.Default.IconLanguage, "Russian"))
+                    {
+                        size = 45;
+                    }
+
                     Font goodFont = FontUtilities.FindFont(
                         myGraphic,
-                        Settings.Default.IconLanguage == "Russian" ? text.ToUpper() : text,
+                        Settings.Default.IconLanguage == "Russian" || string.Equals(Settings.Default.rarityDesign, "Minimalist") ? text.ToUpper() : text,
                         rectSize,
-                        new Font(Settings.Default.IconLanguage == "Japanese" ? FontUtilities.pfc.Families[2] : Settings.Default.IconLanguage == "Russian" || Settings.Default.IconLanguage == "Chinese (S)" ? FontUtilities.pfc.Families[1] : FontUtilities.pfc.Families[0], Settings.Default.IconLanguage == "Russian" ? 45 : 35)
+                        new Font(Settings.Default.IconLanguage == "Japanese" ? FontUtilities.pfc.Families[2] : Settings.Default.IconLanguage == "Russian" || Settings.Default.IconLanguage == "Chinese (S)" ? FontUtilities.pfc.Families[1] : FontUtilities.pfc.Families[0], size)
                         );
 
                     myGraphic.DrawString(
-                        Settings.Default.IconLanguage == "Russian" ? text.ToUpper() : text,
+                        Settings.Default.IconLanguage == "Russian" || string.Equals(Settings.Default.rarityDesign, "Minimalist") ? text.ToUpper() : text,
                         goodFont,
                         new SolidBrush(Color.White),
                         textPoint,
@@ -416,7 +431,7 @@ namespace FModel
                     JToken sourceString = description["source_string"];
                     if (key != null && sourceString != null)
                     {
-                        //myGraphic.DrawRectangle(new Pen(new SolidBrush(Color.Pink)), new Rectangle(5, 455, 512, 42));
+                        //myGraphic.DrawRectangle(new Pen(new SolidBrush(Color.Pink)), new Rectangle(5, 455, 512, 62));
 
                         string text = SearchResource.getTextByKey(key.Value<string>(), sourceString.Value<string>());
                         descriptionText = text;
@@ -436,9 +451,9 @@ namespace FModel
                 {
                     myGraphic.DrawString(
                         descriptionText,
-                        new Font("Arial", string.Equals(Settings.Default.rarityDesign, "Flat") ? 9 : 10),
+                        new Font("Arial", string.Equals(Settings.Default.rarityDesign, "Flat") ? 9 : string.Equals(Settings.Default.rarityDesign, "Minimalist") ? 12 : 10),
                         new SolidBrush(Color.White),
-                        new RectangleF(5, string.Equals(Settings.Default.rarityDesign, "Flat") ? 455 : 441, 512, string.Equals(Settings.Default.rarityDesign, "Flat") ? 42 : 49),
+                        new RectangleF(5, string.Equals(Settings.Default.rarityDesign, "Flat") || string.Equals(Settings.Default.rarityDesign, "Minimalist") ? 455 : 441, 512, string.Equals(Settings.Default.rarityDesign, "Flat") ? 42 : string.Equals(Settings.Default.rarityDesign, "Minimalist") ? 62 : 49),
                         string.Equals(Settings.Default.rarityDesign, "Flat") ? FontUtilities.rightString : FontUtilities.centeredStringLine
                         );
                 }
@@ -502,7 +517,10 @@ namespace FModel
         /// <param name="myGraphic"></param>
         private static void DrawToRight(string text, Graphics myGraphic)
         {
-            myGraphic.DrawString(text, new Font(FontUtilities.pfc.Families[0], 11), new SolidBrush(Color.White), new Point(522 - 5, 503), FontUtilities.rightString);
+            if (!string.Equals(Settings.Default.rarityDesign, "Minimalist"))
+            {
+                myGraphic.DrawString(text, new Font(FontUtilities.pfc.Families[0], 11), new SolidBrush(Color.White), new Point(522 - 5, 503), FontUtilities.rightString);
+            }
         }
 
         /// <summary>
@@ -512,7 +530,10 @@ namespace FModel
         /// <param name="myGraphic"></param>
         private static void DrawToLeft(string text, Graphics myGraphic)
         {
-            myGraphic.DrawString(text, new Font(Settings.Default.IconLanguage == "Russian" || Settings.Default.IconLanguage == "Chinese (S)" ? FontUtilities.pfc.Families[1] : FontUtilities.pfc.Families[0], 11), new SolidBrush(Color.White), new Point(5, Settings.Default.IconLanguage == "Russian" || Settings.Default.IconLanguage == "Chinese (S)" ? 500 : 503));
+            if (!string.Equals(Settings.Default.rarityDesign, "Minimalist"))
+            {
+                myGraphic.DrawString(text, new Font(Settings.Default.IconLanguage == "Russian" || Settings.Default.IconLanguage == "Chinese (S)" ? FontUtilities.pfc.Families[1] : FontUtilities.pfc.Families[0], 11), new SolidBrush(Color.White), new Point(5, Settings.Default.IconLanguage == "Russian" || Settings.Default.IconLanguage == "Chinese (S)" ? 500 : 503));
+            }
         }
 
         /// <summary>
diff --git a/FModel/Methods/IconGenerator/ItemGenerator/Rarity.cs b/FModel/Methods/IconGenerator/ItemGenerator/Rarity.cs
index 8827c9b6..7b8fa37b 100644
--- a/FModel/Methods/IconGenerator/ItemGenerator/Rarity.cs
+++ b/FModel/Methods/IconGenerator/ItemGenerator/Rarity.cs
@@ -38,6 +38,7 @@ namespace FModel
                     pen.Alignment = PenAlignment.Inset;
                     toDrawOn.DrawRectangle(pen, new Rectangle(-1, -1, 523, 523));
                     break;
+                case "Minimalist":
                 case "Default":
                     int circleSize = 750; // not that bad like that
                     int circlePos = (522 - circleSize) / 2;
diff --git a/FModel/Properties/Resources.Designer.cs b/FModel/Properties/Resources.Designer.cs
index 880d7723..a1432302 100644
--- a/FModel/Properties/Resources.Designer.cs
+++ b/FModel/Properties/Resources.Designer.cs
@@ -220,6 +220,66 @@ namespace FModel.Properties {
             }
         }
         
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Template_D_F {
+            get {
+                object obj = ResourceManager.GetObject("Template_D_F", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Template_D_N {
+            get {
+                object obj = ResourceManager.GetObject("Template_D_N", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Template_F_F {
+            get {
+                object obj = ResourceManager.GetObject("Template_F_F", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Template_F_N {
+            get {
+                object obj = ResourceManager.GetObject("Template_F_N", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Template_M_F {
+            get {
+                object obj = ResourceManager.GetObject("Template_M_F", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Template_M_N {
+            get {
+                object obj = ResourceManager.GetObject("Template_M_N", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Recherche une ressource localisée de type System.Drawing.Icon semblable à (Icône).
         /// </summary>
@@ -239,45 +299,5 @@ namespace FModel.Properties {
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
-        
-        /// <summary>
-        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap wTemplate {
-            get {
-                object obj = ResourceManager.GetObject("wTemplate", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap wTemplateF {
-            get {
-                object obj = ResourceManager.GetObject("wTemplateF", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap wTemplateFv1 {
-            get {
-                object obj = ResourceManager.GetObject("wTemplateFv1", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap wTemplatev1 {
-            get {
-                object obj = ResourceManager.GetObject("wTemplatev1", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
     }
 }
diff --git a/FModel/Properties/Resources.resx b/FModel/Properties/Resources.resx
index df58a1d8..07256b2c 100644
--- a/FModel/Properties/Resources.resx
+++ b/FModel/Properties/Resources.resx
@@ -133,12 +133,6 @@
   <data name="unknown512" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\unknown512.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="wTemplate" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\wTemplate.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="wTemplateF" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\wTemplateF.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="FModel_Logo" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\FModel_Logo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -175,13 +169,25 @@
   <data name="FModel" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\FModel.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="wTemplateFv1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\wTemplateFv1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="wTemplatev1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\wTemplatev1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="cTemplate" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\cTemplate.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="Template_D_F" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Template_D_F.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Template_D_N" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Template_D_N.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Template_F_F" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Template_F_F.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Template_F_N" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Template_F_N.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Template_M_F" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Template_M_F.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Template_M_N" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Template_M_N.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/FModel/Resources/Template_D_F.png b/FModel/Resources/Template_D_F.png
new file mode 100644
index 00000000..221b621b
Binary files /dev/null and b/FModel/Resources/Template_D_F.png differ
diff --git a/FModel/Resources/Template_D_N.png b/FModel/Resources/Template_D_N.png
new file mode 100644
index 00000000..8e8f5935
Binary files /dev/null and b/FModel/Resources/Template_D_N.png differ
diff --git a/FModel/Resources/Template_F_F.png b/FModel/Resources/Template_F_F.png
new file mode 100644
index 00000000..3223bdda
Binary files /dev/null and b/FModel/Resources/Template_F_F.png differ
diff --git a/FModel/Resources/Template_F_N.png b/FModel/Resources/Template_F_N.png
new file mode 100644
index 00000000..3d63af39
Binary files /dev/null and b/FModel/Resources/Template_F_N.png differ
diff --git a/FModel/Resources/Template_M_F.png b/FModel/Resources/Template_M_F.png
new file mode 100644
index 00000000..4e17e15b
Binary files /dev/null and b/FModel/Resources/Template_M_F.png differ
diff --git a/FModel/Resources/Template_M_N.png b/FModel/Resources/Template_M_N.png
new file mode 100644
index 00000000..14f63837
Binary files /dev/null and b/FModel/Resources/Template_M_N.png differ
diff --git a/FModel/Resources/wTemplate.png b/FModel/Resources/wTemplate.png
deleted file mode 100644
index 95a0baa7..00000000
Binary files a/FModel/Resources/wTemplate.png and /dev/null differ
diff --git a/FModel/Resources/wTemplateF.png b/FModel/Resources/wTemplateF.png
deleted file mode 100644
index 8525b029..00000000
Binary files a/FModel/Resources/wTemplateF.png and /dev/null differ
diff --git a/FModel/Resources/wTemplateFv1.png b/FModel/Resources/wTemplateFv1.png
deleted file mode 100644
index 022564f3..00000000
Binary files a/FModel/Resources/wTemplateFv1.png and /dev/null differ
diff --git a/FModel/Resources/wTemplatev1.png b/FModel/Resources/wTemplatev1.png
deleted file mode 100644
index 830c415e..00000000
Binary files a/FModel/Resources/wTemplatev1.png and /dev/null differ