diff --git a/Screenshots/Screenshot2-store.png b/Screenshots/Screenshot2-store.png
index 8bec2d7..c22ffc3 100644
Binary files a/Screenshots/Screenshot2-store.png and b/Screenshots/Screenshot2-store.png differ
diff --git a/Screenshots/Screenshot2.png b/Screenshots/Screenshot2.png
index ededf59..e7ebe1e 100644
Binary files a/Screenshots/Screenshot2.png and b/Screenshots/Screenshot2.png differ
diff --git a/SimpleClipboardManager.Package/_scale-100.appx b/SimpleClipboardManager.Package/_scale-100.appx
index 2d10bcb..4adc33a 100644
Binary files a/SimpleClipboardManager.Package/_scale-100.appx and b/SimpleClipboardManager.Package/_scale-100.appx differ
diff --git a/SimpleClipboardManager.Package/_scale-125.appx b/SimpleClipboardManager.Package/_scale-125.appx
index 3a5ec8c..6e84aa4 100644
Binary files a/SimpleClipboardManager.Package/_scale-125.appx and b/SimpleClipboardManager.Package/_scale-125.appx differ
diff --git a/SimpleClipboardManager.Package/_scale-150.appx b/SimpleClipboardManager.Package/_scale-150.appx
index 93e1184..246e740 100644
Binary files a/SimpleClipboardManager.Package/_scale-150.appx and b/SimpleClipboardManager.Package/_scale-150.appx differ
diff --git a/SimpleClipboardManager.Package/_scale-400.appx b/SimpleClipboardManager.Package/_scale-400.appx
index 4384c18..ef85180 100644
Binary files a/SimpleClipboardManager.Package/_scale-400.appx and b/SimpleClipboardManager.Package/_scale-400.appx differ
diff --git a/SimpleClipboardManager.Package/package.appxmanifest b/SimpleClipboardManager.Package/package.appxmanifest
index 00fad35..567ed12 100644
--- a/SimpleClipboardManager.Package/package.appxmanifest
+++ b/SimpleClipboardManager.Package/package.appxmanifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities" IgnorableNamespaces="uap rescap mp">
-  <Identity Name="21227NicolaiHenriksen.SimpleClipboardManager" ProcessorArchitecture="x64" Version="1.8.0.0" Publisher="CN=786B4C61-591E-4C79-AA02-E3FF377CBEB8" />
+  <Identity Name="21227NicolaiHenriksen.SimpleClipboardManager" ProcessorArchitecture="x64" Version="1.9.0.0" Publisher="CN=786B4C61-591E-4C79-AA02-E3FF377CBEB8" />
   <mp:PhoneIdentity PhoneProductId="8192dabb-fcf6-4a62-bba6-799f81dd3851" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
     <DisplayName>Simple Clipboard Manager</DisplayName>
diff --git a/SimpleClipboardManager/ClipboardManager.cs b/SimpleClipboardManager/ClipboardManager.cs
index 26ad854..093f686 100644
--- a/SimpleClipboardManager/ClipboardManager.cs
+++ b/SimpleClipboardManager/ClipboardManager.cs
@@ -232,6 +232,7 @@ private void ClipboardNotification_ClipboardUpdated(string text)
                 return;
 
             ClipboardItems.Insert(0, new ClipboardItem { Text = text });
+            TruncateClipboardIfNeeded();
             SaveClipboard();
         }
 
@@ -280,6 +281,7 @@ private void LoadClipboard()
 
         public void SaveSettings()
         {
+            TruncateClipboardIfNeeded();
             var serializer = new DataContractSerializer(typeof(SettingsModel));
             lock (FileAccessLock)
             {
@@ -303,6 +305,20 @@ public void SaveSettings()
             }
         }
 
+        private void TruncateClipboardIfNeeded()
+        {
+            var numItemsToRemove = ClipboardItems.Count - Settings.MaxStoredItems;
+            if (numItemsToRemove <= 0)
+                return;
+            var copy = new List<ClipboardItem>(ClipboardItems.Where(ci => ci.Favorite.HasValue == false));
+            copy.Reverse();
+            for (int i=0; i<numItemsToRemove; i++)
+            {
+                var itemToRemove = copy[i];
+                ClipboardItems.Remove(itemToRemove);
+            }
+        }
+
         private static void SetStartOnBoot()
         {
             try
diff --git a/SimpleClipboardManager/ClipboardManagerContext.cs b/SimpleClipboardManager/ClipboardManagerContext.cs
index aba930c..21b96d4 100644
--- a/SimpleClipboardManager/ClipboardManagerContext.cs
+++ b/SimpleClipboardManager/ClipboardManagerContext.cs
@@ -27,7 +27,7 @@ public ClipboardManagerContext()
 
         private void ShowSettings(object sender, EventArgs e)
         {
-            var dialog = new SettingsDialog(null, _manager.Settings)
+            var dialog = new SettingsDialog(null, _manager)
             {
                 StartPosition = FormStartPosition.CenterScreen
             };
diff --git a/SimpleClipboardManager/Dialogs/PasteFromClipboardDialog.cs b/SimpleClipboardManager/Dialogs/PasteFromClipboardDialog.cs
index 61c9c13..6af9423 100644
--- a/SimpleClipboardManager/Dialogs/PasteFromClipboardDialog.cs
+++ b/SimpleClipboardManager/Dialogs/PasteFromClipboardDialog.cs
@@ -320,7 +320,7 @@ public void DoPaste()
 
         private void BtnSettings_Click(object sender, EventArgs e)
         {
-            var dialog = new SettingsDialog(this, _manager.Settings);
+            var dialog = new SettingsDialog(this, _manager);
             if (dialog.ShowDialog() == DialogResult.OK)
             {
                 _manager.SaveSettings();
diff --git a/SimpleClipboardManager/Dialogs/SettingsDialog.Designer.cs b/SimpleClipboardManager/Dialogs/SettingsDialog.Designer.cs
index 6f9f8a6..56a57fc 100644
--- a/SimpleClipboardManager/Dialogs/SettingsDialog.Designer.cs
+++ b/SimpleClipboardManager/Dialogs/SettingsDialog.Designer.cs
@@ -41,7 +41,9 @@ private void InitializeComponent()
             this.RadioThemeGreen = new System.Windows.Forms.RadioButton();
             this.RadioThemeDark = new System.Windows.Forms.RadioButton();
             this.RadioThemeLight = new System.Windows.Forms.RadioButton();
-            this.groupBox3 = new System.Windows.Forms.GroupBox();
+            this.GroupBoxStorageAndStartup = new System.Windows.Forms.GroupBox();
+            this.label6 = new System.Windows.Forms.Label();
+            this.ComboMaxItemsStored = new System.Windows.Forms.ComboBox();
             this.CheckStartOnBoot = new System.Windows.Forms.CheckBox();
             this.CheckStorage = new System.Windows.Forms.CheckBox();
             this.LblDisclaimerText = new System.Windows.Forms.Label();
@@ -65,7 +67,7 @@ private void InitializeComponent()
             ((System.ComponentModel.ISupportInitialize)(this.TrackOpacity)).BeginInit();
             this.tableLayoutPanel2.SuspendLayout();
             this.groupBox4.SuspendLayout();
-            this.groupBox3.SuspendLayout();
+            this.GroupBoxStorageAndStartup.SuspendLayout();
             this.groupBox2.SuspendLayout();
             this.groupBox1.SuspendLayout();
             this.tableLayoutPanel1.SuspendLayout();
@@ -78,9 +80,9 @@ private void InitializeComponent()
             this.groupBox5.Controls.Add(this.label7);
             this.groupBox5.Controls.Add(this.TrackOpacity);
             this.groupBox5.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.groupBox5.Location = new System.Drawing.Point(3, 466);
+            this.groupBox5.Location = new System.Drawing.Point(3, 496);
             this.groupBox5.Name = "groupBox5";
-            this.groupBox5.Size = new System.Drawing.Size(446, 75);
+            this.groupBox5.Size = new System.Drawing.Size(485, 75);
             this.groupBox5.TabIndex = 9;
             this.groupBox5.TabStop = false;
             this.groupBox5.Text = "Opacity";
@@ -125,7 +127,7 @@ private void InitializeComponent()
             this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
             this.tableLayoutPanel2.Controls.Add(this.BtnOk, 0, 0);
             this.tableLayoutPanel2.Controls.Add(this.BtnCancel, 2, 0);
-            this.tableLayoutPanel2.Location = new System.Drawing.Point(140, 560);
+            this.tableLayoutPanel2.Location = new System.Drawing.Point(159, 586);
             this.tableLayoutPanel2.Name = "tableLayoutPanel2";
             this.tableLayoutPanel2.RowCount = 1;
             this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
@@ -162,9 +164,9 @@ private void InitializeComponent()
             this.groupBox4.Controls.Add(this.RadioThemeDark);
             this.groupBox4.Controls.Add(this.RadioThemeLight);
             this.groupBox4.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.groupBox4.Location = new System.Drawing.Point(3, 407);
+            this.groupBox4.Location = new System.Drawing.Point(3, 437);
             this.groupBox4.Name = "groupBox4";
-            this.groupBox4.Size = new System.Drawing.Size(446, 53);
+            this.groupBox4.Size = new System.Drawing.Size(485, 53);
             this.groupBox4.TabIndex = 8;
             this.groupBox4.TabStop = false;
             this.groupBox4.Text = "Theme";
@@ -213,24 +215,81 @@ private void InitializeComponent()
             this.RadioThemeLight.Text = "Light";
             this.RadioThemeLight.UseVisualStyleBackColor = true;
             // 
-            // groupBox3
-            // 
-            this.groupBox3.Controls.Add(this.CheckStartOnBoot);
-            this.groupBox3.Controls.Add(this.CheckStorage);
-            this.groupBox3.Controls.Add(this.LblDisclaimerText);
-            this.groupBox3.Controls.Add(this.LblDisclaimerHeader);
-            this.groupBox3.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.groupBox3.Location = new System.Drawing.Point(3, 287);
-            this.groupBox3.Name = "groupBox3";
-            this.groupBox3.Size = new System.Drawing.Size(446, 114);
-            this.groupBox3.TabIndex = 7;
-            this.groupBox3.TabStop = false;
-            this.groupBox3.Text = "Storage && Startup";
+            // GroupBoxStorageAndStartup
+            // 
+            this.GroupBoxStorageAndStartup.Controls.Add(this.label6);
+            this.GroupBoxStorageAndStartup.Controls.Add(this.ComboMaxItemsStored);
+            this.GroupBoxStorageAndStartup.Controls.Add(this.CheckStartOnBoot);
+            this.GroupBoxStorageAndStartup.Controls.Add(this.CheckStorage);
+            this.GroupBoxStorageAndStartup.Controls.Add(this.LblDisclaimerText);
+            this.GroupBoxStorageAndStartup.Controls.Add(this.LblDisclaimerHeader);
+            this.GroupBoxStorageAndStartup.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.GroupBoxStorageAndStartup.Location = new System.Drawing.Point(3, 287);
+            this.GroupBoxStorageAndStartup.Name = "GroupBoxStorageAndStartup";
+            this.GroupBoxStorageAndStartup.Size = new System.Drawing.Size(485, 144);
+            this.GroupBoxStorageAndStartup.TabIndex = 7;
+            this.GroupBoxStorageAndStartup.TabStop = false;
+            this.GroupBoxStorageAndStartup.Text = "Storage && Startup";
+            // 
+            // label6
+            // 
+            this.label6.AutoSize = true;
+            this.label6.Location = new System.Drawing.Point(76, 51);
+            this.label6.Name = "label6";
+            this.label6.Size = new System.Drawing.Size(394, 17);
+            this.label6.TabIndex = 16;
+            this.label6.Text = "items will at most be stored (oldest non-favorites deleted first)";
+            // 
+            // ComboMaxItemsStored
+            // 
+            this.ComboMaxItemsStored.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.ComboMaxItemsStored.FormattingEnabled = true;
+            this.ComboMaxItemsStored.Items.AddRange(new object[] {
+            "15",
+            "16",
+            "17",
+            "18",
+            "19",
+            "20",
+            "21",
+            "22",
+            "23",
+            "24",
+            "25",
+            "26",
+            "27",
+            "28",
+            "29",
+            "30",
+            "31",
+            "32",
+            "33",
+            "34",
+            "35",
+            "36",
+            "37",
+            "38",
+            "39",
+            "40",
+            "41",
+            "42",
+            "43",
+            "44",
+            "45",
+            "46",
+            "47",
+            "48",
+            "49",
+            "50"});
+            this.ComboMaxItemsStored.Location = new System.Drawing.Point(13, 48);
+            this.ComboMaxItemsStored.Name = "ComboMaxItemsStored";
+            this.ComboMaxItemsStored.Size = new System.Drawing.Size(56, 24);
+            this.ComboMaxItemsStored.TabIndex = 15;
             // 
             // CheckStartOnBoot
             // 
             this.CheckStartOnBoot.AutoSize = true;
-            this.CheckStartOnBoot.Location = new System.Drawing.Point(13, 48);
+            this.CheckStartOnBoot.Location = new System.Drawing.Point(13, 78);
             this.CheckStartOnBoot.Name = "CheckStartOnBoot";
             this.CheckStartOnBoot.Size = new System.Drawing.Size(268, 21);
             this.CheckStartOnBoot.TabIndex = 13;
@@ -250,7 +309,7 @@ private void InitializeComponent()
             // LblDisclaimerText
             // 
             this.LblDisclaimerText.AutoSize = true;
-            this.LblDisclaimerText.Location = new System.Drawing.Point(10, 89);
+            this.LblDisclaimerText.Location = new System.Drawing.Point(10, 119);
             this.LblDisclaimerText.Name = "LblDisclaimerText";
             this.LblDisclaimerText.Size = new System.Drawing.Size(428, 17);
             this.LblDisclaimerText.TabIndex = 11;
@@ -260,7 +319,7 @@ private void InitializeComponent()
             // 
             this.LblDisclaimerHeader.AutoSize = true;
             this.LblDisclaimerHeader.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline))), System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.LblDisclaimerHeader.Location = new System.Drawing.Point(10, 72);
+            this.LblDisclaimerHeader.Location = new System.Drawing.Point(10, 102);
             this.LblDisclaimerHeader.Name = "LblDisclaimerHeader";
             this.LblDisclaimerHeader.Size = new System.Drawing.Size(83, 17);
             this.LblDisclaimerHeader.TabIndex = 8;
@@ -274,7 +333,7 @@ private void InitializeComponent()
             this.groupBox2.Dock = System.Windows.Forms.DockStyle.Fill;
             this.groupBox2.Location = new System.Drawing.Point(3, 99);
             this.groupBox2.Name = "groupBox2";
-            this.groupBox2.Size = new System.Drawing.Size(446, 94);
+            this.groupBox2.Size = new System.Drawing.Size(485, 94);
             this.groupBox2.TabIndex = 6;
             this.groupBox2.TabStop = false;
             this.groupBox2.Text = "Activation";
@@ -320,7 +379,7 @@ private void InitializeComponent()
             this.groupBox1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.groupBox1.Location = new System.Drawing.Point(3, 3);
             this.groupBox1.Name = "groupBox1";
-            this.groupBox1.Size = new System.Drawing.Size(446, 90);
+            this.groupBox1.Size = new System.Drawing.Size(485, 90);
             this.groupBox1.TabIndex = 5;
             this.groupBox1.TabStop = false;
             this.groupBox1.Text = "Display Items";
@@ -474,7 +533,7 @@ private void InitializeComponent()
             this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
             this.tableLayoutPanel1.Controls.Add(this.groupBox1, 0, 0);
             this.tableLayoutPanel1.Controls.Add(this.groupBox2, 0, 1);
-            this.tableLayoutPanel1.Controls.Add(this.groupBox3, 0, 3);
+            this.tableLayoutPanel1.Controls.Add(this.GroupBoxStorageAndStartup, 0, 3);
             this.tableLayoutPanel1.Controls.Add(this.groupBox4, 0, 4);
             this.tableLayoutPanel1.Controls.Add(this.tableLayoutPanel2, 0, 6);
             this.tableLayoutPanel1.Controls.Add(this.groupBox5, 0, 5);
@@ -486,11 +545,11 @@ private void InitializeComponent()
             this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 96F));
             this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 100F));
             this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 88F));
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 120F));
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 150F));
             this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 59F));
             this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 81F));
             this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
-            this.tableLayoutPanel1.Size = new System.Drawing.Size(452, 606);
+            this.tableLayoutPanel1.Size = new System.Drawing.Size(491, 628);
             this.tableLayoutPanel1.TabIndex = 0;
             // 
             // groupBox6
@@ -501,7 +560,7 @@ private void InitializeComponent()
             this.groupBox6.Dock = System.Windows.Forms.DockStyle.Fill;
             this.groupBox6.Location = new System.Drawing.Point(3, 199);
             this.groupBox6.Name = "groupBox6";
-            this.groupBox6.Size = new System.Drawing.Size(446, 82);
+            this.groupBox6.Size = new System.Drawing.Size(485, 82);
             this.groupBox6.TabIndex = 10;
             this.groupBox6.TabStop = false;
             this.groupBox6.Text = "Item Preview";
@@ -547,7 +606,7 @@ private void InitializeComponent()
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.CancelButton = this.BtnCancel;
-            this.ClientSize = new System.Drawing.Size(462, 616);
+            this.ClientSize = new System.Drawing.Size(501, 638);
             this.Controls.Add(this.tableLayoutPanel1);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
@@ -563,8 +622,8 @@ private void InitializeComponent()
             this.tableLayoutPanel2.ResumeLayout(false);
             this.groupBox4.ResumeLayout(false);
             this.groupBox4.PerformLayout();
-            this.groupBox3.ResumeLayout(false);
-            this.groupBox3.PerformLayout();
+            this.GroupBoxStorageAndStartup.ResumeLayout(false);
+            this.GroupBoxStorageAndStartup.PerformLayout();
             this.groupBox2.ResumeLayout(false);
             this.groupBox2.PerformLayout();
             this.groupBox1.ResumeLayout(false);
@@ -591,7 +650,7 @@ private void InitializeComponent()
         private System.Windows.Forms.RadioButton RadioThemeGreen;
         private System.Windows.Forms.RadioButton RadioThemeDark;
         private System.Windows.Forms.RadioButton RadioThemeLight;
-        private System.Windows.Forms.GroupBox groupBox3;
+        private System.Windows.Forms.GroupBox GroupBoxStorageAndStartup;
         private System.Windows.Forms.CheckBox CheckStartOnBoot;
         private System.Windows.Forms.CheckBox CheckStorage;
         private System.Windows.Forms.Label LblDisclaimerText;
@@ -611,5 +670,7 @@ private void InitializeComponent()
         private System.Windows.Forms.Label label5;
         private System.Windows.Forms.ComboBox ComboMaxPreviewLines;
         private System.Windows.Forms.CheckBox CheckPreviewEnabled;
+        private System.Windows.Forms.Label label6;
+        private System.Windows.Forms.ComboBox ComboMaxItemsStored;
     }
 }
\ No newline at end of file
diff --git a/SimpleClipboardManager/Dialogs/SettingsDialog.cs b/SimpleClipboardManager/Dialogs/SettingsDialog.cs
index 937ec9b..6b72acf 100644
--- a/SimpleClipboardManager/Dialogs/SettingsDialog.cs
+++ b/SimpleClipboardManager/Dialogs/SettingsDialog.cs
@@ -1,5 +1,6 @@
 using SimpleClipboardManager.Model;
 using System;
+using System.Linq;
 using System.Text;
 using System.Windows.Forms;
 
@@ -7,14 +8,17 @@ namespace SimpleClipboardManager.Dialogs
 {
     internal partial class SettingsDialog : Form
     {
+        private ClipboardManager _manager;
         private PasteFromClipboardDialog _pasteFromClipboardDialog;
         private SettingsModel _model;
+        private int _lastMaxStoredItemsValue;
 
-        public SettingsDialog(PasteFromClipboardDialog pasteFromClipboardDialog, SettingsModel model)
+        public SettingsDialog(PasteFromClipboardDialog pasteFromClipboardDialog, ClipboardManager manager)
         {
             InitializeComponent();
+            _manager = manager;
             _pasteFromClipboardDialog = pasteFromClipboardDialog;
-            _model = model;
+            _model = _manager.Settings;
             PopulateViewFromModel();
 
             // Wire up dynamic content (i.e. properties that modify the visual appearance for immediate preview)
@@ -24,13 +28,35 @@ public SettingsDialog(PasteFromClipboardDialog pasteFromClipboardDialog, Setting
             RadioThemeBlue.CheckedChanged += DynamicContentChanged;
             TrackOpacity.ValueChanged += DynamicContentChanged;
 
+            ComboMaxItemsStored.SelectedValueChanged += ComboMaxItemsStored_SelectedValueChanged;
+
             ModifyLayoutBasedOnAppType();
         }
 
+        private void ComboMaxItemsStored_SelectedValueChanged(object sender, EventArgs e)
+        {
+            var max = Convert.ToInt32(ComboMaxItemsStored.SelectedItem);
+            if (_manager.ClipboardItems.Count <= max)
+            {
+                _lastMaxStoredItemsValue = max;
+                return;
+            }
+            var numToDelete = _manager.ClipboardItems.Count - max;
+            var result = MessageBox.Show(this, $"The {numToDelete} oldest, non-favorite, items will be deleted, are you sure you wish to continue?", "Items will be deleted", MessageBoxButtons.YesNo, MessageBoxIcon.Warning);
+            if (result == DialogResult.Yes)
+            {
+                _lastMaxStoredItemsValue = max;
+                return;
+            }
+            if (max != _lastMaxStoredItemsValue)
+                ComboMaxItemsStored.SelectedItem = "" + _lastMaxStoredItemsValue;
+        }
+
         private void ModifyLayoutBasedOnAppType()
         {
             if (IsRunningAsUwp())
             {
+                GroupBoxStorageAndStartup.Text = "Storage";
                 CheckStartOnBoot.Visible = false;
                 var removedPixels = CheckStartOnBoot.Height + 4;
                 LblDisclaimerHeader.Top -= removedPixels;
@@ -69,6 +95,8 @@ private void PopulateViewFromModel()
             CheckPreviewEnabled.Checked = _model.ShowItemPreview;
             ComboMaxPreviewLines.SelectedItem = "" + _model.MaxPreviewLines;
             CheckStorage.Checked = _model.StorageEnabled;
+            ComboMaxItemsStored.SelectedItem = "" + _model.MaxStoredItems;
+            _lastMaxStoredItemsValue = _model.MaxStoredItems;
             CheckStartOnBoot.Checked = _model.StartOnBoot;
             RadioThemeLight.Checked = _model.Theme == Theme.Light;
             RadioThemeDark.Checked = _model.Theme == Theme.Dark;
@@ -102,6 +130,7 @@ private void PopulateModelFromView()
             _model.ShowItemPreview = CheckPreviewEnabled.Checked;
             _model.MaxPreviewLines = Convert.ToInt32(ComboMaxPreviewLines.SelectedItem);
             _model.StorageEnabled = CheckStorage.Checked;
+            _model.MaxStoredItems = Convert.ToInt32(ComboMaxItemsStored.SelectedItem);
             _model.StartOnBoot = !IsRunningAsUwp() && CheckStartOnBoot.Checked;
             _model.Opacity = GetOpacity();
             _model.Theme = GetTheme();
diff --git a/SimpleClipboardManager/Model/SettingsModel.cs b/SimpleClipboardManager/Model/SettingsModel.cs
index d2e2825..570351c 100644
--- a/SimpleClipboardManager/Model/SettingsModel.cs
+++ b/SimpleClipboardManager/Model/SettingsModel.cs
@@ -31,11 +31,14 @@ public class SettingsModel
         [DataMember]
         public bool StorageEnabled { get; set; }
 
+        [DataMember]
+        public int MaxStoredItems { get; set; } = 20;
+
         [DataMember]
         public bool StartOnBoot { get; set; }
 
         [DataMember]
-        public Theme Theme { get; set; } = Theme.Green;
+        public Theme Theme { get; set; } = Theme.Blue;
 
         [DataMember]
         public double Opacity { get; set; } = 1;
@@ -45,5 +48,17 @@ public class SettingsModel
 
         [DataMember]
         public int MaxPreviewLines { get; set; } = 3;
+
+        [OnDeserializing]
+        void OnDeserializing(StreamingContext context)
+        {
+            MinDisplayItems = 5;
+            MaxDisplayItems = 20;
+            HotKey = HotKey.ControlInsert;
+            MaxStoredItems = 20;
+            Theme = Theme.Blue;
+            ShowItemPreview = true;
+            MaxPreviewLines = 3;
+        }
     }
 }
diff --git a/SimpleClipboardManager/Properties/AssemblyInfo.cs b/SimpleClipboardManager/Properties/AssemblyInfo.cs
index 8c7c7b1..a3b9ead 100644
--- a/SimpleClipboardManager/Properties/AssemblyInfo.cs
+++ b/SimpleClipboardManager/Properties/AssemblyInfo.cs
@@ -21,5 +21,5 @@
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("786eae12-626d-4190-bbb0-41f26bfdfb22")]
 
-[assembly: AssemblyVersion("1.8.0.0")]
-[assembly: AssemblyFileVersion("1.8.0.0")]
+[assembly: AssemblyVersion("1.9.0.0")]
+[assembly: AssemblyFileVersion("1.9.0.0")]