diff --git a/EntryList.cs b/EntryList.cs
index dd43a65..f6af196 100755
--- a/EntryList.cs
+++ b/EntryList.cs
@@ -9,7 +9,7 @@
 namespace Entries
 {
     public class Entry
-    {
+    {        
         public string Target { get; set; }
         public string Icon { get; set; }
         public int IconIndex { get; set; }
@@ -19,6 +19,7 @@
 
     public class EntryList
     {
+        public string FilePath = null;
         public List<Entry> Entries;
 
         public static EntryList FromString(string contents)
@@ -34,7 +35,10 @@
             {
                 contents = new StreamReader(input).ReadToEnd();
             }
-            return FromString(contents);
+            EntryList entryList = FromString(contents);
+            if (entryList != null) entryList.FilePath = Path.GetFullPath(path);
+
+            return entryList;
         }
 
         public override string ToString()

diff --git a/EntryList.cs b/EntryList.cs
index dd43a65..f6af196 100755
--- a/EntryList.cs
+++ b/EntryList.cs
@@ -9,7 +9,7 @@
 namespace Entries
 {
     public class Entry
-    {
+    {        
         public string Target { get; set; }
         public string Icon { get; set; }
         public int IconIndex { get; set; }
@@ -19,6 +19,7 @@
 
     public class EntryList
     {
+        public string FilePath = null;
         public List<Entry> Entries;
 
         public static EntryList FromString(string contents)
@@ -34,7 +35,10 @@
             {
                 contents = new StreamReader(input).ReadToEnd();
             }
-            return FromString(contents);
+            EntryList entryList = FromString(contents);
+            if (entryList != null) entryList.FilePath = Path.GetFullPath(path);
+
+            return entryList;
         }
 
         public override string ToString()
diff --git a/ShortcutUtil/MainForm.Designer.cs b/ShortcutUtil/MainForm.Designer.cs
index fbb1aee..5dbf023 100755
--- a/ShortcutUtil/MainForm.Designer.cs
+++ b/ShortcutUtil/MainForm.Designer.cs
@@ -28,49 +28,95 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.label1 = new System.Windows.Forms.Label();
+            this.defaultShortcutLabel = new System.Windows.Forms.Label();
             this.entryListBox = new System.Windows.Forms.ListBox();
             this.createButton = new System.Windows.Forms.Button();
+            this.appUserModelIdLabel = new System.Windows.Forms.Label();
+            this.appUserModelIdBox = new ShortcutUtil.WatermarkTextBox();
+            this.appButton = new System.Windows.Forms.Button();
+            this.hwndButton = new System.Windows.Forms.Button();
             this.SuspendLayout();
             // 
-            // label1
+            // defaultShortcutLabel
             // 
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(13, 13);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(169, 20);
-            this.label1.TabIndex = 0;
-            this.label1.Text = "Select default shortcut";
+            this.defaultShortcutLabel.AutoSize = true;
+            this.defaultShortcutLabel.Location = new System.Drawing.Point(14, 75);
+            this.defaultShortcutLabel.Name = "defaultShortcutLabel";
+            this.defaultShortcutLabel.Size = new System.Drawing.Size(169, 20);
+            this.defaultShortcutLabel.TabIndex = 0;
+            this.defaultShortcutLabel.Text = "Select default shortcut";
             // 
             // entryListBox
             // 
             this.entryListBox.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawVariable;
             this.entryListBox.FormattingEnabled = true;
-            this.entryListBox.Location = new System.Drawing.Point(17, 37);
+            this.entryListBox.Location = new System.Drawing.Point(16, 98);
             this.entryListBox.Name = "entryListBox";
-            this.entryListBox.Size = new System.Drawing.Size(771, 355);
+            this.entryListBox.Size = new System.Drawing.Size(770, 355);
             this.entryListBox.TabIndex = 1;
             this.entryListBox.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.entryListBox_DrawItem);
             this.entryListBox.MeasureItem += new System.Windows.Forms.MeasureItemEventHandler(this.entryListBox_MeasureItem);
             // 
             // createButton
             // 
-            this.createButton.Location = new System.Drawing.Point(644, 398);
+            this.createButton.Location = new System.Drawing.Point(644, 458);
             this.createButton.Name = "createButton";
             this.createButton.Size = new System.Drawing.Size(144, 40);
             this.createButton.TabIndex = 2;
             this.createButton.Text = "Create Shortcut";
             this.createButton.UseVisualStyleBackColor = true;
             // 
+            // appUserModelIdLabel
+            // 
+            this.appUserModelIdLabel.AutoSize = true;
+            this.appUserModelIdLabel.Location = new System.Drawing.Point(14, 12);
+            this.appUserModelIdLabel.Name = "appUserModelIdLabel";
+            this.appUserModelIdLabel.Size = new System.Drawing.Size(213, 20);
+            this.appUserModelIdLabel.TabIndex = 3;
+            this.appUserModelIdLabel.Text = "Shortcut App User Model ID:";
+            // 
+            // appUserModelIdBox
+            // 
+            this.appUserModelIdBox.Location = new System.Drawing.Point(16, 35);
+            this.appUserModelIdBox.Name = "appUserModelIdBox";
+            this.appUserModelIdBox.Size = new System.Drawing.Size(608, 26);
+            this.appUserModelIdBox.TabIndex = 4;
+            this.appUserModelIdBox.WaterMarkColor = System.Drawing.Color.Gray;
+            this.appUserModelIdBox.WaterMarkText = "Enter a manual ID, or select on from a UWP App or open Window";
+            // 
+            // appButton
+            // 
+            this.appButton.Location = new System.Drawing.Point(633, 35);
+            this.appButton.Name = "appButton";
+            this.appButton.Size = new System.Drawing.Size(74, 31);
+            this.appButton.TabIndex = 5;
+            this.appButton.Text = "APP";
+            this.appButton.UseVisualStyleBackColor = true;
+            this.appButton.Click += new System.EventHandler(this.appButton_Click);
+            // 
+            // hwndButton
+            // 
+            this.hwndButton.Location = new System.Drawing.Point(712, 35);
+            this.hwndButton.MinimumSize = new System.Drawing.Size(76, 26);
+            this.hwndButton.Name = "hwndButton";
+            this.hwndButton.Size = new System.Drawing.Size(76, 31);
+            this.hwndButton.TabIndex = 6;
+            this.hwndButton.Text = "HWND";
+            this.hwndButton.UseVisualStyleBackColor = true;
+            // 
             // MainForm
             // 
             this.AcceptButton = this.createButton;
             this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(800, 444);
+            this.ClientSize = new System.Drawing.Size(800, 508);
+            this.Controls.Add(this.hwndButton);
+            this.Controls.Add(this.appButton);
+            this.Controls.Add(this.appUserModelIdBox);
+            this.Controls.Add(this.appUserModelIdLabel);
             this.Controls.Add(this.createButton);
             this.Controls.Add(this.entryListBox);
-            this.Controls.Add(this.label1);
+            this.Controls.Add(this.defaultShortcutLabel);
             this.Name = "MainForm";
             this.Text = "Form1";
             this.Shown += new System.EventHandler(this.MainForm_Shown);
@@ -82,9 +128,13 @@
 
         #endregion
 
-        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.Label defaultShortcutLabel;
         private System.Windows.Forms.ListBox entryListBox;
         private System.Windows.Forms.Button createButton;
+        private System.Windows.Forms.Label appUserModelIdLabel;
+        private System.Windows.Forms.Button appButton;
+        private System.Windows.Forms.Button hwndButton;
+        private WatermarkTextBox appUserModelIdBox;
     }
 }
 

diff --git a/EntryList.cs b/EntryList.cs
index dd43a65..f6af196 100755
--- a/EntryList.cs
+++ b/EntryList.cs
@@ -9,7 +9,7 @@
 namespace Entries
 {
     public class Entry
-    {
+    {        
         public string Target { get; set; }
         public string Icon { get; set; }
         public int IconIndex { get; set; }
@@ -19,6 +19,7 @@
 
     public class EntryList
     {
+        public string FilePath = null;
         public List<Entry> Entries;
 
         public static EntryList FromString(string contents)
@@ -34,7 +35,10 @@
             {
                 contents = new StreamReader(input).ReadToEnd();
             }
-            return FromString(contents);
+            EntryList entryList = FromString(contents);
+            if (entryList != null) entryList.FilePath = Path.GetFullPath(path);
+
+            return entryList;
         }
 
         public override string ToString()
diff --git a/ShortcutUtil/MainForm.Designer.cs b/ShortcutUtil/MainForm.Designer.cs
index fbb1aee..5dbf023 100755
--- a/ShortcutUtil/MainForm.Designer.cs
+++ b/ShortcutUtil/MainForm.Designer.cs
@@ -28,49 +28,95 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.label1 = new System.Windows.Forms.Label();
+            this.defaultShortcutLabel = new System.Windows.Forms.Label();
             this.entryListBox = new System.Windows.Forms.ListBox();
             this.createButton = new System.Windows.Forms.Button();
+            this.appUserModelIdLabel = new System.Windows.Forms.Label();
+            this.appUserModelIdBox = new ShortcutUtil.WatermarkTextBox();
+            this.appButton = new System.Windows.Forms.Button();
+            this.hwndButton = new System.Windows.Forms.Button();
             this.SuspendLayout();
             // 
-            // label1
+            // defaultShortcutLabel
             // 
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(13, 13);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(169, 20);
-            this.label1.TabIndex = 0;
-            this.label1.Text = "Select default shortcut";
+            this.defaultShortcutLabel.AutoSize = true;
+            this.defaultShortcutLabel.Location = new System.Drawing.Point(14, 75);
+            this.defaultShortcutLabel.Name = "defaultShortcutLabel";
+            this.defaultShortcutLabel.Size = new System.Drawing.Size(169, 20);
+            this.defaultShortcutLabel.TabIndex = 0;
+            this.defaultShortcutLabel.Text = "Select default shortcut";
             // 
             // entryListBox
             // 
             this.entryListBox.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawVariable;
             this.entryListBox.FormattingEnabled = true;
-            this.entryListBox.Location = new System.Drawing.Point(17, 37);
+            this.entryListBox.Location = new System.Drawing.Point(16, 98);
             this.entryListBox.Name = "entryListBox";
-            this.entryListBox.Size = new System.Drawing.Size(771, 355);
+            this.entryListBox.Size = new System.Drawing.Size(770, 355);
             this.entryListBox.TabIndex = 1;
             this.entryListBox.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.entryListBox_DrawItem);
             this.entryListBox.MeasureItem += new System.Windows.Forms.MeasureItemEventHandler(this.entryListBox_MeasureItem);
             // 
             // createButton
             // 
-            this.createButton.Location = new System.Drawing.Point(644, 398);
+            this.createButton.Location = new System.Drawing.Point(644, 458);
             this.createButton.Name = "createButton";
             this.createButton.Size = new System.Drawing.Size(144, 40);
             this.createButton.TabIndex = 2;
             this.createButton.Text = "Create Shortcut";
             this.createButton.UseVisualStyleBackColor = true;
             // 
+            // appUserModelIdLabel
+            // 
+            this.appUserModelIdLabel.AutoSize = true;
+            this.appUserModelIdLabel.Location = new System.Drawing.Point(14, 12);
+            this.appUserModelIdLabel.Name = "appUserModelIdLabel";
+            this.appUserModelIdLabel.Size = new System.Drawing.Size(213, 20);
+            this.appUserModelIdLabel.TabIndex = 3;
+            this.appUserModelIdLabel.Text = "Shortcut App User Model ID:";
+            // 
+            // appUserModelIdBox
+            // 
+            this.appUserModelIdBox.Location = new System.Drawing.Point(16, 35);
+            this.appUserModelIdBox.Name = "appUserModelIdBox";
+            this.appUserModelIdBox.Size = new System.Drawing.Size(608, 26);
+            this.appUserModelIdBox.TabIndex = 4;
+            this.appUserModelIdBox.WaterMarkColor = System.Drawing.Color.Gray;
+            this.appUserModelIdBox.WaterMarkText = "Enter a manual ID, or select on from a UWP App or open Window";
+            // 
+            // appButton
+            // 
+            this.appButton.Location = new System.Drawing.Point(633, 35);
+            this.appButton.Name = "appButton";
+            this.appButton.Size = new System.Drawing.Size(74, 31);
+            this.appButton.TabIndex = 5;
+            this.appButton.Text = "APP";
+            this.appButton.UseVisualStyleBackColor = true;
+            this.appButton.Click += new System.EventHandler(this.appButton_Click);
+            // 
+            // hwndButton
+            // 
+            this.hwndButton.Location = new System.Drawing.Point(712, 35);
+            this.hwndButton.MinimumSize = new System.Drawing.Size(76, 26);
+            this.hwndButton.Name = "hwndButton";
+            this.hwndButton.Size = new System.Drawing.Size(76, 31);
+            this.hwndButton.TabIndex = 6;
+            this.hwndButton.Text = "HWND";
+            this.hwndButton.UseVisualStyleBackColor = true;
+            // 
             // MainForm
             // 
             this.AcceptButton = this.createButton;
             this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(800, 444);
+            this.ClientSize = new System.Drawing.Size(800, 508);
+            this.Controls.Add(this.hwndButton);
+            this.Controls.Add(this.appButton);
+            this.Controls.Add(this.appUserModelIdBox);
+            this.Controls.Add(this.appUserModelIdLabel);
             this.Controls.Add(this.createButton);
             this.Controls.Add(this.entryListBox);
-            this.Controls.Add(this.label1);
+            this.Controls.Add(this.defaultShortcutLabel);
             this.Name = "MainForm";
             this.Text = "Form1";
             this.Shown += new System.EventHandler(this.MainForm_Shown);
@@ -82,9 +128,13 @@
 
         #endregion
 
-        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.Label defaultShortcutLabel;
         private System.Windows.Forms.ListBox entryListBox;
         private System.Windows.Forms.Button createButton;
+        private System.Windows.Forms.Label appUserModelIdLabel;
+        private System.Windows.Forms.Button appButton;
+        private System.Windows.Forms.Button hwndButton;
+        private WatermarkTextBox appUserModelIdBox;
     }
 }
 
diff --git a/ShortcutUtil/MainForm.cs b/ShortcutUtil/MainForm.cs
index cb5990a..680ed45 100755
--- a/ShortcutUtil/MainForm.cs
+++ b/ShortcutUtil/MainForm.cs
@@ -9,6 +9,9 @@
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using Windows.ApplicationModel;
+using Windows.ApplicationModel.Core;
+using Windows.Management.Deployment;
 
 namespace ShortcutUtil
 {
@@ -28,13 +31,20 @@
         {
             InitializeComponent();
 
-            defaultFont = label1.Font;
+            Text = entryList.FilePath == null ? "New shortcut file" : entryList.FilePath;
+
+            defaultFont = defaultShortcutLabel.Font;
             nameFont = new Font(defaultFont, FontStyle.Bold);
-            fontBrush = new SolidBrush(label1.ForeColor);
+            fontBrush = new SolidBrush(defaultShortcutLabel.ForeColor);
 
             this.entryList = entryList;
 
             entryListBox.Items.AddRange(this.entryList.Entries.ToArray());
+
+            if (this.entryList.Entries.Count > 0)
+            {
+                entryListBox.SelectedIndex = 0;
+            }
         }
 
         private Dictionary<Tuple<string, int, Size>, Icon> iconsByFileIndex = new Dictionary<Tuple<string, int, Size>, Icon>();
@@ -128,5 +138,33 @@
 
             shown = true;
         }
+
+        private SearchForm search = new SearchForm();
+        private async void appButton_Click(object sender, EventArgs e)
+        {
+            appButton.Enabled = false;
+
+            PackageManager pm = new PackageManager();
+
+            List<Tuple<string, string>> options = new List<Tuple<string, string>>();
+
+            foreach (Package p in pm.FindPackagesForUser(string.Empty))
+            {
+                var apps = await p.GetAppListEntriesAsync().AsTask();
+                foreach (AppListEntry app in apps)
+                {
+                    options.Add(new Tuple<string, string>(app.AppUserModelId, app.DisplayInfo.DisplayName + ": " + app.AppUserModelId));
+                }
+            }
+
+            string selectedAppUserModelId = search.GetSelection("Select UWP App", "Available Apps:", options);
+
+            if (selectedAppUserModelId != null)
+            {
+                appUserModelIdBox.Text = selectedAppUserModelId;
+            }
+
+            appButton.Enabled = true;
+        }
     }
 }

diff --git a/EntryList.cs b/EntryList.cs
index dd43a65..f6af196 100755
--- a/EntryList.cs
+++ b/EntryList.cs
@@ -9,7 +9,7 @@
 namespace Entries
 {
     public class Entry
-    {
+    {        
         public string Target { get; set; }
         public string Icon { get; set; }
         public int IconIndex { get; set; }
@@ -19,6 +19,7 @@
 
     public class EntryList
     {
+        public string FilePath = null;
         public List<Entry> Entries;
 
         public static EntryList FromString(string contents)
@@ -34,7 +35,10 @@
             {
                 contents = new StreamReader(input).ReadToEnd();
             }
-            return FromString(contents);
+            EntryList entryList = FromString(contents);
+            if (entryList != null) entryList.FilePath = Path.GetFullPath(path);
+
+            return entryList;
         }
 
         public override string ToString()
diff --git a/ShortcutUtil/MainForm.Designer.cs b/ShortcutUtil/MainForm.Designer.cs
index fbb1aee..5dbf023 100755
--- a/ShortcutUtil/MainForm.Designer.cs
+++ b/ShortcutUtil/MainForm.Designer.cs
@@ -28,49 +28,95 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.label1 = new System.Windows.Forms.Label();
+            this.defaultShortcutLabel = new System.Windows.Forms.Label();
             this.entryListBox = new System.Windows.Forms.ListBox();
             this.createButton = new System.Windows.Forms.Button();
+            this.appUserModelIdLabel = new System.Windows.Forms.Label();
+            this.appUserModelIdBox = new ShortcutUtil.WatermarkTextBox();
+            this.appButton = new System.Windows.Forms.Button();
+            this.hwndButton = new System.Windows.Forms.Button();
             this.SuspendLayout();
             // 
-            // label1
+            // defaultShortcutLabel
             // 
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(13, 13);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(169, 20);
-            this.label1.TabIndex = 0;
-            this.label1.Text = "Select default shortcut";
+            this.defaultShortcutLabel.AutoSize = true;
+            this.defaultShortcutLabel.Location = new System.Drawing.Point(14, 75);
+            this.defaultShortcutLabel.Name = "defaultShortcutLabel";
+            this.defaultShortcutLabel.Size = new System.Drawing.Size(169, 20);
+            this.defaultShortcutLabel.TabIndex = 0;
+            this.defaultShortcutLabel.Text = "Select default shortcut";
             // 
             // entryListBox
             // 
             this.entryListBox.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawVariable;
             this.entryListBox.FormattingEnabled = true;
-            this.entryListBox.Location = new System.Drawing.Point(17, 37);
+            this.entryListBox.Location = new System.Drawing.Point(16, 98);
             this.entryListBox.Name = "entryListBox";
-            this.entryListBox.Size = new System.Drawing.Size(771, 355);
+            this.entryListBox.Size = new System.Drawing.Size(770, 355);
             this.entryListBox.TabIndex = 1;
             this.entryListBox.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.entryListBox_DrawItem);
             this.entryListBox.MeasureItem += new System.Windows.Forms.MeasureItemEventHandler(this.entryListBox_MeasureItem);
             // 
             // createButton
             // 
-            this.createButton.Location = new System.Drawing.Point(644, 398);
+            this.createButton.Location = new System.Drawing.Point(644, 458);
             this.createButton.Name = "createButton";
             this.createButton.Size = new System.Drawing.Size(144, 40);
             this.createButton.TabIndex = 2;
             this.createButton.Text = "Create Shortcut";
             this.createButton.UseVisualStyleBackColor = true;
             // 
+            // appUserModelIdLabel
+            // 
+            this.appUserModelIdLabel.AutoSize = true;
+            this.appUserModelIdLabel.Location = new System.Drawing.Point(14, 12);
+            this.appUserModelIdLabel.Name = "appUserModelIdLabel";
+            this.appUserModelIdLabel.Size = new System.Drawing.Size(213, 20);
+            this.appUserModelIdLabel.TabIndex = 3;
+            this.appUserModelIdLabel.Text = "Shortcut App User Model ID:";
+            // 
+            // appUserModelIdBox
+            // 
+            this.appUserModelIdBox.Location = new System.Drawing.Point(16, 35);
+            this.appUserModelIdBox.Name = "appUserModelIdBox";
+            this.appUserModelIdBox.Size = new System.Drawing.Size(608, 26);
+            this.appUserModelIdBox.TabIndex = 4;
+            this.appUserModelIdBox.WaterMarkColor = System.Drawing.Color.Gray;
+            this.appUserModelIdBox.WaterMarkText = "Enter a manual ID, or select on from a UWP App or open Window";
+            // 
+            // appButton
+            // 
+            this.appButton.Location = new System.Drawing.Point(633, 35);
+            this.appButton.Name = "appButton";
+            this.appButton.Size = new System.Drawing.Size(74, 31);
+            this.appButton.TabIndex = 5;
+            this.appButton.Text = "APP";
+            this.appButton.UseVisualStyleBackColor = true;
+            this.appButton.Click += new System.EventHandler(this.appButton_Click);
+            // 
+            // hwndButton
+            // 
+            this.hwndButton.Location = new System.Drawing.Point(712, 35);
+            this.hwndButton.MinimumSize = new System.Drawing.Size(76, 26);
+            this.hwndButton.Name = "hwndButton";
+            this.hwndButton.Size = new System.Drawing.Size(76, 31);
+            this.hwndButton.TabIndex = 6;
+            this.hwndButton.Text = "HWND";
+            this.hwndButton.UseVisualStyleBackColor = true;
+            // 
             // MainForm
             // 
             this.AcceptButton = this.createButton;
             this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(800, 444);
+            this.ClientSize = new System.Drawing.Size(800, 508);
+            this.Controls.Add(this.hwndButton);
+            this.Controls.Add(this.appButton);
+            this.Controls.Add(this.appUserModelIdBox);
+            this.Controls.Add(this.appUserModelIdLabel);
             this.Controls.Add(this.createButton);
             this.Controls.Add(this.entryListBox);
-            this.Controls.Add(this.label1);
+            this.Controls.Add(this.defaultShortcutLabel);
             this.Name = "MainForm";
             this.Text = "Form1";
             this.Shown += new System.EventHandler(this.MainForm_Shown);
@@ -82,9 +128,13 @@
 
         #endregion
 
-        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.Label defaultShortcutLabel;
         private System.Windows.Forms.ListBox entryListBox;
         private System.Windows.Forms.Button createButton;
+        private System.Windows.Forms.Label appUserModelIdLabel;
+        private System.Windows.Forms.Button appButton;
+        private System.Windows.Forms.Button hwndButton;
+        private WatermarkTextBox appUserModelIdBox;
     }
 }
 
diff --git a/ShortcutUtil/MainForm.cs b/ShortcutUtil/MainForm.cs
index cb5990a..680ed45 100755
--- a/ShortcutUtil/MainForm.cs
+++ b/ShortcutUtil/MainForm.cs
@@ -9,6 +9,9 @@
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using Windows.ApplicationModel;
+using Windows.ApplicationModel.Core;
+using Windows.Management.Deployment;
 
 namespace ShortcutUtil
 {
@@ -28,13 +31,20 @@
         {
             InitializeComponent();
 
-            defaultFont = label1.Font;
+            Text = entryList.FilePath == null ? "New shortcut file" : entryList.FilePath;
+
+            defaultFont = defaultShortcutLabel.Font;
             nameFont = new Font(defaultFont, FontStyle.Bold);
-            fontBrush = new SolidBrush(label1.ForeColor);
+            fontBrush = new SolidBrush(defaultShortcutLabel.ForeColor);
 
             this.entryList = entryList;
 
             entryListBox.Items.AddRange(this.entryList.Entries.ToArray());
+
+            if (this.entryList.Entries.Count > 0)
+            {
+                entryListBox.SelectedIndex = 0;
+            }
         }
 
         private Dictionary<Tuple<string, int, Size>, Icon> iconsByFileIndex = new Dictionary<Tuple<string, int, Size>, Icon>();
@@ -128,5 +138,33 @@
 
             shown = true;
         }
+
+        private SearchForm search = new SearchForm();
+        private async void appButton_Click(object sender, EventArgs e)
+        {
+            appButton.Enabled = false;
+
+            PackageManager pm = new PackageManager();
+
+            List<Tuple<string, string>> options = new List<Tuple<string, string>>();
+
+            foreach (Package p in pm.FindPackagesForUser(string.Empty))
+            {
+                var apps = await p.GetAppListEntriesAsync().AsTask();
+                foreach (AppListEntry app in apps)
+                {
+                    options.Add(new Tuple<string, string>(app.AppUserModelId, app.DisplayInfo.DisplayName + ": " + app.AppUserModelId));
+                }
+            }
+
+            string selectedAppUserModelId = search.GetSelection("Select UWP App", "Available Apps:", options);
+
+            if (selectedAppUserModelId != null)
+            {
+                appUserModelIdBox.Text = selectedAppUserModelId;
+            }
+
+            appButton.Enabled = true;
+        }
     }
 }
diff --git a/ShortcutUtil/Program.cs b/ShortcutUtil/Program.cs
index 3a962d4..9b6f955 100755
--- a/ShortcutUtil/Program.cs
+++ b/ShortcutUtil/Program.cs
@@ -41,7 +41,7 @@
                 return;
             }
 
-            Environment.CurrentDirectory = Path.GetDirectoryName(Path.Combine(Environment.CurrentDirectory, args[1]));
+            Environment.CurrentDirectory = Path.GetDirectoryName(Path.GetFullPath(args[1]));
 
 
             Application.EnableVisualStyles();

diff --git a/EntryList.cs b/EntryList.cs
index dd43a65..f6af196 100755
--- a/EntryList.cs
+++ b/EntryList.cs
@@ -9,7 +9,7 @@
 namespace Entries
 {
     public class Entry
-    {
+    {        
         public string Target { get; set; }
         public string Icon { get; set; }
         public int IconIndex { get; set; }
@@ -19,6 +19,7 @@
 
     public class EntryList
     {
+        public string FilePath = null;
         public List<Entry> Entries;
 
         public static EntryList FromString(string contents)
@@ -34,7 +35,10 @@
             {
                 contents = new StreamReader(input).ReadToEnd();
             }
-            return FromString(contents);
+            EntryList entryList = FromString(contents);
+            if (entryList != null) entryList.FilePath = Path.GetFullPath(path);
+
+            return entryList;
         }
 
         public override string ToString()
diff --git a/ShortcutUtil/MainForm.Designer.cs b/ShortcutUtil/MainForm.Designer.cs
index fbb1aee..5dbf023 100755
--- a/ShortcutUtil/MainForm.Designer.cs
+++ b/ShortcutUtil/MainForm.Designer.cs
@@ -28,49 +28,95 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.label1 = new System.Windows.Forms.Label();
+            this.defaultShortcutLabel = new System.Windows.Forms.Label();
             this.entryListBox = new System.Windows.Forms.ListBox();
             this.createButton = new System.Windows.Forms.Button();
+            this.appUserModelIdLabel = new System.Windows.Forms.Label();
+            this.appUserModelIdBox = new ShortcutUtil.WatermarkTextBox();
+            this.appButton = new System.Windows.Forms.Button();
+            this.hwndButton = new System.Windows.Forms.Button();
             this.SuspendLayout();
             // 
-            // label1
+            // defaultShortcutLabel
             // 
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(13, 13);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(169, 20);
-            this.label1.TabIndex = 0;
-            this.label1.Text = "Select default shortcut";
+            this.defaultShortcutLabel.AutoSize = true;
+            this.defaultShortcutLabel.Location = new System.Drawing.Point(14, 75);
+            this.defaultShortcutLabel.Name = "defaultShortcutLabel";
+            this.defaultShortcutLabel.Size = new System.Drawing.Size(169, 20);
+            this.defaultShortcutLabel.TabIndex = 0;
+            this.defaultShortcutLabel.Text = "Select default shortcut";
             // 
             // entryListBox
             // 
             this.entryListBox.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawVariable;
             this.entryListBox.FormattingEnabled = true;
-            this.entryListBox.Location = new System.Drawing.Point(17, 37);
+            this.entryListBox.Location = new System.Drawing.Point(16, 98);
             this.entryListBox.Name = "entryListBox";
-            this.entryListBox.Size = new System.Drawing.Size(771, 355);
+            this.entryListBox.Size = new System.Drawing.Size(770, 355);
             this.entryListBox.TabIndex = 1;
             this.entryListBox.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.entryListBox_DrawItem);
             this.entryListBox.MeasureItem += new System.Windows.Forms.MeasureItemEventHandler(this.entryListBox_MeasureItem);
             // 
             // createButton
             // 
-            this.createButton.Location = new System.Drawing.Point(644, 398);
+            this.createButton.Location = new System.Drawing.Point(644, 458);
             this.createButton.Name = "createButton";
             this.createButton.Size = new System.Drawing.Size(144, 40);
             this.createButton.TabIndex = 2;
             this.createButton.Text = "Create Shortcut";
             this.createButton.UseVisualStyleBackColor = true;
             // 
+            // appUserModelIdLabel
+            // 
+            this.appUserModelIdLabel.AutoSize = true;
+            this.appUserModelIdLabel.Location = new System.Drawing.Point(14, 12);
+            this.appUserModelIdLabel.Name = "appUserModelIdLabel";
+            this.appUserModelIdLabel.Size = new System.Drawing.Size(213, 20);
+            this.appUserModelIdLabel.TabIndex = 3;
+            this.appUserModelIdLabel.Text = "Shortcut App User Model ID:";
+            // 
+            // appUserModelIdBox
+            // 
+            this.appUserModelIdBox.Location = new System.Drawing.Point(16, 35);
+            this.appUserModelIdBox.Name = "appUserModelIdBox";
+            this.appUserModelIdBox.Size = new System.Drawing.Size(608, 26);
+            this.appUserModelIdBox.TabIndex = 4;
+            this.appUserModelIdBox.WaterMarkColor = System.Drawing.Color.Gray;
+            this.appUserModelIdBox.WaterMarkText = "Enter a manual ID, or select on from a UWP App or open Window";
+            // 
+            // appButton
+            // 
+            this.appButton.Location = new System.Drawing.Point(633, 35);
+            this.appButton.Name = "appButton";
+            this.appButton.Size = new System.Drawing.Size(74, 31);
+            this.appButton.TabIndex = 5;
+            this.appButton.Text = "APP";
+            this.appButton.UseVisualStyleBackColor = true;
+            this.appButton.Click += new System.EventHandler(this.appButton_Click);
+            // 
+            // hwndButton
+            // 
+            this.hwndButton.Location = new System.Drawing.Point(712, 35);
+            this.hwndButton.MinimumSize = new System.Drawing.Size(76, 26);
+            this.hwndButton.Name = "hwndButton";
+            this.hwndButton.Size = new System.Drawing.Size(76, 31);
+            this.hwndButton.TabIndex = 6;
+            this.hwndButton.Text = "HWND";
+            this.hwndButton.UseVisualStyleBackColor = true;
+            // 
             // MainForm
             // 
             this.AcceptButton = this.createButton;
             this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(800, 444);
+            this.ClientSize = new System.Drawing.Size(800, 508);
+            this.Controls.Add(this.hwndButton);
+            this.Controls.Add(this.appButton);
+            this.Controls.Add(this.appUserModelIdBox);
+            this.Controls.Add(this.appUserModelIdLabel);
             this.Controls.Add(this.createButton);
             this.Controls.Add(this.entryListBox);
-            this.Controls.Add(this.label1);
+            this.Controls.Add(this.defaultShortcutLabel);
             this.Name = "MainForm";
             this.Text = "Form1";
             this.Shown += new System.EventHandler(this.MainForm_Shown);
@@ -82,9 +128,13 @@
 
         #endregion
 
-        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.Label defaultShortcutLabel;
         private System.Windows.Forms.ListBox entryListBox;
         private System.Windows.Forms.Button createButton;
+        private System.Windows.Forms.Label appUserModelIdLabel;
+        private System.Windows.Forms.Button appButton;
+        private System.Windows.Forms.Button hwndButton;
+        private WatermarkTextBox appUserModelIdBox;
     }
 }
 
diff --git a/ShortcutUtil/MainForm.cs b/ShortcutUtil/MainForm.cs
index cb5990a..680ed45 100755
--- a/ShortcutUtil/MainForm.cs
+++ b/ShortcutUtil/MainForm.cs
@@ -9,6 +9,9 @@
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using Windows.ApplicationModel;
+using Windows.ApplicationModel.Core;
+using Windows.Management.Deployment;
 
 namespace ShortcutUtil
 {
@@ -28,13 +31,20 @@
         {
             InitializeComponent();
 
-            defaultFont = label1.Font;
+            Text = entryList.FilePath == null ? "New shortcut file" : entryList.FilePath;
+
+            defaultFont = defaultShortcutLabel.Font;
             nameFont = new Font(defaultFont, FontStyle.Bold);
-            fontBrush = new SolidBrush(label1.ForeColor);
+            fontBrush = new SolidBrush(defaultShortcutLabel.ForeColor);
 
             this.entryList = entryList;
 
             entryListBox.Items.AddRange(this.entryList.Entries.ToArray());
+
+            if (this.entryList.Entries.Count > 0)
+            {
+                entryListBox.SelectedIndex = 0;
+            }
         }
 
         private Dictionary<Tuple<string, int, Size>, Icon> iconsByFileIndex = new Dictionary<Tuple<string, int, Size>, Icon>();
@@ -128,5 +138,33 @@
 
             shown = true;
         }
+
+        private SearchForm search = new SearchForm();
+        private async void appButton_Click(object sender, EventArgs e)
+        {
+            appButton.Enabled = false;
+
+            PackageManager pm = new PackageManager();
+
+            List<Tuple<string, string>> options = new List<Tuple<string, string>>();
+
+            foreach (Package p in pm.FindPackagesForUser(string.Empty))
+            {
+                var apps = await p.GetAppListEntriesAsync().AsTask();
+                foreach (AppListEntry app in apps)
+                {
+                    options.Add(new Tuple<string, string>(app.AppUserModelId, app.DisplayInfo.DisplayName + ": " + app.AppUserModelId));
+                }
+            }
+
+            string selectedAppUserModelId = search.GetSelection("Select UWP App", "Available Apps:", options);
+
+            if (selectedAppUserModelId != null)
+            {
+                appUserModelIdBox.Text = selectedAppUserModelId;
+            }
+
+            appButton.Enabled = true;
+        }
     }
 }
diff --git a/ShortcutUtil/Program.cs b/ShortcutUtil/Program.cs
index 3a962d4..9b6f955 100755
--- a/ShortcutUtil/Program.cs
+++ b/ShortcutUtil/Program.cs
@@ -41,7 +41,7 @@
                 return;
             }
 
-            Environment.CurrentDirectory = Path.GetDirectoryName(Path.Combine(Environment.CurrentDirectory, args[1]));
+            Environment.CurrentDirectory = Path.GetDirectoryName(Path.GetFullPath(args[1]));
 
 
             Application.EnableVisualStyles();
diff --git a/ShortcutUtil/SearchForm.Designer.cs b/ShortcutUtil/SearchForm.Designer.cs
new file mode 100755
index 0000000..93f58bf
--- /dev/null
+++ b/ShortcutUtil/SearchForm.Designer.cs
@@ -0,0 +1,111 @@
+namespace ShortcutUtil
+{
+    partial class SearchForm
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.searchLabel = new System.Windows.Forms.Label();
+            this.optionsLabel = new System.Windows.Forms.Label();
+            this.optionsList = new System.Windows.Forms.ListBox();
+            this.selectButton = new System.Windows.Forms.Button();
+            this.searchBox = new ShortcutUtil.WatermarkTextBox();
+            this.SuspendLayout();
+            // 
+            // searchLabel
+            // 
+            this.searchLabel.AutoSize = true;
+            this.searchLabel.Location = new System.Drawing.Point(13, 13);
+            this.searchLabel.Name = "searchLabel";
+            this.searchLabel.Size = new System.Drawing.Size(94, 20);
+            this.searchLabel.TabIndex = 0;
+            this.searchLabel.Text = "Search text:";
+            // 
+            // optionsLabel
+            // 
+            this.optionsLabel.AutoSize = true;
+            this.optionsLabel.Location = new System.Drawing.Point(13, 80);
+            this.optionsLabel.Name = "optionsLabel";
+            this.optionsLabel.Size = new System.Drawing.Size(68, 20);
+            this.optionsLabel.TabIndex = 2;
+            this.optionsLabel.Text = "Options:";
+            // 
+            // optionsList
+            // 
+            this.optionsList.FormattingEnabled = true;
+            this.optionsList.ItemHeight = 20;
+            this.optionsList.Location = new System.Drawing.Point(17, 104);
+            this.optionsList.Name = "optionsList";
+            this.optionsList.Size = new System.Drawing.Size(771, 304);
+            this.optionsList.TabIndex = 3;
+            // 
+            // selectButton
+            // 
+            this.selectButton.DialogResult = System.Windows.Forms.DialogResult.OK;
+            this.selectButton.Location = new System.Drawing.Point(661, 414);
+            this.selectButton.Name = "selectButton";
+            this.selectButton.Size = new System.Drawing.Size(127, 41);
+            this.selectButton.TabIndex = 4;
+            this.selectButton.Text = "Select";
+            this.selectButton.UseVisualStyleBackColor = true;
+            // 
+            // searchBox
+            // 
+            this.searchBox.Location = new System.Drawing.Point(17, 37);
+            this.searchBox.Name = "searchBox";
+            this.searchBox.Size = new System.Drawing.Size(771, 26);
+            this.searchBox.TabIndex = 1;
+            this.searchBox.WaterMarkColor = System.Drawing.Color.Gray;
+            this.searchBox.WaterMarkText = "Match text here";
+            this.searchBox.TextChanged += new System.EventHandler(this.searchBox_TextChanged);
+            // 
+            // SearchForm
+            // 
+            this.AcceptButton = this.selectButton;
+            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(800, 463);
+            this.Controls.Add(this.selectButton);
+            this.Controls.Add(this.optionsList);
+            this.Controls.Add(this.optionsLabel);
+            this.Controls.Add(this.searchBox);
+            this.Controls.Add(this.searchLabel);
+            this.Name = "SearchForm";
+            this.Text = "Search";
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Label searchLabel;
+        private System.Windows.Forms.Label optionsLabel;
+        private System.Windows.Forms.ListBox optionsList;
+        private System.Windows.Forms.Button selectButton;
+        private WatermarkTextBox searchBox;
+    }
+}
\ No newline at end of file

diff --git a/EntryList.cs b/EntryList.cs
index dd43a65..f6af196 100755
--- a/EntryList.cs
+++ b/EntryList.cs
@@ -9,7 +9,7 @@
 namespace Entries
 {
     public class Entry
-    {
+    {        
         public string Target { get; set; }
         public string Icon { get; set; }
         public int IconIndex { get; set; }
@@ -19,6 +19,7 @@
 
     public class EntryList
     {
+        public string FilePath = null;
         public List<Entry> Entries;
 
         public static EntryList FromString(string contents)
@@ -34,7 +35,10 @@
             {
                 contents = new StreamReader(input).ReadToEnd();
             }
-            return FromString(contents);
+            EntryList entryList = FromString(contents);
+            if (entryList != null) entryList.FilePath = Path.GetFullPath(path);
+
+            return entryList;
         }
 
         public override string ToString()
diff --git a/ShortcutUtil/MainForm.Designer.cs b/ShortcutUtil/MainForm.Designer.cs
index fbb1aee..5dbf023 100755
--- a/ShortcutUtil/MainForm.Designer.cs
+++ b/ShortcutUtil/MainForm.Designer.cs
@@ -28,49 +28,95 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.label1 = new System.Windows.Forms.Label();
+            this.defaultShortcutLabel = new System.Windows.Forms.Label();
             this.entryListBox = new System.Windows.Forms.ListBox();
             this.createButton = new System.Windows.Forms.Button();
+            this.appUserModelIdLabel = new System.Windows.Forms.Label();
+            this.appUserModelIdBox = new ShortcutUtil.WatermarkTextBox();
+            this.appButton = new System.Windows.Forms.Button();
+            this.hwndButton = new System.Windows.Forms.Button();
             this.SuspendLayout();
             // 
-            // label1
+            // defaultShortcutLabel
             // 
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(13, 13);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(169, 20);
-            this.label1.TabIndex = 0;
-            this.label1.Text = "Select default shortcut";
+            this.defaultShortcutLabel.AutoSize = true;
+            this.defaultShortcutLabel.Location = new System.Drawing.Point(14, 75);
+            this.defaultShortcutLabel.Name = "defaultShortcutLabel";
+            this.defaultShortcutLabel.Size = new System.Drawing.Size(169, 20);
+            this.defaultShortcutLabel.TabIndex = 0;
+            this.defaultShortcutLabel.Text = "Select default shortcut";
             // 
             // entryListBox
             // 
             this.entryListBox.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawVariable;
             this.entryListBox.FormattingEnabled = true;
-            this.entryListBox.Location = new System.Drawing.Point(17, 37);
+            this.entryListBox.Location = new System.Drawing.Point(16, 98);
             this.entryListBox.Name = "entryListBox";
-            this.entryListBox.Size = new System.Drawing.Size(771, 355);
+            this.entryListBox.Size = new System.Drawing.Size(770, 355);
             this.entryListBox.TabIndex = 1;
             this.entryListBox.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.entryListBox_DrawItem);
             this.entryListBox.MeasureItem += new System.Windows.Forms.MeasureItemEventHandler(this.entryListBox_MeasureItem);
             // 
             // createButton
             // 
-            this.createButton.Location = new System.Drawing.Point(644, 398);
+            this.createButton.Location = new System.Drawing.Point(644, 458);
             this.createButton.Name = "createButton";
             this.createButton.Size = new System.Drawing.Size(144, 40);
             this.createButton.TabIndex = 2;
             this.createButton.Text = "Create Shortcut";
             this.createButton.UseVisualStyleBackColor = true;
             // 
+            // appUserModelIdLabel
+            // 
+            this.appUserModelIdLabel.AutoSize = true;
+            this.appUserModelIdLabel.Location = new System.Drawing.Point(14, 12);
+            this.appUserModelIdLabel.Name = "appUserModelIdLabel";
+            this.appUserModelIdLabel.Size = new System.Drawing.Size(213, 20);
+            this.appUserModelIdLabel.TabIndex = 3;
+            this.appUserModelIdLabel.Text = "Shortcut App User Model ID:";
+            // 
+            // appUserModelIdBox
+            // 
+            this.appUserModelIdBox.Location = new System.Drawing.Point(16, 35);
+            this.appUserModelIdBox.Name = "appUserModelIdBox";
+            this.appUserModelIdBox.Size = new System.Drawing.Size(608, 26);
+            this.appUserModelIdBox.TabIndex = 4;
+            this.appUserModelIdBox.WaterMarkColor = System.Drawing.Color.Gray;
+            this.appUserModelIdBox.WaterMarkText = "Enter a manual ID, or select on from a UWP App or open Window";
+            // 
+            // appButton
+            // 
+            this.appButton.Location = new System.Drawing.Point(633, 35);
+            this.appButton.Name = "appButton";
+            this.appButton.Size = new System.Drawing.Size(74, 31);
+            this.appButton.TabIndex = 5;
+            this.appButton.Text = "APP";
+            this.appButton.UseVisualStyleBackColor = true;
+            this.appButton.Click += new System.EventHandler(this.appButton_Click);
+            // 
+            // hwndButton
+            // 
+            this.hwndButton.Location = new System.Drawing.Point(712, 35);
+            this.hwndButton.MinimumSize = new System.Drawing.Size(76, 26);
+            this.hwndButton.Name = "hwndButton";
+            this.hwndButton.Size = new System.Drawing.Size(76, 31);
+            this.hwndButton.TabIndex = 6;
+            this.hwndButton.Text = "HWND";
+            this.hwndButton.UseVisualStyleBackColor = true;
+            // 
             // MainForm
             // 
             this.AcceptButton = this.createButton;
             this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(800, 444);
+            this.ClientSize = new System.Drawing.Size(800, 508);
+            this.Controls.Add(this.hwndButton);
+            this.Controls.Add(this.appButton);
+            this.Controls.Add(this.appUserModelIdBox);
+            this.Controls.Add(this.appUserModelIdLabel);
             this.Controls.Add(this.createButton);
             this.Controls.Add(this.entryListBox);
-            this.Controls.Add(this.label1);
+            this.Controls.Add(this.defaultShortcutLabel);
             this.Name = "MainForm";
             this.Text = "Form1";
             this.Shown += new System.EventHandler(this.MainForm_Shown);
@@ -82,9 +128,13 @@
 
         #endregion
 
-        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.Label defaultShortcutLabel;
         private System.Windows.Forms.ListBox entryListBox;
         private System.Windows.Forms.Button createButton;
+        private System.Windows.Forms.Label appUserModelIdLabel;
+        private System.Windows.Forms.Button appButton;
+        private System.Windows.Forms.Button hwndButton;
+        private WatermarkTextBox appUserModelIdBox;
     }
 }
 
diff --git a/ShortcutUtil/MainForm.cs b/ShortcutUtil/MainForm.cs
index cb5990a..680ed45 100755
--- a/ShortcutUtil/MainForm.cs
+++ b/ShortcutUtil/MainForm.cs
@@ -9,6 +9,9 @@
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using Windows.ApplicationModel;
+using Windows.ApplicationModel.Core;
+using Windows.Management.Deployment;
 
 namespace ShortcutUtil
 {
@@ -28,13 +31,20 @@
         {
             InitializeComponent();
 
-            defaultFont = label1.Font;
+            Text = entryList.FilePath == null ? "New shortcut file" : entryList.FilePath;
+
+            defaultFont = defaultShortcutLabel.Font;
             nameFont = new Font(defaultFont, FontStyle.Bold);
-            fontBrush = new SolidBrush(label1.ForeColor);
+            fontBrush = new SolidBrush(defaultShortcutLabel.ForeColor);
 
             this.entryList = entryList;
 
             entryListBox.Items.AddRange(this.entryList.Entries.ToArray());
+
+            if (this.entryList.Entries.Count > 0)
+            {
+                entryListBox.SelectedIndex = 0;
+            }
         }
 
         private Dictionary<Tuple<string, int, Size>, Icon> iconsByFileIndex = new Dictionary<Tuple<string, int, Size>, Icon>();
@@ -128,5 +138,33 @@
 
             shown = true;
         }
+
+        private SearchForm search = new SearchForm();
+        private async void appButton_Click(object sender, EventArgs e)
+        {
+            appButton.Enabled = false;
+
+            PackageManager pm = new PackageManager();
+
+            List<Tuple<string, string>> options = new List<Tuple<string, string>>();
+
+            foreach (Package p in pm.FindPackagesForUser(string.Empty))
+            {
+                var apps = await p.GetAppListEntriesAsync().AsTask();
+                foreach (AppListEntry app in apps)
+                {
+                    options.Add(new Tuple<string, string>(app.AppUserModelId, app.DisplayInfo.DisplayName + ": " + app.AppUserModelId));
+                }
+            }
+
+            string selectedAppUserModelId = search.GetSelection("Select UWP App", "Available Apps:", options);
+
+            if (selectedAppUserModelId != null)
+            {
+                appUserModelIdBox.Text = selectedAppUserModelId;
+            }
+
+            appButton.Enabled = true;
+        }
     }
 }
diff --git a/ShortcutUtil/Program.cs b/ShortcutUtil/Program.cs
index 3a962d4..9b6f955 100755
--- a/ShortcutUtil/Program.cs
+++ b/ShortcutUtil/Program.cs
@@ -41,7 +41,7 @@
                 return;
             }
 
-            Environment.CurrentDirectory = Path.GetDirectoryName(Path.Combine(Environment.CurrentDirectory, args[1]));
+            Environment.CurrentDirectory = Path.GetDirectoryName(Path.GetFullPath(args[1]));
 
 
             Application.EnableVisualStyles();
diff --git a/ShortcutUtil/SearchForm.Designer.cs b/ShortcutUtil/SearchForm.Designer.cs
new file mode 100755
index 0000000..93f58bf
--- /dev/null
+++ b/ShortcutUtil/SearchForm.Designer.cs
@@ -0,0 +1,111 @@
+namespace ShortcutUtil
+{
+    partial class SearchForm
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.searchLabel = new System.Windows.Forms.Label();
+            this.optionsLabel = new System.Windows.Forms.Label();
+            this.optionsList = new System.Windows.Forms.ListBox();
+            this.selectButton = new System.Windows.Forms.Button();
+            this.searchBox = new ShortcutUtil.WatermarkTextBox();
+            this.SuspendLayout();
+            // 
+            // searchLabel
+            // 
+            this.searchLabel.AutoSize = true;
+            this.searchLabel.Location = new System.Drawing.Point(13, 13);
+            this.searchLabel.Name = "searchLabel";
+            this.searchLabel.Size = new System.Drawing.Size(94, 20);
+            this.searchLabel.TabIndex = 0;
+            this.searchLabel.Text = "Search text:";
+            // 
+            // optionsLabel
+            // 
+            this.optionsLabel.AutoSize = true;
+            this.optionsLabel.Location = new System.Drawing.Point(13, 80);
+            this.optionsLabel.Name = "optionsLabel";
+            this.optionsLabel.Size = new System.Drawing.Size(68, 20);
+            this.optionsLabel.TabIndex = 2;
+            this.optionsLabel.Text = "Options:";
+            // 
+            // optionsList
+            // 
+            this.optionsList.FormattingEnabled = true;
+            this.optionsList.ItemHeight = 20;
+            this.optionsList.Location = new System.Drawing.Point(17, 104);
+            this.optionsList.Name = "optionsList";
+            this.optionsList.Size = new System.Drawing.Size(771, 304);
+            this.optionsList.TabIndex = 3;
+            // 
+            // selectButton
+            // 
+            this.selectButton.DialogResult = System.Windows.Forms.DialogResult.OK;
+            this.selectButton.Location = new System.Drawing.Point(661, 414);
+            this.selectButton.Name = "selectButton";
+            this.selectButton.Size = new System.Drawing.Size(127, 41);
+            this.selectButton.TabIndex = 4;
+            this.selectButton.Text = "Select";
+            this.selectButton.UseVisualStyleBackColor = true;
+            // 
+            // searchBox
+            // 
+            this.searchBox.Location = new System.Drawing.Point(17, 37);
+            this.searchBox.Name = "searchBox";
+            this.searchBox.Size = new System.Drawing.Size(771, 26);
+            this.searchBox.TabIndex = 1;
+            this.searchBox.WaterMarkColor = System.Drawing.Color.Gray;
+            this.searchBox.WaterMarkText = "Match text here";
+            this.searchBox.TextChanged += new System.EventHandler(this.searchBox_TextChanged);
+            // 
+            // SearchForm
+            // 
+            this.AcceptButton = this.selectButton;
+            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(800, 463);
+            this.Controls.Add(this.selectButton);
+            this.Controls.Add(this.optionsList);
+            this.Controls.Add(this.optionsLabel);
+            this.Controls.Add(this.searchBox);
+            this.Controls.Add(this.searchLabel);
+            this.Name = "SearchForm";
+            this.Text = "Search";
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Label searchLabel;
+        private System.Windows.Forms.Label optionsLabel;
+        private System.Windows.Forms.ListBox optionsList;
+        private System.Windows.Forms.Button selectButton;
+        private WatermarkTextBox searchBox;
+    }
+}
\ No newline at end of file
diff --git a/ShortcutUtil/SearchForm.cs b/ShortcutUtil/SearchForm.cs
new file mode 100755
index 0000000..3253ac5
--- /dev/null
+++ b/ShortcutUtil/SearchForm.cs
@@ -0,0 +1,61 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace ShortcutUtil
+{
+    public partial class SearchForm : Form
+    {
+        public SearchForm()
+        {
+            InitializeComponent();
+        }
+
+        private List<string> allOptions = new List<string>();
+        private List<Tuple<string, int>> displayOptions = new List<Tuple<string, int>>();
+
+        public T GetSelection<T>(string title, string optionsName, List<Tuple<T, string>> options) where T : class
+        {
+            allOptions = options.Select(s => s.Item2).ToList();
+
+            Text = title;
+            optionsLabel.Text = optionsName;
+
+            if (searchBox.Text != "")
+            {
+                searchBox.Text = "";
+            }
+            else
+            {
+                UpdateDisplay();
+            }
+
+            if (ShowDialog() == DialogResult.OK && optionsList.SelectedIndex >= 0 && optionsList.SelectedIndex < displayOptions.Count)
+            {
+                return options[displayOptions[optionsList.SelectedIndex].Item2].Item1;
+            }
+
+            return null;
+        }
+
+        private void UpdateDisplay()
+        {
+            string search = searchBox.Text.Trim().ToLower();
+            displayOptions = allOptions.Select((s, index) => new Tuple<string, int>(s, index)).Where(s => s.Item1.ToLower().Contains(search)).ToList();
+
+            optionsList.Items.Clear();
+            optionsList.Items.AddRange(displayOptions.Select(o => o.Item1).ToArray());
+        }
+
+        private void searchBox_TextChanged(object sender, EventArgs e)
+        {
+            UpdateDisplay();
+        }
+    }
+}

diff --git a/EntryList.cs b/EntryList.cs
index dd43a65..f6af196 100755
--- a/EntryList.cs
+++ b/EntryList.cs
@@ -9,7 +9,7 @@
 namespace Entries
 {
     public class Entry
-    {
+    {        
         public string Target { get; set; }
         public string Icon { get; set; }
         public int IconIndex { get; set; }
@@ -19,6 +19,7 @@
 
     public class EntryList
     {
+        public string FilePath = null;
         public List<Entry> Entries;
 
         public static EntryList FromString(string contents)
@@ -34,7 +35,10 @@
             {
                 contents = new StreamReader(input).ReadToEnd();
             }
-            return FromString(contents);
+            EntryList entryList = FromString(contents);
+            if (entryList != null) entryList.FilePath = Path.GetFullPath(path);
+
+            return entryList;
         }
 
         public override string ToString()
diff --git a/ShortcutUtil/MainForm.Designer.cs b/ShortcutUtil/MainForm.Designer.cs
index fbb1aee..5dbf023 100755
--- a/ShortcutUtil/MainForm.Designer.cs
+++ b/ShortcutUtil/MainForm.Designer.cs
@@ -28,49 +28,95 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.label1 = new System.Windows.Forms.Label();
+            this.defaultShortcutLabel = new System.Windows.Forms.Label();
             this.entryListBox = new System.Windows.Forms.ListBox();
             this.createButton = new System.Windows.Forms.Button();
+            this.appUserModelIdLabel = new System.Windows.Forms.Label();
+            this.appUserModelIdBox = new ShortcutUtil.WatermarkTextBox();
+            this.appButton = new System.Windows.Forms.Button();
+            this.hwndButton = new System.Windows.Forms.Button();
             this.SuspendLayout();
             // 
-            // label1
+            // defaultShortcutLabel
             // 
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(13, 13);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(169, 20);
-            this.label1.TabIndex = 0;
-            this.label1.Text = "Select default shortcut";
+            this.defaultShortcutLabel.AutoSize = true;
+            this.defaultShortcutLabel.Location = new System.Drawing.Point(14, 75);
+            this.defaultShortcutLabel.Name = "defaultShortcutLabel";
+            this.defaultShortcutLabel.Size = new System.Drawing.Size(169, 20);
+            this.defaultShortcutLabel.TabIndex = 0;
+            this.defaultShortcutLabel.Text = "Select default shortcut";
             // 
             // entryListBox
             // 
             this.entryListBox.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawVariable;
             this.entryListBox.FormattingEnabled = true;
-            this.entryListBox.Location = new System.Drawing.Point(17, 37);
+            this.entryListBox.Location = new System.Drawing.Point(16, 98);
             this.entryListBox.Name = "entryListBox";
-            this.entryListBox.Size = new System.Drawing.Size(771, 355);
+            this.entryListBox.Size = new System.Drawing.Size(770, 355);
             this.entryListBox.TabIndex = 1;
             this.entryListBox.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.entryListBox_DrawItem);
             this.entryListBox.MeasureItem += new System.Windows.Forms.MeasureItemEventHandler(this.entryListBox_MeasureItem);
             // 
             // createButton
             // 
-            this.createButton.Location = new System.Drawing.Point(644, 398);
+            this.createButton.Location = new System.Drawing.Point(644, 458);
             this.createButton.Name = "createButton";
             this.createButton.Size = new System.Drawing.Size(144, 40);
             this.createButton.TabIndex = 2;
             this.createButton.Text = "Create Shortcut";
             this.createButton.UseVisualStyleBackColor = true;
             // 
+            // appUserModelIdLabel
+            // 
+            this.appUserModelIdLabel.AutoSize = true;
+            this.appUserModelIdLabel.Location = new System.Drawing.Point(14, 12);
+            this.appUserModelIdLabel.Name = "appUserModelIdLabel";
+            this.appUserModelIdLabel.Size = new System.Drawing.Size(213, 20);
+            this.appUserModelIdLabel.TabIndex = 3;
+            this.appUserModelIdLabel.Text = "Shortcut App User Model ID:";
+            // 
+            // appUserModelIdBox
+            // 
+            this.appUserModelIdBox.Location = new System.Drawing.Point(16, 35);
+            this.appUserModelIdBox.Name = "appUserModelIdBox";
+            this.appUserModelIdBox.Size = new System.Drawing.Size(608, 26);
+            this.appUserModelIdBox.TabIndex = 4;
+            this.appUserModelIdBox.WaterMarkColor = System.Drawing.Color.Gray;
+            this.appUserModelIdBox.WaterMarkText = "Enter a manual ID, or select on from a UWP App or open Window";
+            // 
+            // appButton
+            // 
+            this.appButton.Location = new System.Drawing.Point(633, 35);
+            this.appButton.Name = "appButton";
+            this.appButton.Size = new System.Drawing.Size(74, 31);
+            this.appButton.TabIndex = 5;
+            this.appButton.Text = "APP";
+            this.appButton.UseVisualStyleBackColor = true;
+            this.appButton.Click += new System.EventHandler(this.appButton_Click);
+            // 
+            // hwndButton
+            // 
+            this.hwndButton.Location = new System.Drawing.Point(712, 35);
+            this.hwndButton.MinimumSize = new System.Drawing.Size(76, 26);
+            this.hwndButton.Name = "hwndButton";
+            this.hwndButton.Size = new System.Drawing.Size(76, 31);
+            this.hwndButton.TabIndex = 6;
+            this.hwndButton.Text = "HWND";
+            this.hwndButton.UseVisualStyleBackColor = true;
+            // 
             // MainForm
             // 
             this.AcceptButton = this.createButton;
             this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(800, 444);
+            this.ClientSize = new System.Drawing.Size(800, 508);
+            this.Controls.Add(this.hwndButton);
+            this.Controls.Add(this.appButton);
+            this.Controls.Add(this.appUserModelIdBox);
+            this.Controls.Add(this.appUserModelIdLabel);
             this.Controls.Add(this.createButton);
             this.Controls.Add(this.entryListBox);
-            this.Controls.Add(this.label1);
+            this.Controls.Add(this.defaultShortcutLabel);
             this.Name = "MainForm";
             this.Text = "Form1";
             this.Shown += new System.EventHandler(this.MainForm_Shown);
@@ -82,9 +128,13 @@
 
         #endregion
 
-        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.Label defaultShortcutLabel;
         private System.Windows.Forms.ListBox entryListBox;
         private System.Windows.Forms.Button createButton;
+        private System.Windows.Forms.Label appUserModelIdLabel;
+        private System.Windows.Forms.Button appButton;
+        private System.Windows.Forms.Button hwndButton;
+        private WatermarkTextBox appUserModelIdBox;
     }
 }
 
diff --git a/ShortcutUtil/MainForm.cs b/ShortcutUtil/MainForm.cs
index cb5990a..680ed45 100755
--- a/ShortcutUtil/MainForm.cs
+++ b/ShortcutUtil/MainForm.cs
@@ -9,6 +9,9 @@
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using Windows.ApplicationModel;
+using Windows.ApplicationModel.Core;
+using Windows.Management.Deployment;
 
 namespace ShortcutUtil
 {
@@ -28,13 +31,20 @@
         {
             InitializeComponent();
 
-            defaultFont = label1.Font;
+            Text = entryList.FilePath == null ? "New shortcut file" : entryList.FilePath;
+
+            defaultFont = defaultShortcutLabel.Font;
             nameFont = new Font(defaultFont, FontStyle.Bold);
-            fontBrush = new SolidBrush(label1.ForeColor);
+            fontBrush = new SolidBrush(defaultShortcutLabel.ForeColor);
 
             this.entryList = entryList;
 
             entryListBox.Items.AddRange(this.entryList.Entries.ToArray());
+
+            if (this.entryList.Entries.Count > 0)
+            {
+                entryListBox.SelectedIndex = 0;
+            }
         }
 
         private Dictionary<Tuple<string, int, Size>, Icon> iconsByFileIndex = new Dictionary<Tuple<string, int, Size>, Icon>();
@@ -128,5 +138,33 @@
 
             shown = true;
         }
+
+        private SearchForm search = new SearchForm();
+        private async void appButton_Click(object sender, EventArgs e)
+        {
+            appButton.Enabled = false;
+
+            PackageManager pm = new PackageManager();
+
+            List<Tuple<string, string>> options = new List<Tuple<string, string>>();
+
+            foreach (Package p in pm.FindPackagesForUser(string.Empty))
+            {
+                var apps = await p.GetAppListEntriesAsync().AsTask();
+                foreach (AppListEntry app in apps)
+                {
+                    options.Add(new Tuple<string, string>(app.AppUserModelId, app.DisplayInfo.DisplayName + ": " + app.AppUserModelId));
+                }
+            }
+
+            string selectedAppUserModelId = search.GetSelection("Select UWP App", "Available Apps:", options);
+
+            if (selectedAppUserModelId != null)
+            {
+                appUserModelIdBox.Text = selectedAppUserModelId;
+            }
+
+            appButton.Enabled = true;
+        }
     }
 }
diff --git a/ShortcutUtil/Program.cs b/ShortcutUtil/Program.cs
index 3a962d4..9b6f955 100755
--- a/ShortcutUtil/Program.cs
+++ b/ShortcutUtil/Program.cs
@@ -41,7 +41,7 @@
                 return;
             }
 
-            Environment.CurrentDirectory = Path.GetDirectoryName(Path.Combine(Environment.CurrentDirectory, args[1]));
+            Environment.CurrentDirectory = Path.GetDirectoryName(Path.GetFullPath(args[1]));
 
 
             Application.EnableVisualStyles();
diff --git a/ShortcutUtil/SearchForm.Designer.cs b/ShortcutUtil/SearchForm.Designer.cs
new file mode 100755
index 0000000..93f58bf
--- /dev/null
+++ b/ShortcutUtil/SearchForm.Designer.cs
@@ -0,0 +1,111 @@
+namespace ShortcutUtil
+{
+    partial class SearchForm
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.searchLabel = new System.Windows.Forms.Label();
+            this.optionsLabel = new System.Windows.Forms.Label();
+            this.optionsList = new System.Windows.Forms.ListBox();
+            this.selectButton = new System.Windows.Forms.Button();
+            this.searchBox = new ShortcutUtil.WatermarkTextBox();
+            this.SuspendLayout();
+            // 
+            // searchLabel
+            // 
+            this.searchLabel.AutoSize = true;
+            this.searchLabel.Location = new System.Drawing.Point(13, 13);
+            this.searchLabel.Name = "searchLabel";
+            this.searchLabel.Size = new System.Drawing.Size(94, 20);
+            this.searchLabel.TabIndex = 0;
+            this.searchLabel.Text = "Search text:";
+            // 
+            // optionsLabel
+            // 
+            this.optionsLabel.AutoSize = true;
+            this.optionsLabel.Location = new System.Drawing.Point(13, 80);
+            this.optionsLabel.Name = "optionsLabel";
+            this.optionsLabel.Size = new System.Drawing.Size(68, 20);
+            this.optionsLabel.TabIndex = 2;
+            this.optionsLabel.Text = "Options:";
+            // 
+            // optionsList
+            // 
+            this.optionsList.FormattingEnabled = true;
+            this.optionsList.ItemHeight = 20;
+            this.optionsList.Location = new System.Drawing.Point(17, 104);
+            this.optionsList.Name = "optionsList";
+            this.optionsList.Size = new System.Drawing.Size(771, 304);
+            this.optionsList.TabIndex = 3;
+            // 
+            // selectButton
+            // 
+            this.selectButton.DialogResult = System.Windows.Forms.DialogResult.OK;
+            this.selectButton.Location = new System.Drawing.Point(661, 414);
+            this.selectButton.Name = "selectButton";
+            this.selectButton.Size = new System.Drawing.Size(127, 41);
+            this.selectButton.TabIndex = 4;
+            this.selectButton.Text = "Select";
+            this.selectButton.UseVisualStyleBackColor = true;
+            // 
+            // searchBox
+            // 
+            this.searchBox.Location = new System.Drawing.Point(17, 37);
+            this.searchBox.Name = "searchBox";
+            this.searchBox.Size = new System.Drawing.Size(771, 26);
+            this.searchBox.TabIndex = 1;
+            this.searchBox.WaterMarkColor = System.Drawing.Color.Gray;
+            this.searchBox.WaterMarkText = "Match text here";
+            this.searchBox.TextChanged += new System.EventHandler(this.searchBox_TextChanged);
+            // 
+            // SearchForm
+            // 
+            this.AcceptButton = this.selectButton;
+            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(800, 463);
+            this.Controls.Add(this.selectButton);
+            this.Controls.Add(this.optionsList);
+            this.Controls.Add(this.optionsLabel);
+            this.Controls.Add(this.searchBox);
+            this.Controls.Add(this.searchLabel);
+            this.Name = "SearchForm";
+            this.Text = "Search";
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Label searchLabel;
+        private System.Windows.Forms.Label optionsLabel;
+        private System.Windows.Forms.ListBox optionsList;
+        private System.Windows.Forms.Button selectButton;
+        private WatermarkTextBox searchBox;
+    }
+}
\ No newline at end of file
diff --git a/ShortcutUtil/SearchForm.cs b/ShortcutUtil/SearchForm.cs
new file mode 100755
index 0000000..3253ac5
--- /dev/null
+++ b/ShortcutUtil/SearchForm.cs
@@ -0,0 +1,61 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace ShortcutUtil
+{
+    public partial class SearchForm : Form
+    {
+        public SearchForm()
+        {
+            InitializeComponent();
+        }
+
+        private List<string> allOptions = new List<string>();
+        private List<Tuple<string, int>> displayOptions = new List<Tuple<string, int>>();
+
+        public T GetSelection<T>(string title, string optionsName, List<Tuple<T, string>> options) where T : class
+        {
+            allOptions = options.Select(s => s.Item2).ToList();
+
+            Text = title;
+            optionsLabel.Text = optionsName;
+
+            if (searchBox.Text != "")
+            {
+                searchBox.Text = "";
+            }
+            else
+            {
+                UpdateDisplay();
+            }
+
+            if (ShowDialog() == DialogResult.OK && optionsList.SelectedIndex >= 0 && optionsList.SelectedIndex < displayOptions.Count)
+            {
+                return options[displayOptions[optionsList.SelectedIndex].Item2].Item1;
+            }
+
+            return null;
+        }
+
+        private void UpdateDisplay()
+        {
+            string search = searchBox.Text.Trim().ToLower();
+            displayOptions = allOptions.Select((s, index) => new Tuple<string, int>(s, index)).Where(s => s.Item1.ToLower().Contains(search)).ToList();
+
+            optionsList.Items.Clear();
+            optionsList.Items.AddRange(displayOptions.Select(o => o.Item1).ToArray());
+        }
+
+        private void searchBox_TextChanged(object sender, EventArgs e)
+        {
+            UpdateDisplay();
+        }
+    }
+}
diff --git a/ShortcutUtil/SearchForm.resx b/ShortcutUtil/SearchForm.resx
new file mode 100755
index 0000000..29dcb1b
--- /dev/null
+++ b/ShortcutUtil/SearchForm.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file

diff --git a/EntryList.cs b/EntryList.cs
index dd43a65..f6af196 100755
--- a/EntryList.cs
+++ b/EntryList.cs
@@ -9,7 +9,7 @@
 namespace Entries
 {
     public class Entry
-    {
+    {        
         public string Target { get; set; }
         public string Icon { get; set; }
         public int IconIndex { get; set; }
@@ -19,6 +19,7 @@
 
     public class EntryList
     {
+        public string FilePath = null;
         public List<Entry> Entries;
 
         public static EntryList FromString(string contents)
@@ -34,7 +35,10 @@
             {
                 contents = new StreamReader(input).ReadToEnd();
             }
-            return FromString(contents);
+            EntryList entryList = FromString(contents);
+            if (entryList != null) entryList.FilePath = Path.GetFullPath(path);
+
+            return entryList;
         }
 
         public override string ToString()
diff --git a/ShortcutUtil/MainForm.Designer.cs b/ShortcutUtil/MainForm.Designer.cs
index fbb1aee..5dbf023 100755
--- a/ShortcutUtil/MainForm.Designer.cs
+++ b/ShortcutUtil/MainForm.Designer.cs
@@ -28,49 +28,95 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.label1 = new System.Windows.Forms.Label();
+            this.defaultShortcutLabel = new System.Windows.Forms.Label();
             this.entryListBox = new System.Windows.Forms.ListBox();
             this.createButton = new System.Windows.Forms.Button();
+            this.appUserModelIdLabel = new System.Windows.Forms.Label();
+            this.appUserModelIdBox = new ShortcutUtil.WatermarkTextBox();
+            this.appButton = new System.Windows.Forms.Button();
+            this.hwndButton = new System.Windows.Forms.Button();
             this.SuspendLayout();
             // 
-            // label1
+            // defaultShortcutLabel
             // 
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(13, 13);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(169, 20);
-            this.label1.TabIndex = 0;
-            this.label1.Text = "Select default shortcut";
+            this.defaultShortcutLabel.AutoSize = true;
+            this.defaultShortcutLabel.Location = new System.Drawing.Point(14, 75);
+            this.defaultShortcutLabel.Name = "defaultShortcutLabel";
+            this.defaultShortcutLabel.Size = new System.Drawing.Size(169, 20);
+            this.defaultShortcutLabel.TabIndex = 0;
+            this.defaultShortcutLabel.Text = "Select default shortcut";
             // 
             // entryListBox
             // 
             this.entryListBox.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawVariable;
             this.entryListBox.FormattingEnabled = true;
-            this.entryListBox.Location = new System.Drawing.Point(17, 37);
+            this.entryListBox.Location = new System.Drawing.Point(16, 98);
             this.entryListBox.Name = "entryListBox";
-            this.entryListBox.Size = new System.Drawing.Size(771, 355);
+            this.entryListBox.Size = new System.Drawing.Size(770, 355);
             this.entryListBox.TabIndex = 1;
             this.entryListBox.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.entryListBox_DrawItem);
             this.entryListBox.MeasureItem += new System.Windows.Forms.MeasureItemEventHandler(this.entryListBox_MeasureItem);
             // 
             // createButton
             // 
-            this.createButton.Location = new System.Drawing.Point(644, 398);
+            this.createButton.Location = new System.Drawing.Point(644, 458);
             this.createButton.Name = "createButton";
             this.createButton.Size = new System.Drawing.Size(144, 40);
             this.createButton.TabIndex = 2;
             this.createButton.Text = "Create Shortcut";
             this.createButton.UseVisualStyleBackColor = true;
             // 
+            // appUserModelIdLabel
+            // 
+            this.appUserModelIdLabel.AutoSize = true;
+            this.appUserModelIdLabel.Location = new System.Drawing.Point(14, 12);
+            this.appUserModelIdLabel.Name = "appUserModelIdLabel";
+            this.appUserModelIdLabel.Size = new System.Drawing.Size(213, 20);
+            this.appUserModelIdLabel.TabIndex = 3;
+            this.appUserModelIdLabel.Text = "Shortcut App User Model ID:";
+            // 
+            // appUserModelIdBox
+            // 
+            this.appUserModelIdBox.Location = new System.Drawing.Point(16, 35);
+            this.appUserModelIdBox.Name = "appUserModelIdBox";
+            this.appUserModelIdBox.Size = new System.Drawing.Size(608, 26);
+            this.appUserModelIdBox.TabIndex = 4;
+            this.appUserModelIdBox.WaterMarkColor = System.Drawing.Color.Gray;
+            this.appUserModelIdBox.WaterMarkText = "Enter a manual ID, or select on from a UWP App or open Window";
+            // 
+            // appButton
+            // 
+            this.appButton.Location = new System.Drawing.Point(633, 35);
+            this.appButton.Name = "appButton";
+            this.appButton.Size = new System.Drawing.Size(74, 31);
+            this.appButton.TabIndex = 5;
+            this.appButton.Text = "APP";
+            this.appButton.UseVisualStyleBackColor = true;
+            this.appButton.Click += new System.EventHandler(this.appButton_Click);
+            // 
+            // hwndButton
+            // 
+            this.hwndButton.Location = new System.Drawing.Point(712, 35);
+            this.hwndButton.MinimumSize = new System.Drawing.Size(76, 26);
+            this.hwndButton.Name = "hwndButton";
+            this.hwndButton.Size = new System.Drawing.Size(76, 31);
+            this.hwndButton.TabIndex = 6;
+            this.hwndButton.Text = "HWND";
+            this.hwndButton.UseVisualStyleBackColor = true;
+            // 
             // MainForm
             // 
             this.AcceptButton = this.createButton;
             this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(800, 444);
+            this.ClientSize = new System.Drawing.Size(800, 508);
+            this.Controls.Add(this.hwndButton);
+            this.Controls.Add(this.appButton);
+            this.Controls.Add(this.appUserModelIdBox);
+            this.Controls.Add(this.appUserModelIdLabel);
             this.Controls.Add(this.createButton);
             this.Controls.Add(this.entryListBox);
-            this.Controls.Add(this.label1);
+            this.Controls.Add(this.defaultShortcutLabel);
             this.Name = "MainForm";
             this.Text = "Form1";
             this.Shown += new System.EventHandler(this.MainForm_Shown);
@@ -82,9 +128,13 @@
 
         #endregion
 
-        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.Label defaultShortcutLabel;
         private System.Windows.Forms.ListBox entryListBox;
         private System.Windows.Forms.Button createButton;
+        private System.Windows.Forms.Label appUserModelIdLabel;
+        private System.Windows.Forms.Button appButton;
+        private System.Windows.Forms.Button hwndButton;
+        private WatermarkTextBox appUserModelIdBox;
     }
 }
 
diff --git a/ShortcutUtil/MainForm.cs b/ShortcutUtil/MainForm.cs
index cb5990a..680ed45 100755
--- a/ShortcutUtil/MainForm.cs
+++ b/ShortcutUtil/MainForm.cs
@@ -9,6 +9,9 @@
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using Windows.ApplicationModel;
+using Windows.ApplicationModel.Core;
+using Windows.Management.Deployment;
 
 namespace ShortcutUtil
 {
@@ -28,13 +31,20 @@
         {
             InitializeComponent();
 
-            defaultFont = label1.Font;
+            Text = entryList.FilePath == null ? "New shortcut file" : entryList.FilePath;
+
+            defaultFont = defaultShortcutLabel.Font;
             nameFont = new Font(defaultFont, FontStyle.Bold);
-            fontBrush = new SolidBrush(label1.ForeColor);
+            fontBrush = new SolidBrush(defaultShortcutLabel.ForeColor);
 
             this.entryList = entryList;
 
             entryListBox.Items.AddRange(this.entryList.Entries.ToArray());
+
+            if (this.entryList.Entries.Count > 0)
+            {
+                entryListBox.SelectedIndex = 0;
+            }
         }
 
         private Dictionary<Tuple<string, int, Size>, Icon> iconsByFileIndex = new Dictionary<Tuple<string, int, Size>, Icon>();
@@ -128,5 +138,33 @@
 
             shown = true;
         }
+
+        private SearchForm search = new SearchForm();
+        private async void appButton_Click(object sender, EventArgs e)
+        {
+            appButton.Enabled = false;
+
+            PackageManager pm = new PackageManager();
+
+            List<Tuple<string, string>> options = new List<Tuple<string, string>>();
+
+            foreach (Package p in pm.FindPackagesForUser(string.Empty))
+            {
+                var apps = await p.GetAppListEntriesAsync().AsTask();
+                foreach (AppListEntry app in apps)
+                {
+                    options.Add(new Tuple<string, string>(app.AppUserModelId, app.DisplayInfo.DisplayName + ": " + app.AppUserModelId));
+                }
+            }
+
+            string selectedAppUserModelId = search.GetSelection("Select UWP App", "Available Apps:", options);
+
+            if (selectedAppUserModelId != null)
+            {
+                appUserModelIdBox.Text = selectedAppUserModelId;
+            }
+
+            appButton.Enabled = true;
+        }
     }
 }
diff --git a/ShortcutUtil/Program.cs b/ShortcutUtil/Program.cs
index 3a962d4..9b6f955 100755
--- a/ShortcutUtil/Program.cs
+++ b/ShortcutUtil/Program.cs
@@ -41,7 +41,7 @@
                 return;
             }
 
-            Environment.CurrentDirectory = Path.GetDirectoryName(Path.Combine(Environment.CurrentDirectory, args[1]));
+            Environment.CurrentDirectory = Path.GetDirectoryName(Path.GetFullPath(args[1]));
 
 
             Application.EnableVisualStyles();
diff --git a/ShortcutUtil/SearchForm.Designer.cs b/ShortcutUtil/SearchForm.Designer.cs
new file mode 100755
index 0000000..93f58bf
--- /dev/null
+++ b/ShortcutUtil/SearchForm.Designer.cs
@@ -0,0 +1,111 @@
+namespace ShortcutUtil
+{
+    partial class SearchForm
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.searchLabel = new System.Windows.Forms.Label();
+            this.optionsLabel = new System.Windows.Forms.Label();
+            this.optionsList = new System.Windows.Forms.ListBox();
+            this.selectButton = new System.Windows.Forms.Button();
+            this.searchBox = new ShortcutUtil.WatermarkTextBox();
+            this.SuspendLayout();
+            // 
+            // searchLabel
+            // 
+            this.searchLabel.AutoSize = true;
+            this.searchLabel.Location = new System.Drawing.Point(13, 13);
+            this.searchLabel.Name = "searchLabel";
+            this.searchLabel.Size = new System.Drawing.Size(94, 20);
+            this.searchLabel.TabIndex = 0;
+            this.searchLabel.Text = "Search text:";
+            // 
+            // optionsLabel
+            // 
+            this.optionsLabel.AutoSize = true;
+            this.optionsLabel.Location = new System.Drawing.Point(13, 80);
+            this.optionsLabel.Name = "optionsLabel";
+            this.optionsLabel.Size = new System.Drawing.Size(68, 20);
+            this.optionsLabel.TabIndex = 2;
+            this.optionsLabel.Text = "Options:";
+            // 
+            // optionsList
+            // 
+            this.optionsList.FormattingEnabled = true;
+            this.optionsList.ItemHeight = 20;
+            this.optionsList.Location = new System.Drawing.Point(17, 104);
+            this.optionsList.Name = "optionsList";
+            this.optionsList.Size = new System.Drawing.Size(771, 304);
+            this.optionsList.TabIndex = 3;
+            // 
+            // selectButton
+            // 
+            this.selectButton.DialogResult = System.Windows.Forms.DialogResult.OK;
+            this.selectButton.Location = new System.Drawing.Point(661, 414);
+            this.selectButton.Name = "selectButton";
+            this.selectButton.Size = new System.Drawing.Size(127, 41);
+            this.selectButton.TabIndex = 4;
+            this.selectButton.Text = "Select";
+            this.selectButton.UseVisualStyleBackColor = true;
+            // 
+            // searchBox
+            // 
+            this.searchBox.Location = new System.Drawing.Point(17, 37);
+            this.searchBox.Name = "searchBox";
+            this.searchBox.Size = new System.Drawing.Size(771, 26);
+            this.searchBox.TabIndex = 1;
+            this.searchBox.WaterMarkColor = System.Drawing.Color.Gray;
+            this.searchBox.WaterMarkText = "Match text here";
+            this.searchBox.TextChanged += new System.EventHandler(this.searchBox_TextChanged);
+            // 
+            // SearchForm
+            // 
+            this.AcceptButton = this.selectButton;
+            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(800, 463);
+            this.Controls.Add(this.selectButton);
+            this.Controls.Add(this.optionsList);
+            this.Controls.Add(this.optionsLabel);
+            this.Controls.Add(this.searchBox);
+            this.Controls.Add(this.searchLabel);
+            this.Name = "SearchForm";
+            this.Text = "Search";
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Label searchLabel;
+        private System.Windows.Forms.Label optionsLabel;
+        private System.Windows.Forms.ListBox optionsList;
+        private System.Windows.Forms.Button selectButton;
+        private WatermarkTextBox searchBox;
+    }
+}
\ No newline at end of file
diff --git a/ShortcutUtil/SearchForm.cs b/ShortcutUtil/SearchForm.cs
new file mode 100755
index 0000000..3253ac5
--- /dev/null
+++ b/ShortcutUtil/SearchForm.cs
@@ -0,0 +1,61 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace ShortcutUtil
+{
+    public partial class SearchForm : Form
+    {
+        public SearchForm()
+        {
+            InitializeComponent();
+        }
+
+        private List<string> allOptions = new List<string>();
+        private List<Tuple<string, int>> displayOptions = new List<Tuple<string, int>>();
+
+        public T GetSelection<T>(string title, string optionsName, List<Tuple<T, string>> options) where T : class
+        {
+            allOptions = options.Select(s => s.Item2).ToList();
+
+            Text = title;
+            optionsLabel.Text = optionsName;
+
+            if (searchBox.Text != "")
+            {
+                searchBox.Text = "";
+            }
+            else
+            {
+                UpdateDisplay();
+            }
+
+            if (ShowDialog() == DialogResult.OK && optionsList.SelectedIndex >= 0 && optionsList.SelectedIndex < displayOptions.Count)
+            {
+                return options[displayOptions[optionsList.SelectedIndex].Item2].Item1;
+            }
+
+            return null;
+        }
+
+        private void UpdateDisplay()
+        {
+            string search = searchBox.Text.Trim().ToLower();
+            displayOptions = allOptions.Select((s, index) => new Tuple<string, int>(s, index)).Where(s => s.Item1.ToLower().Contains(search)).ToList();
+
+            optionsList.Items.Clear();
+            optionsList.Items.AddRange(displayOptions.Select(o => o.Item1).ToArray());
+        }
+
+        private void searchBox_TextChanged(object sender, EventArgs e)
+        {
+            UpdateDisplay();
+        }
+    }
+}
diff --git a/ShortcutUtil/SearchForm.resx b/ShortcutUtil/SearchForm.resx
new file mode 100755
index 0000000..29dcb1b
--- /dev/null
+++ b/ShortcutUtil/SearchForm.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/ShortcutUtil/ShortcutUtil.csproj b/ShortcutUtil/ShortcutUtil.csproj
index a9c0bce..87a451f 100755
--- a/ShortcutUtil/ShortcutUtil.csproj
+++ b/ShortcutUtil/ShortcutUtil.csproj
@@ -51,6 +51,10 @@
     <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
+    <Reference Include="System.Runtime.WindowsRuntime, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETCore\v4.5\System.Runtime.WindowsRuntime.dll</HintPath>
+    </Reference>
     <Reference Include="System.Text.Encodings.Web, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Text.Encodings.Web.4.7.1\lib\net461\System.Text.Encodings.Web.dll</HintPath>
     </Reference>
@@ -72,6 +76,9 @@
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
+    <Reference Include="Windows">
+      <HintPath>..\..\..\Program Files (x86)\Windows Kits\10\UnionMetadata\10.0.18362.0\Windows.winmd</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\EntryList.cs">
@@ -86,6 +93,15 @@
     </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="SearchForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="SearchForm.Designer.cs">
+      <DependentUpon>SearchForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="WatermarkTextBox.cs">
+      <SubType>Component</SubType>
+    </Compile>
     <EmbeddedResource Include="MainForm.resx">
       <DependentUpon>MainForm.cs</DependentUpon>
     </EmbeddedResource>
@@ -98,6 +114,9 @@
       <AutoGen>True</AutoGen>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
+    <EmbeddedResource Include="SearchForm.resx">
+      <DependentUpon>SearchForm.cs</DependentUpon>
+    </EmbeddedResource>
     <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
@@ -112,5 +131,8 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
+  <ItemGroup>
+    <WCFMetadata Include="Connected Services\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file

diff --git a/EntryList.cs b/EntryList.cs
index dd43a65..f6af196 100755
--- a/EntryList.cs
+++ b/EntryList.cs
@@ -9,7 +9,7 @@
 namespace Entries
 {
     public class Entry
-    {
+    {        
         public string Target { get; set; }
         public string Icon { get; set; }
         public int IconIndex { get; set; }
@@ -19,6 +19,7 @@
 
     public class EntryList
     {
+        public string FilePath = null;
         public List<Entry> Entries;
 
         public static EntryList FromString(string contents)
@@ -34,7 +35,10 @@
             {
                 contents = new StreamReader(input).ReadToEnd();
             }
-            return FromString(contents);
+            EntryList entryList = FromString(contents);
+            if (entryList != null) entryList.FilePath = Path.GetFullPath(path);
+
+            return entryList;
         }
 
         public override string ToString()
diff --git a/ShortcutUtil/MainForm.Designer.cs b/ShortcutUtil/MainForm.Designer.cs
index fbb1aee..5dbf023 100755
--- a/ShortcutUtil/MainForm.Designer.cs
+++ b/ShortcutUtil/MainForm.Designer.cs
@@ -28,49 +28,95 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.label1 = new System.Windows.Forms.Label();
+            this.defaultShortcutLabel = new System.Windows.Forms.Label();
             this.entryListBox = new System.Windows.Forms.ListBox();
             this.createButton = new System.Windows.Forms.Button();
+            this.appUserModelIdLabel = new System.Windows.Forms.Label();
+            this.appUserModelIdBox = new ShortcutUtil.WatermarkTextBox();
+            this.appButton = new System.Windows.Forms.Button();
+            this.hwndButton = new System.Windows.Forms.Button();
             this.SuspendLayout();
             // 
-            // label1
+            // defaultShortcutLabel
             // 
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(13, 13);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(169, 20);
-            this.label1.TabIndex = 0;
-            this.label1.Text = "Select default shortcut";
+            this.defaultShortcutLabel.AutoSize = true;
+            this.defaultShortcutLabel.Location = new System.Drawing.Point(14, 75);
+            this.defaultShortcutLabel.Name = "defaultShortcutLabel";
+            this.defaultShortcutLabel.Size = new System.Drawing.Size(169, 20);
+            this.defaultShortcutLabel.TabIndex = 0;
+            this.defaultShortcutLabel.Text = "Select default shortcut";
             // 
             // entryListBox
             // 
             this.entryListBox.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawVariable;
             this.entryListBox.FormattingEnabled = true;
-            this.entryListBox.Location = new System.Drawing.Point(17, 37);
+            this.entryListBox.Location = new System.Drawing.Point(16, 98);
             this.entryListBox.Name = "entryListBox";
-            this.entryListBox.Size = new System.Drawing.Size(771, 355);
+            this.entryListBox.Size = new System.Drawing.Size(770, 355);
             this.entryListBox.TabIndex = 1;
             this.entryListBox.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.entryListBox_DrawItem);
             this.entryListBox.MeasureItem += new System.Windows.Forms.MeasureItemEventHandler(this.entryListBox_MeasureItem);
             // 
             // createButton
             // 
-            this.createButton.Location = new System.Drawing.Point(644, 398);
+            this.createButton.Location = new System.Drawing.Point(644, 458);
             this.createButton.Name = "createButton";
             this.createButton.Size = new System.Drawing.Size(144, 40);
             this.createButton.TabIndex = 2;
             this.createButton.Text = "Create Shortcut";
             this.createButton.UseVisualStyleBackColor = true;
             // 
+            // appUserModelIdLabel
+            // 
+            this.appUserModelIdLabel.AutoSize = true;
+            this.appUserModelIdLabel.Location = new System.Drawing.Point(14, 12);
+            this.appUserModelIdLabel.Name = "appUserModelIdLabel";
+            this.appUserModelIdLabel.Size = new System.Drawing.Size(213, 20);
+            this.appUserModelIdLabel.TabIndex = 3;
+            this.appUserModelIdLabel.Text = "Shortcut App User Model ID:";
+            // 
+            // appUserModelIdBox
+            // 
+            this.appUserModelIdBox.Location = new System.Drawing.Point(16, 35);
+            this.appUserModelIdBox.Name = "appUserModelIdBox";
+            this.appUserModelIdBox.Size = new System.Drawing.Size(608, 26);
+            this.appUserModelIdBox.TabIndex = 4;
+            this.appUserModelIdBox.WaterMarkColor = System.Drawing.Color.Gray;
+            this.appUserModelIdBox.WaterMarkText = "Enter a manual ID, or select on from a UWP App or open Window";
+            // 
+            // appButton
+            // 
+            this.appButton.Location = new System.Drawing.Point(633, 35);
+            this.appButton.Name = "appButton";
+            this.appButton.Size = new System.Drawing.Size(74, 31);
+            this.appButton.TabIndex = 5;
+            this.appButton.Text = "APP";
+            this.appButton.UseVisualStyleBackColor = true;
+            this.appButton.Click += new System.EventHandler(this.appButton_Click);
+            // 
+            // hwndButton
+            // 
+            this.hwndButton.Location = new System.Drawing.Point(712, 35);
+            this.hwndButton.MinimumSize = new System.Drawing.Size(76, 26);
+            this.hwndButton.Name = "hwndButton";
+            this.hwndButton.Size = new System.Drawing.Size(76, 31);
+            this.hwndButton.TabIndex = 6;
+            this.hwndButton.Text = "HWND";
+            this.hwndButton.UseVisualStyleBackColor = true;
+            // 
             // MainForm
             // 
             this.AcceptButton = this.createButton;
             this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(800, 444);
+            this.ClientSize = new System.Drawing.Size(800, 508);
+            this.Controls.Add(this.hwndButton);
+            this.Controls.Add(this.appButton);
+            this.Controls.Add(this.appUserModelIdBox);
+            this.Controls.Add(this.appUserModelIdLabel);
             this.Controls.Add(this.createButton);
             this.Controls.Add(this.entryListBox);
-            this.Controls.Add(this.label1);
+            this.Controls.Add(this.defaultShortcutLabel);
             this.Name = "MainForm";
             this.Text = "Form1";
             this.Shown += new System.EventHandler(this.MainForm_Shown);
@@ -82,9 +128,13 @@
 
         #endregion
 
-        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.Label defaultShortcutLabel;
         private System.Windows.Forms.ListBox entryListBox;
         private System.Windows.Forms.Button createButton;
+        private System.Windows.Forms.Label appUserModelIdLabel;
+        private System.Windows.Forms.Button appButton;
+        private System.Windows.Forms.Button hwndButton;
+        private WatermarkTextBox appUserModelIdBox;
     }
 }
 
diff --git a/ShortcutUtil/MainForm.cs b/ShortcutUtil/MainForm.cs
index cb5990a..680ed45 100755
--- a/ShortcutUtil/MainForm.cs
+++ b/ShortcutUtil/MainForm.cs
@@ -9,6 +9,9 @@
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using Windows.ApplicationModel;
+using Windows.ApplicationModel.Core;
+using Windows.Management.Deployment;
 
 namespace ShortcutUtil
 {
@@ -28,13 +31,20 @@
         {
             InitializeComponent();
 
-            defaultFont = label1.Font;
+            Text = entryList.FilePath == null ? "New shortcut file" : entryList.FilePath;
+
+            defaultFont = defaultShortcutLabel.Font;
             nameFont = new Font(defaultFont, FontStyle.Bold);
-            fontBrush = new SolidBrush(label1.ForeColor);
+            fontBrush = new SolidBrush(defaultShortcutLabel.ForeColor);
 
             this.entryList = entryList;
 
             entryListBox.Items.AddRange(this.entryList.Entries.ToArray());
+
+            if (this.entryList.Entries.Count > 0)
+            {
+                entryListBox.SelectedIndex = 0;
+            }
         }
 
         private Dictionary<Tuple<string, int, Size>, Icon> iconsByFileIndex = new Dictionary<Tuple<string, int, Size>, Icon>();
@@ -128,5 +138,33 @@
 
             shown = true;
         }
+
+        private SearchForm search = new SearchForm();
+        private async void appButton_Click(object sender, EventArgs e)
+        {
+            appButton.Enabled = false;
+
+            PackageManager pm = new PackageManager();
+
+            List<Tuple<string, string>> options = new List<Tuple<string, string>>();
+
+            foreach (Package p in pm.FindPackagesForUser(string.Empty))
+            {
+                var apps = await p.GetAppListEntriesAsync().AsTask();
+                foreach (AppListEntry app in apps)
+                {
+                    options.Add(new Tuple<string, string>(app.AppUserModelId, app.DisplayInfo.DisplayName + ": " + app.AppUserModelId));
+                }
+            }
+
+            string selectedAppUserModelId = search.GetSelection("Select UWP App", "Available Apps:", options);
+
+            if (selectedAppUserModelId != null)
+            {
+                appUserModelIdBox.Text = selectedAppUserModelId;
+            }
+
+            appButton.Enabled = true;
+        }
     }
 }
diff --git a/ShortcutUtil/Program.cs b/ShortcutUtil/Program.cs
index 3a962d4..9b6f955 100755
--- a/ShortcutUtil/Program.cs
+++ b/ShortcutUtil/Program.cs
@@ -41,7 +41,7 @@
                 return;
             }
 
-            Environment.CurrentDirectory = Path.GetDirectoryName(Path.Combine(Environment.CurrentDirectory, args[1]));
+            Environment.CurrentDirectory = Path.GetDirectoryName(Path.GetFullPath(args[1]));
 
 
             Application.EnableVisualStyles();
diff --git a/ShortcutUtil/SearchForm.Designer.cs b/ShortcutUtil/SearchForm.Designer.cs
new file mode 100755
index 0000000..93f58bf
--- /dev/null
+++ b/ShortcutUtil/SearchForm.Designer.cs
@@ -0,0 +1,111 @@
+namespace ShortcutUtil
+{
+    partial class SearchForm
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.searchLabel = new System.Windows.Forms.Label();
+            this.optionsLabel = new System.Windows.Forms.Label();
+            this.optionsList = new System.Windows.Forms.ListBox();
+            this.selectButton = new System.Windows.Forms.Button();
+            this.searchBox = new ShortcutUtil.WatermarkTextBox();
+            this.SuspendLayout();
+            // 
+            // searchLabel
+            // 
+            this.searchLabel.AutoSize = true;
+            this.searchLabel.Location = new System.Drawing.Point(13, 13);
+            this.searchLabel.Name = "searchLabel";
+            this.searchLabel.Size = new System.Drawing.Size(94, 20);
+            this.searchLabel.TabIndex = 0;
+            this.searchLabel.Text = "Search text:";
+            // 
+            // optionsLabel
+            // 
+            this.optionsLabel.AutoSize = true;
+            this.optionsLabel.Location = new System.Drawing.Point(13, 80);
+            this.optionsLabel.Name = "optionsLabel";
+            this.optionsLabel.Size = new System.Drawing.Size(68, 20);
+            this.optionsLabel.TabIndex = 2;
+            this.optionsLabel.Text = "Options:";
+            // 
+            // optionsList
+            // 
+            this.optionsList.FormattingEnabled = true;
+            this.optionsList.ItemHeight = 20;
+            this.optionsList.Location = new System.Drawing.Point(17, 104);
+            this.optionsList.Name = "optionsList";
+            this.optionsList.Size = new System.Drawing.Size(771, 304);
+            this.optionsList.TabIndex = 3;
+            // 
+            // selectButton
+            // 
+            this.selectButton.DialogResult = System.Windows.Forms.DialogResult.OK;
+            this.selectButton.Location = new System.Drawing.Point(661, 414);
+            this.selectButton.Name = "selectButton";
+            this.selectButton.Size = new System.Drawing.Size(127, 41);
+            this.selectButton.TabIndex = 4;
+            this.selectButton.Text = "Select";
+            this.selectButton.UseVisualStyleBackColor = true;
+            // 
+            // searchBox
+            // 
+            this.searchBox.Location = new System.Drawing.Point(17, 37);
+            this.searchBox.Name = "searchBox";
+            this.searchBox.Size = new System.Drawing.Size(771, 26);
+            this.searchBox.TabIndex = 1;
+            this.searchBox.WaterMarkColor = System.Drawing.Color.Gray;
+            this.searchBox.WaterMarkText = "Match text here";
+            this.searchBox.TextChanged += new System.EventHandler(this.searchBox_TextChanged);
+            // 
+            // SearchForm
+            // 
+            this.AcceptButton = this.selectButton;
+            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(800, 463);
+            this.Controls.Add(this.selectButton);
+            this.Controls.Add(this.optionsList);
+            this.Controls.Add(this.optionsLabel);
+            this.Controls.Add(this.searchBox);
+            this.Controls.Add(this.searchLabel);
+            this.Name = "SearchForm";
+            this.Text = "Search";
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Label searchLabel;
+        private System.Windows.Forms.Label optionsLabel;
+        private System.Windows.Forms.ListBox optionsList;
+        private System.Windows.Forms.Button selectButton;
+        private WatermarkTextBox searchBox;
+    }
+}
\ No newline at end of file
diff --git a/ShortcutUtil/SearchForm.cs b/ShortcutUtil/SearchForm.cs
new file mode 100755
index 0000000..3253ac5
--- /dev/null
+++ b/ShortcutUtil/SearchForm.cs
@@ -0,0 +1,61 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace ShortcutUtil
+{
+    public partial class SearchForm : Form
+    {
+        public SearchForm()
+        {
+            InitializeComponent();
+        }
+
+        private List<string> allOptions = new List<string>();
+        private List<Tuple<string, int>> displayOptions = new List<Tuple<string, int>>();
+
+        public T GetSelection<T>(string title, string optionsName, List<Tuple<T, string>> options) where T : class
+        {
+            allOptions = options.Select(s => s.Item2).ToList();
+
+            Text = title;
+            optionsLabel.Text = optionsName;
+
+            if (searchBox.Text != "")
+            {
+                searchBox.Text = "";
+            }
+            else
+            {
+                UpdateDisplay();
+            }
+
+            if (ShowDialog() == DialogResult.OK && optionsList.SelectedIndex >= 0 && optionsList.SelectedIndex < displayOptions.Count)
+            {
+                return options[displayOptions[optionsList.SelectedIndex].Item2].Item1;
+            }
+
+            return null;
+        }
+
+        private void UpdateDisplay()
+        {
+            string search = searchBox.Text.Trim().ToLower();
+            displayOptions = allOptions.Select((s, index) => new Tuple<string, int>(s, index)).Where(s => s.Item1.ToLower().Contains(search)).ToList();
+
+            optionsList.Items.Clear();
+            optionsList.Items.AddRange(displayOptions.Select(o => o.Item1).ToArray());
+        }
+
+        private void searchBox_TextChanged(object sender, EventArgs e)
+        {
+            UpdateDisplay();
+        }
+    }
+}
diff --git a/ShortcutUtil/SearchForm.resx b/ShortcutUtil/SearchForm.resx
new file mode 100755
index 0000000..29dcb1b
--- /dev/null
+++ b/ShortcutUtil/SearchForm.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/ShortcutUtil/ShortcutUtil.csproj b/ShortcutUtil/ShortcutUtil.csproj
index a9c0bce..87a451f 100755
--- a/ShortcutUtil/ShortcutUtil.csproj
+++ b/ShortcutUtil/ShortcutUtil.csproj
@@ -51,6 +51,10 @@
     <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
+    <Reference Include="System.Runtime.WindowsRuntime, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETCore\v4.5\System.Runtime.WindowsRuntime.dll</HintPath>
+    </Reference>
     <Reference Include="System.Text.Encodings.Web, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Text.Encodings.Web.4.7.1\lib\net461\System.Text.Encodings.Web.dll</HintPath>
     </Reference>
@@ -72,6 +76,9 @@
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
+    <Reference Include="Windows">
+      <HintPath>..\..\..\Program Files (x86)\Windows Kits\10\UnionMetadata\10.0.18362.0\Windows.winmd</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\EntryList.cs">
@@ -86,6 +93,15 @@
     </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="SearchForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="SearchForm.Designer.cs">
+      <DependentUpon>SearchForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="WatermarkTextBox.cs">
+      <SubType>Component</SubType>
+    </Compile>
     <EmbeddedResource Include="MainForm.resx">
       <DependentUpon>MainForm.cs</DependentUpon>
     </EmbeddedResource>
@@ -98,6 +114,9 @@
       <AutoGen>True</AutoGen>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
+    <EmbeddedResource Include="SearchForm.resx">
+      <DependentUpon>SearchForm.cs</DependentUpon>
+    </EmbeddedResource>
     <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
@@ -112,5 +131,8 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
+  <ItemGroup>
+    <WCFMetadata Include="Connected Services\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/ShortcutUtil/WatermarkTextBox.cs b/ShortcutUtil/WatermarkTextBox.cs
new file mode 100755
index 0000000..fd4ada8
--- /dev/null
+++ b/ShortcutUtil/WatermarkTextBox.cs
@@ -0,0 +1,126 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace ShortcutUtil
+{
+	// https://www.codeproject.com/Articles/27849/WaterMark-TextBox-For-Desktop-Applications-Using-C
+
+	class WatermarkTextBox : TextBox
+	{
+		private Font mOldFont = null;
+		private Boolean mWaterMarkTextEnabled = false;
+
+		#region Attributes 
+		private Color _waterMarkColor = Color.Gray;
+		public Color WaterMarkColor
+		{
+			get { return _waterMarkColor; }
+			set
+			{
+				_waterMarkColor = value; Invalidate();/*thanks to Bernhard Elbl
+															  for Invalidate()*/
+			}
+		}
+
+		private string _waterMarkText = "Water Mark";
+		public string WaterMarkText
+		{
+			get { return _waterMarkText; }
+			set { _waterMarkText = value; Invalidate(); }
+		}
+		#endregion
+
+		//Default constructor
+		public WatermarkTextBox()
+		{
+			JoinEvents(true);
+		}
+
+		//Override OnCreateControl ... thanks to  "lpgray .. codeproject guy"
+		protected override void OnCreateControl()
+		{
+			base.OnCreateControl();
+			WaterMarkToggle(null, null);
+		}
+
+		//Override OnPaint
+		protected override void OnPaint(PaintEventArgs args)
+		{
+			// Use the same font that was defined in base class
+			System.Drawing.Font drawFont = new System.Drawing.Font(Font.FontFamily,
+				Font.Size, Font.Style, Font.Unit);
+			//Create new brush with gray color or 
+			SolidBrush drawBrush = new SolidBrush(WaterMarkColor);//use Water mark color
+																  //Draw Text or WaterMark
+			args.Graphics.DrawString((mWaterMarkTextEnabled ? WaterMarkText : Text),
+				drawFont, drawBrush, new PointF(0.0F, 0.0F));
+			base.OnPaint(args);
+		}
+
+		private void JoinEvents(Boolean join)
+		{
+			if (join)
+			{
+				this.TextChanged += new System.EventHandler(this.WaterMarkToggle);
+				this.LostFocus += new System.EventHandler(this.WaterMarkToggle);
+				this.FontChanged += new System.EventHandler(this.WaterMark_FontChanged);
+				//No one of the above events will start immeddiatlly 
+				//TextBox control still in constructing, so,
+				//Font object (for example) couldn't be catched from within
+				//WaterMark_Toggle
+				//So, call WaterMark_Toggel through OnCreateControl after TextBox
+				//is totally created
+				//No doupt, it will be only one time call
+
+				//Old solution uses Timer.Tick event to check Create property
+			}
+		}
+
+		private void WaterMarkToggle(object sender, EventArgs args)
+		{
+			if (this.Text.Length <= 0)
+				EnableWaterMark();
+			else
+				DisableWaterMark();
+		}
+
+		private void EnableWaterMark()
+		{
+			//Save current font until returning the UserPaint style to false (NOTE:
+			//It is a try and error advice)
+			mOldFont = new System.Drawing.Font(Font.FontFamily, Font.Size, Font.Style,
+			   Font.Unit);
+			//Enable OnPaint event handler
+			this.SetStyle(ControlStyles.UserPaint, true);
+			this.mWaterMarkTextEnabled = true;
+			//Triger OnPaint immediatly
+			Refresh();
+		}
+
+		private void DisableWaterMark()
+		{
+			//Disbale OnPaint event handler
+			this.mWaterMarkTextEnabled = false;
+			this.SetStyle(ControlStyles.UserPaint, false);
+			//Return back oldFont if existed
+			if (mOldFont != null)
+				this.Font = new System.Drawing.Font(mOldFont.FontFamily, mOldFont.Size,
+					mOldFont.Style, mOldFont.Unit);
+		}
+
+		private void WaterMark_FontChanged(object sender, EventArgs args)
+		{
+			if (mWaterMarkTextEnabled)
+			{
+				mOldFont = new System.Drawing.Font(Font.FontFamily, Font.Size, Font.Style,
+					Font.Unit);
+				Refresh();
+			}
+		}
+	}
+}