From 89d6eb62efb8baeae85256f18078bf22a648fd29 Mon Sep 17 00:00:00 2001
From: Lee Berg <leealanberg@gmail.com>
Date: Mon, 18 Jan 2021 17:05:36 -0600
Subject: [PATCH] Simplfication Update

* Multiple Extenions Names
* Removed all dependencies
* Update UI to be more scary
---
 CashCat/CashCat.csproj         |   8 +--
 CashCat/ConfigurationFile.cs   |  13 ++--
 CashCat/FileSystemOperation.cs |  87 ++++++++++-------------
 CashCat/MainWindow.xaml        |  27 ++++++--
 CashCat/MainWindow.xaml.cs     | 123 ++++++++++++++++++++++++++-------
 CashCat/RansomFiles.cs         |  24 +++++++
 CashCat/packages.config        |   5 --
 7 files changed, 185 insertions(+), 102 deletions(-)
 create mode 100644 CashCat/RansomFiles.cs
 delete mode 100644 CashCat/packages.config

diff --git a/CashCat/CashCat.csproj b/CashCat/CashCat.csproj
index 4bf9a96..ba03918 100644
--- a/CashCat/CashCat.csproj
+++ b/CashCat/CashCat.csproj
@@ -60,12 +60,6 @@
     <ApplicationIcon>Cjdowner-BCH.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="RestSharp, Version=106.11.4.0, Culture=neutral, PublicKeyToken=598062e77f915f75, processorArchitecture=MSIL">
-      <HintPath>..\packages\RestSharp.106.11.4\lib\net452\RestSharp.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Web" />
@@ -87,6 +81,7 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
+    <Compile Include="RansomFiles.cs" />
     <Page Include="MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -120,7 +115,6 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
-    <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
diff --git a/CashCat/ConfigurationFile.cs b/CashCat/ConfigurationFile.cs
index 809a774..5b0e52e 100644
--- a/CashCat/ConfigurationFile.cs
+++ b/CashCat/ConfigurationFile.cs
@@ -1,5 +1,4 @@
-using Newtonsoft.Json;
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -16,7 +15,9 @@ public partial class ConfigurationFile
             
 
         // Get Current Config file // return object
-        public ConfigurationFile ConfigurationFileSetup(string path)
+        //public ConfigurationFile ConfigurationFileSetup(string path)
+        
+        public void ConfigurationFileSetup(string path)
         {
             string jsonPath = path + "\\CashCat.json";
             // read JSON directly from a file
@@ -26,9 +27,9 @@ public ConfigurationFile ConfigurationFileSetup(string path)
                 {
                     string json = file.ReadToEnd();
 
-                    ConfigurationFile CurrentConfig = JsonConvert.DeserializeObject<ConfigurationFile>(json);
+                    //ConfigurationFile CurrentConfig = JsonConvert.DeserializeObject<ConfigurationFile>(json);
 
-                    return CurrentConfig;
+                    //return CurrentConfig;
 
                 }
 
@@ -36,7 +37,7 @@ public ConfigurationFile ConfigurationFileSetup(string path)
             catch
             {
                 Console.WriteLine("Error Loading JSON Config");
-                return null;
+                //return null;
             }
 
 
diff --git a/CashCat/FileSystemOperation.cs b/CashCat/FileSystemOperation.cs
index ee55ee5..c379b85 100644
--- a/CashCat/FileSystemOperation.cs
+++ b/CashCat/FileSystemOperation.cs
@@ -15,6 +15,8 @@ public class FileSystemOperation
         /// </summary>
         /// 
 
+        private RansomFiles RandomwareFileList = new RansomFiles();
+
 
         public void WriteLog(string logMessage)
         {
@@ -78,6 +80,29 @@ public FileInfo[] GetLockyFileCount(string path)
             return Files;
         }
 
+        public List<FileInfo> GetRansomedFileCount(string path)
+        {
+            DirectoryInfo d = new DirectoryInfo(path);
+            FileInfo[] Files = d.GetFiles("*");
+
+            List<FileInfo> RansomwareFiles = new List<FileInfo>();
+
+            int fileCount = 0;
+
+            foreach (FileInfo file in Files)
+            {
+            
+                if(RandomwareFileList.fileExtensions.Contains(file.Extension))
+                {
+                    RansomwareFiles.Add(file);
+                }
+                
+            }
+
+            return RansomwareFiles;
+        }
+
+
        
 
         public FileInfo[] GetTXTFileCount (string path)
@@ -90,9 +115,13 @@ public FileInfo[] GetTXTFileCount (string path)
         public void LockTXTFile(FileInfo file)
         {
             string oldfilename = file.Name;
-            string newfilename = (file.Name).Replace(".txt", ".locky");
+
+
+            string newExtension = RandomwareFileList.GetRandomFileExtension();
+
+            string newfilename = (file.Name).Replace(".txt", newExtension);
             string oldfileExtension = file.Extension;
-            string newfilefullname = (file.FullName).Replace(".txt", ".locky");
+            string newfilefullname = (file.FullName).Replace(".txt", newExtension);
 
             try
             {
@@ -104,37 +133,14 @@ public void LockTXTFile(FileInfo file)
             }
         }
 
-        public void LockTXTFiles(string path)
-        {
-            DirectoryInfo d = new DirectoryInfo(path);
-            FileInfo[] Files = d.GetFiles("*.txt"); //Getting Txt files
-            
-            foreach (FileInfo file in Files)
-            {
-                //Console.WriteLine(file.Name);
-                string oldfilename = file.Name;
-                string newfilename = (file.Name).Replace(".txt", ".locky");
-                string oldfileExtension = file.Extension;
-                string newfilefullname = (file.FullName).Replace(".txt", ".locky");
-
-                try
-                {
-                    System.IO.File.Move(file.Name, newfilename);
-                }
-                catch
-                {
-                    //can't touch this
-                }
-                
-
-            }
-        }
 
-        public void UnlockLockyFile(FileInfo file)
+        public void UnlockRansomwareFile(FileInfo file)
         {
             //Console.WriteLine(file.Name);
-            string newfilename = (file.Name).Replace(".locky", ".txt");
-            string newfilefullname = (file.FullName).Replace(".locky", ".txt");
+              
+          
+            string newfilename = (file.Name).Replace(file.Extension, ".txt");
+            // string newfilefullname = (file.FullName).Replace(".locky", ".txt");
             try
             {
                 System.IO.File.Move(file.Name, newfilename);
@@ -145,27 +151,6 @@ public void UnlockLockyFile(FileInfo file)
             }
         }
 
-        public void UnlockLockyFiles(string path)
-        {
-            DirectoryInfo d = new DirectoryInfo(path);
-            FileInfo[] Files = d.GetFiles("*.locky"); //Getting locky files
-            
-            foreach (FileInfo file in Files)
-            {
-                //Console.WriteLine(file.Name);
-                string newfilename = (file.Name).Replace(".locky", ".txt");
-                string newfilefullname = (file.FullName).Replace(".locky", ".txt");
-                try
-                {
-                    System.IO.File.Move(file.Name, newfilename);
-                }
-                catch
-                {
-                    //can't touch this
-                }
-
-            }
-        }
 
     }
 }
diff --git a/CashCat/MainWindow.xaml b/CashCat/MainWindow.xaml
index 57a4dfa..5f3a2cc 100644
--- a/CashCat/MainWindow.xaml
+++ b/CashCat/MainWindow.xaml
@@ -6,7 +6,7 @@
         xmlns:local="clr-namespace:CashCat"
         mc:Ignorable="d"
         Title="CryptoLocker Simulator" Height="575" Width="820" ResizeMode="CanMinimize" WindowStartupLocation="CenterScreen" ContentRendered="Window_ContentRendered">
-    <Grid Name="maingrid" Margin="0,0,-7,-3" Background="Red" OverridesDefaultStyle="True">
+    <Grid Name="maingrid" Margin="0,0,-7,-3" Background="#7E0F0D" OverridesDefaultStyle="True">
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="47*"/>
             <ColumnDefinition Width="256*"/>
@@ -18,28 +18,41 @@
         </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="132" VerticalAlignment="Top" Width="151" Source="font-awesome_4-7-0_lock_100_0_ffffff_none.png" Margin="0,71,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="0,26,0,0" Grid.Column="1" RenderTransformOrigin="0.5,0.5">
             <Image.RenderTransform>
                 <RotateTransform/>
             </Image.RenderTransform>
         </Image>
-        <Label Name="lblLockingFile" Content="" HorizontalContentAlignment="Center" HorizontalAlignment="Left" Margin="19,222,0,0" VerticalAlignment="Top" FontSize="12" Foreground="White" FontWeight="Normal" Height="36" Width="188" Grid.ColumnSpan="2"/>
+        <Label Name="lblLockingFile" Content="" HorizontalContentAlignment="Center" HorizontalAlignment="Left" Margin="19,189,0,0" VerticalAlignment="Top" FontSize="12" Foreground="White" FontWeight="Normal" Height="36" Width="188" Grid.ColumnSpan="2"/>
 
 
         <Rectangle Name ="rectInstructionsBackground" Fill="Black" HorizontalAlignment="Left" Height="442" Margin="195,71,0,0" Stroke="Black" VerticalAlignment="Top" Width="548" Opacity="0.5" Grid.Column="1" Grid.ColumnSpan="2"/>
-        <Label Name="lblMainLabel" Content="CASHCAT HAS ENCRYPTED YOUR FILES" HorizontalAlignment="Left" Margin="0,10,0,0" VerticalAlignment="Top" FontSize="33" Foreground="White" FontWeight="Bold" Grid.Column="1" Grid.ColumnSpan="2"/>
+        <Label Name="lblMainLabel" Content="Ooops, your files have been encrypted!" HorizontalAlignment="Left" Margin="195,10,0,0" VerticalAlignment="Top" FontSize="24" Foreground="White" FontWeight="Bold" Grid.Column="1" Grid.ColumnSpan="2"/>
         <TextBox Name="txtbox_Bitcoingaddess" HorizontalAlignment="Left" Height="42" Margin="216,399,0,0" TextWrapping="Wrap" Text="Unlock Code Here" VerticalAlignment="Top" Width="511" FontSize="20" RenderTransformOrigin="0.5,0.5" GotFocus="txtbox_Bitcoingaddess_GotFocus" Grid.Column="1" Grid.ColumnSpan="2" MaxLines="1"/>
 
-        <TextBox Name="txtbox_Instructions" HorizontalAlignment="Left" Height="280" Margin="216,96,0,0" TextWrapping="Wrap" Text="Your important files are now encrypted! &#xD;&#xA;&#xD;&#xA;The lock was produced using a unique public RSA-4096 generated for this computer. To decrypt files you need to obtain the private key. The Single copy of the private key which allow you to decrypt the files is on a secret server on the internet dark web. The server will destroy the key after a time specified in this window.&#xD;&#xA;&#xD;&#xA;To obtain the private key for this computer, you need dot pay 300 USD / 300 EUR similar amount in other currency. " VerticalAlignment="Top" Width="511" FontSize="20" RenderTransformOrigin="0.207,0.738" GotFocus="txtbox_Bitcoingaddess_GotFocus" Grid.Column="1" Grid.ColumnSpan="2"/>
+        <TextBox Name="txtbox_Instructions" HorizontalAlignment="Left" Height="280" Margin="216,96,0,0" TextWrapping="Wrap" Text="Your important files are now encrypted! &#xD;&#xA;&#xD;&#xA;To decrypt files you need to obtain the private key. The Single copy of the private key which allow you to decrypt the files is on a secret server on the internet dark web. The server will destroy the key after a time specified in this window.&#xD;&#xA;&#xD;&#xA;To obtain the private key for this computer, you need dot pay 300 USD / 300 EUR similar amount in other currency. " VerticalAlignment="Top" Width="511" FontSize="20" RenderTransformOrigin="0.207,0.738" GotFocus="txtbox_Bitcoingaddess_GotFocus" Grid.Column="1" Grid.ColumnSpan="2"/>
         <Button Name ="btn_send" Content="Send" HorizontalAlignment="Left" Margin="216,446,0,0" VerticalAlignment="Top" Width="511" Height="48" FontSize="18" Click="Button_Click" Grid.Column="1" Grid.ColumnSpan="2"/>
-        <RichTextBox  HorizontalAlignment="Left" Height="25" VerticalAlignment="Top" Width="116" Background="Transparent" MouseDown="RichTextBox_MouseDown" IsTabStop="False" BorderBrush="#00ABADB3" IsReadOnly="True" Cursor="Hand" SelectionBrush="#000078D7" BorderThickness="0" Grid.Column="1" Margin="0,484,0,0">
+        <RichTextBox  HorizontalAlignment="Left" Height="25" VerticalAlignment="Top" Width="116" Background="Transparent" MouseDown="RichTextBox_MouseDown" IsTabStop="False" BorderBrush="#00ABADB3" IsReadOnly="True" Cursor="Hand" SelectionBrush="#000078D7" BorderThickness="0" Margin="19,484,0,0" Grid.ColumnSpan="2">
             <FlowDocument>
                 <Paragraph>
-                    <Run Text="Contact Us" Foreground="White" FontWeight="Bold" FontSize="20" TextDecorations="Underline"/>
+                    <Run Text="Contact Us" Foreground="White" FontWeight="Bold" FontSize="20" TextDecorations="Underline" MouseDown="Run_MouseDown"/>
                 </Paragraph>
             </FlowDocument>
         </RichTextBox>
 
 
+        <Rectangle Name="rect_pricetime" HorizontalAlignment="Left" Height="100" Margin="17,189,0,0" Stroke="White" VerticalAlignment="Top" Width="200" Grid.ColumnSpan="2"/>
+        <TextBlock Name="txtblk_paymentRaiseHeader" HorizontalAlignment="Center" Margin="17,190,86,0" TextAlignment="Center" TextWrapping="Wrap" Text="Payment Price increases on" VerticalAlignment="Top" Foreground="#FFFFFA00" FontWeight="Bold" Width="200" Grid.Column="0" Grid.ColumnSpan="2" FontSize="14"/>
+        <TextBlock Name="txtblk_paymentRaiseTime" HorizontalAlignment="Center" Margin="19,209,84,0" TextAlignment="Center" TextWrapping="Wrap" Text="TimeLostStamp" VerticalAlignment="Top" Foreground="#FFFFFF" Width="200" Grid.Column="0" Grid.ColumnSpan="2"/>
+        <TextBlock Name="txtblk_paymentRaiseLeftLabel" HorizontalAlignment="Center" Margin="19,246,84,0" TextAlignment="Center" TextWrapping="Wrap" Text="Time Left" VerticalAlignment="Top" Foreground="#FFFFFF" Width="200" Grid.Column="0" Grid.ColumnSpan="2" FontWeight="Bold"/>
+        <TextBlock Name="txtblk_paymentRaiseCountDown" HorizontalAlignment="Center" Margin="19,267,84,0" TextAlignment="Center" TextWrapping="Wrap" Text="05:20:04:50" VerticalAlignment="Top" Foreground="#FFFFFF" Width="200"  Grid.Column="0" Grid.ColumnSpan="2" FontFamily="Consolas" Height="22" FontSize="18"/>
+
+        <Rectangle Name="rect_losttime" HorizontalAlignment="Left" Height="100" Margin="17,346,0,0" Stroke="White" VerticalAlignment="Top" Width="200" Grid.ColumnSpan="2"/>
+        <TextBlock Name="txtblk_fileLostHeader" HorizontalAlignment="Center" Margin="16,349,87,0" TextAlignment="Center" TextWrapping="Wrap" Text="Your files will be lost on" VerticalAlignment="Top" Foreground="#FFFFFA00" FontWeight="Bold" Width="200" Grid.Column="0" Grid.ColumnSpan="2" FontSize="14"/>
+        <TextBlock Name="txtblk_fileLostTime" HorizontalAlignment="Center" Margin="17,370,86,0" TextAlignment="Center" TextWrapping="Wrap" Text="TimeLostStamp" VerticalAlignment="Top" Foreground="#FFFFFF" Width="200" Grid.Column="0" Grid.ColumnSpan="2"/>
+        <TextBlock Name="txtblk_fileLostLeftLabel" HorizontalAlignment="Center" Margin="19,398,84,0" TextAlignment="Center" TextWrapping="Wrap" Text="Time Left" VerticalAlignment="Top" Foreground="#FFFFFF" Width="200" Grid.Column="0" Grid.ColumnSpan="2" FontWeight="Bold"/>
+        <TextBlock Name="txtblk_fileLostCountDown" HorizontalAlignment="Center" Margin="19,419,84,0" TextAlignment="Center" TextWrapping="Wrap" Text="05:20:04:50" VerticalAlignment="Top" Foreground="#FFFFFF" Width="200"  Grid.Column="0" Grid.ColumnSpan="2" FontFamily="Consolas" Height="22" FontSize="18"/>
+
+
     </Grid>
 </Window>
diff --git a/CashCat/MainWindow.xaml.cs b/CashCat/MainWindow.xaml.cs
index 41b4f33..f2039a8 100644
--- a/CashCat/MainWindow.xaml.cs
+++ b/CashCat/MainWindow.xaml.cs
@@ -14,9 +14,9 @@
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 using System.Net.Http;
-using RestSharp;
 using System.Threading;
 using System.Windows.Threading;
+using System.Diagnostics;
 
 namespace CashCat
 {
@@ -30,23 +30,36 @@ public partial class MainWindow : Window
         private FileSystemOperation fileOperations;
         private static readonly HttpClient client = new HttpClient();
         public FileInfo[] filesToEncrypt;
-        public FileInfo[] filesToDecrypt;
+        public List<FileInfo> filesToDecrypt;
         public string currentPath;
 
         private bool encryptionInProgress = false;
         private string inProgressMessage = "Your important files are being encrypted!" + System.Environment.NewLine + System.Environment.NewLine + "Your files are being locked using a unique public RSA-4096 generated for this computer. Once the encryption operations are completed you will be unable to access your files without obtaining a special key from our internet dark web cyber server." + System.Environment.NewLine + System.Environment.NewLine + "Be prepared to pay the Ransom!";
-        private string completedMessage = "Your important files are now encrypted!" + System.Environment.NewLine + System.Environment.NewLine + "The lock was produced using a unique public RSA-4096 generated for this computer. To decrypt files you need to obtain the private key. The Single copy of the private key which allow you to decrypt the files is on a secret server on the internet dark web. The server will destroy the key after a time specified in this window." + System.Environment.NewLine + System.Environment.NewLine + "To obtain the private key for this computer, you need dot pay 300 USD / 300 EUR similar amount in other currency.";
+        private string completedMessage = "Your important files are now encrypted!" + System.Environment.NewLine + System.Environment.NewLine + "To decrypt files you need to obtain the private key. The Single copy of the private key which allow you to decrypt the files is on a secret server on the internet dark web. The server will destroy the key after a time specified in this window." + System.Environment.NewLine + System.Environment.NewLine + "To obtain the private key for this computer, you need dot pay 300 USD / 300 EUR similar amount in other currency.";
         private string inProgressDecryptingMessage = "Your important files are being decrypted!" + System.Environment.NewLine + System.Environment.NewLine + "Congratulations! Your files are being unlocked using the unique public RSA-4096 generated for this computer.";
         private string decryptedMessage = "Your important files are now decrypted!" + System.Environment.NewLine + System.Environment.NewLine + "Thank You for being a great customer.";
 
         private ImageSource LockIconSource = new BitmapImage(new Uri(@"font-awesome_4-7-0_lock_100_0_ffffff_none.png", UriKind.Relative));
         private ImageSource UnLockIconSource = new BitmapImage(new Uri(@"font-awesome_4-7-0_unlock_100_0_ffffff_none.png", UriKind.Relative));
 
+
+        public DateTime lockTime = DateTime.Now.AddDays(5);
+        public DateTime priceTime = DateTime.Now.AddDays(1);
+
+
+
         public MainWindow()
         {
-            
+
 
             InitializeComponent();
+
+            System.Windows.Threading.DispatcherTimer CountDownTimer = new System.Windows.Threading.DispatcherTimer();
+            CountDownTimer.Tick += new EventHandler(dispatcherTimer_Tick);
+            CountDownTimer.Interval = new TimeSpan(0, 0, 1);
+            CountDownTimer.Start();
+
+
             fileOperations = new FileSystemOperation();
 
             fileOperations.WriteLog("CashCat Started!");
@@ -55,7 +68,7 @@ public MainWindow()
             //Load Config JSON
             currentPath = AppDomain.CurrentDomain.BaseDirectory;
             ConfigurationFile CurrentConfig = new ConfigurationFile();
-            CurrentConfig = CurrentConfig.ConfigurationFileSetup(currentPath);
+            //CurrentConfig = CurrentConfig.ConfigurationFileSetup(currentPath);
 
             if (CurrentConfig != null)
             {
@@ -70,12 +83,12 @@ public MainWindow()
                         //Trigger Webhook
                         string webHookUri = CurrentConfig.webHookURI;
 
-                        var client = new RestClient(webHookUri);
+                        //  var client = new RestClient(webHookUri);
 
-                        var request = new RestRequest();
+                        // var request = new RestRequest();
 
                         // execute the request
-                        IRestResponse response = client.Execute(request);
+                        // IRestResponse response = client.Execute(request);
                     }
                     catch
                     {
@@ -103,15 +116,52 @@ public MainWindow()
                 fileOperations.WriteLog("CashCat DID NOT FIND a Config - using default settings!");
             }
 
+
+
+            //Time SEtup
+
+
+            //DateTime lockTime = DateTime.Now.AddDays(5);
+            txtblk_fileLostTime.Text = lockTime.ToString();
+            txtblk_paymentRaiseTime.Text = priceTime.ToString();
+
+            //DateTime.Now.ToString("dd HH:mm:ss")
+
+
+        }
+
+        private void dispatcherTimer_Tick(object sender, EventArgs e)
+        {
+
+
+            Dispatcher.Invoke(new Action(() =>
+            {
+                TimeSpan timeLeft = (lockTime - DateTime.Now);
+                string timeLeftDisplay = String.Format("{0}h:{1:D2}m:{2:D2}s", (int)timeLeft.TotalHours, timeLeft.Minutes, timeLeft.Seconds);
+                txtblk_fileLostCountDown.Text = timeLeftDisplay;
+
+
+
+                timeLeft = (priceTime - DateTime.Now);
+                timeLeftDisplay = String.Format("{0}h:{1:D2}m:{2:D2}s", (int)timeLeft.TotalHours, timeLeft.Minutes, timeLeft.Seconds);
+                txtblk_paymentRaiseCountDown.Text = timeLeftDisplay;
+
+
+            }), DispatcherPriority.Normal);
+
+            //throw new NotImplementedException();
         }
 
         private void Window_ContentRendered(object sender, EventArgs e)
         {
+
+
             fileOperations.WriteLog("Starting File Rename Operations!");
             //lock it Up!
 
             //TODO Clean up
-            Dispatcher.Invoke(new Action(() => {
+            Dispatcher.Invoke(new Action(() =>
+            {
                 SetIconRotation(LockerIcon, 0);
                 lblLockingFile.Content = "Scanning for Files";
                 txtbox_Instructions.Text = inProgressMessage;
@@ -132,7 +182,8 @@ private void Window_ContentRendered(object sender, EventArgs e)
                     FileInfo fileToEncrypt = file;
                     fileOperations.WriteLog("Encrypting: " + file.Name.ToString() + "!");
 
-                    Dispatcher.Invoke(new Action(() => {
+                    Dispatcher.Invoke(new Action(() =>
+                    {
                         RotateIcon(LockerIcon, 5);
                         lblLockingFile.Content = ("Encrypting: " + file.Name);
                     }), DispatcherPriority.ContextIdle);
@@ -145,7 +196,8 @@ private void Window_ContentRendered(object sender, EventArgs e)
             encryptionInProgress = false;
             fileOperations.WriteLog("File Rename Operations COMPLETED!");
 
-            Dispatcher.Invoke(new Action(() => {
+            Dispatcher.Invoke(new Action(() =>
+            {
                 SetIconRotation(LockerIcon, 0);
                 lblLockingFile.Content = "";
                 txtbox_Instructions.Text = completedMessage;
@@ -156,10 +208,10 @@ private void Window_ContentRendered(object sender, EventArgs e)
             }), DispatcherPriority.ContextIdle);
         }
 
-        
+
 
         //TODO - Spin on Timer Tick.
-        private void RotateIcon (Image image, int angle)
+        private void RotateIcon(Image image, int angle)
         {
             var transform = image.RenderTransform as RotateTransform;
             transform.Angle += angle;
@@ -180,18 +232,17 @@ 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")
             {
-                fileOperations.WriteLog("Starting Unlock Rename Operations!");              
+                fileOperations.WriteLog("Starting Unlock Rename Operations!");
                 MessageBox.Show("Unlocked! Thanks! Your files will now be decrytped", "You did it correct", MessageBoxButton.OK);
 
-                filesToDecrypt = fileOperations.GetLockyFileCount(currentPath);
-                fileOperations.WriteLog("Found: " + filesToDecrypt.Count() + " to DeCrypt!");            
-
-
+                filesToDecrypt = fileOperations.GetRansomedFileCount(currentPath);
+                //fileOperations.WriteLog("Found: " + filesToDecrypt.Count() + " to DeCrypt!");            
 
                 if (filesToDecrypt.Count() != 0)
                 {
 
-                    Dispatcher.Invoke(new Action(() => {
+                    Dispatcher.Invoke(new Action(() =>
+                    {
                         SetIconRotation(LockerIcon, 0);
                         rectInstructionsBackground.Height = 335;
                         Height = 455;
@@ -201,26 +252,27 @@ private void Button_Click(object sender, RoutedEventArgs e)
                     }), DispatcherPriority.ContextIdle);
 
 
-                   
                     encryptionInProgress = true;
                     foreach (FileInfo file in filesToDecrypt)
                     {
                         FileInfo fileToDEcrypt = file;
                         fileOperations.WriteLog("Decrypting: " + file.Name.ToString() + "!");
 
-                        Dispatcher.Invoke(new Action(() => {
+                        Dispatcher.Invoke(new Action(() =>
+                        {
                             LockerIcon.Source = UnLockIconSource;
                             RotateIcon(LockerIcon, -5);
                             lblLockingFile.Content = ("Decrypting: " + file.Name);
-                            
+
                         }), DispatcherPriority.ContextIdle);
 
-                        fileOperations.UnlockLockyFile(fileToDEcrypt);
+                        fileOperations.UnlockRansomwareFile(fileToDEcrypt);
 
                     }
                 }
 
-                Dispatcher.Invoke(new Action(() => {
+                Dispatcher.Invoke(new Action(() =>
+                {
                     SetIconRotation(LockerIcon, 0);
                     lblLockingFile.Content = "";
                     txtbox_Instructions.Text = decryptedMessage;
@@ -230,7 +282,23 @@ private void Button_Click(object sender, RoutedEventArgs e)
                     Height = 455;
                 }), DispatcherPriority.ContextIdle);
 
-                fileOperations.WriteLog("Unlock Rename Operations Completed!");            
+                fileOperations.WriteLog("Unlock Rename Operations Completed!");
+
+
+                rect_losttime.Visibility = Visibility.Hidden;
+                rect_pricetime.Visibility = Visibility.Hidden;
+
+                txtblk_paymentRaiseCountDown.Visibility = Visibility.Hidden;
+                txtblk_paymentRaiseHeader.Visibility = Visibility.Hidden;
+                txtblk_paymentRaiseTime.Visibility = Visibility.Hidden;
+                txtblk_paymentRaiseLeftLabel.Visibility = Visibility.Hidden;
+
+                txtblk_fileLostCountDown.Visibility = Visibility.Hidden;
+                txtblk_fileLostHeader.Visibility = Visibility.Hidden;
+                txtblk_fileLostLeftLabel.Visibility = Visibility.Hidden;
+                txtblk_fileLostTime.Visibility = Visibility.Hidden;
+
+
             }
             else
             {
@@ -255,6 +323,9 @@ private void RichTextBox_MouseDown(object sender, MouseButtonEventArgs e)
             System.Diagnostics.Process.Start("https://github.com/leeberg/CashCatRansomwareSimulator");
         }
 
-        
+        private void Run_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            Process.Start("https://github.com/leeberg/CashCatRansomwareSimulator");
+        }
     }
 }
diff --git a/CashCat/RansomFiles.cs b/CashCat/RansomFiles.cs
new file mode 100644
index 0000000..927b96e
--- /dev/null
+++ b/CashCat/RansomFiles.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+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" };
+
+        private Random rand = new Random();
+
+        public string GetRandomFileExtension()
+        {
+            int index = rand.Next(fileExtensions.Length);
+            return fileExtensions[index];
+        }
+
+
+    }
+}
diff --git a/CashCat/packages.config b/CashCat/packages.config
deleted file mode 100644
index c556b4d..0000000
--- a/CashCat/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net461" />
-  <package id="RestSharp" version="106.11.4" targetFramework="net472" />
-</packages>
\ No newline at end of file