diff --git a/.idea/.idea.CyberBits/.idea/avalonia.xml b/.idea/.idea.CyberBits/.idea/avalonia.xml
index 940bd08..f41a0a7 100644
--- a/.idea/.idea.CyberBits/.idea/avalonia.xml
+++ b/.idea/.idea.CyberBits/.idea/avalonia.xml
@@ -3,6 +3,7 @@
   <component name="AvaloniaProject">
     <option name="projectPerEditor">
       <map>
+        <entry key="CyberBits/App.axaml" value="CyberBits/CyberBits.csproj" />
         <entry key="CyberBits/Views/MainWindow.axaml" value="CyberBits/CyberBits.csproj" />
       </map>
     </option>
diff --git a/CyberBits/CyberBits.csproj b/CyberBits/CyberBits.csproj
index 1ed5516..ce53766 100644
--- a/CyberBits/CyberBits.csproj
+++ b/CyberBits/CyberBits.csproj
@@ -4,12 +4,13 @@
         <TargetFramework>net10.0</TargetFramework>
         <Nullable>enable</Nullable>
         <RollForward>LatestMajor</RollForward>
+        <ImplicitUsings>true</ImplicitUsings>
         <ApplicationManifest>app.manifest</ApplicationManifest>
         <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
     </PropertyGroup>
 
     <ItemGroup>
-        <None Include="Data\universal.json">
+        <None Include="Data\common.json">
           <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
         <None Include="Data\cock.json">
diff --git a/CyberBits/Data/universal.json b/CyberBits/Data/common.json
similarity index 100%
rename from CyberBits/Data/universal.json
rename to CyberBits/Data/common.json
diff --git a/CyberBits/DataFiles.cs b/CyberBits/DataFiles.cs
index 5bb1277..d1a8cb8 100644
--- a/CyberBits/DataFiles.cs
+++ b/CyberBits/DataFiles.cs
@@ -4,5 +4,5 @@ public struct DataFiles
 {
     public const string COCK_JSON = "/Data/cock.json";
     public const string PUSSY_JSON = "Data/pussy.json";
-    public const string UNIVERSAL_JSON = "Data/universal.json";
+    public const string COMMON_JSON = "Data/common.json";
 }
diff --git a/CyberBits/Genitals.cs b/CyberBits/Genitals.cs
index 5a91bb0..6f7d40a 100644
--- a/CyberBits/Genitals.cs
+++ b/CyberBits/Genitals.cs
@@ -1,5 +1,3 @@
-using CommunityToolkit.Mvvm.ComponentModel;
-
 namespace CyberBits;
 
 public enum Genitals
diff --git a/CyberBits/Program.cs b/CyberBits/Program.cs
index 0cdeb4a..e0c5d5d 100644
--- a/CyberBits/Program.cs
+++ b/CyberBits/Program.cs
@@ -1,5 +1,4 @@
 using Avalonia;
-using System;
 
 namespace CyberBits;
 
diff --git a/CyberBits/ViewLocator.cs b/CyberBits/ViewLocator.cs
index b11127d..f18bac4 100644
--- a/CyberBits/ViewLocator.cs
+++ b/CyberBits/ViewLocator.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Diagnostics.CodeAnalysis;
 using Avalonia.Controls;
 using Avalonia.Controls.Templates;
diff --git a/CyberBits/ViewModels/ViewModelBase.cs b/CyberBits/ViewModels/ViewModelBase.cs
index 732a5ea..5eebc88 100644
--- a/CyberBits/ViewModels/ViewModelBase.cs
+++ b/CyberBits/ViewModels/ViewModelBase.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.ObjectModel;
+using System.Collections.ObjectModel;
 using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace CyberBits.ViewModels;
diff --git a/CyberBits/Views/MainWindow.axaml b/CyberBits/Views/MainWindow.axaml
index d03aad9..ff1eee9 100644
--- a/CyberBits/Views/MainWindow.axaml
+++ b/CyberBits/Views/MainWindow.axaml
@@ -3,8 +3,8 @@
         xmlns:vm="using:CyberBits.ViewModels"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        mc:Ignorable="d" d:DesignWidth="700" d:DesignHeight="520"
-        Width="700" Height="520"  CanResize="False"
+        mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="530"
+        Width="800" Height="530"  CanResize="False"
         ExtendClientAreaToDecorationsHint="True"
         x:Class="CyberBits.Views.MainWindow"
         x:DataType="vm:MainWindowViewModel"
@@ -29,7 +29,7 @@
             <Image x:Name="BitsImage" Grid.Column="0" Source="avares://CyberBits/Assets/cock.jpg" />
             <GridSplitter Grid.Column="1" ResizeDirection="Columns"/>
             <StackPanel Grid.Column="1">
-                <Grid ColumnDefinitions="160,160">
+                <Grid ColumnDefinitions="200,180">
                     <GridSplitter ResizeDirection="Columns"/>
                    <StackPanel Grid.Column="0" >
                        <ComboBox  ItemsSource="{Binding GenitalOptions}"
@@ -65,12 +65,6 @@
                    </StackPanel>
                     <GridSplitter Grid.Column="1" ResizeDirection="Columns"/>
                    <StackPanel Grid.Column="1">
-                       <Button Background="Transparent"
-                               HorizontalAlignment="Right"
-                               Width="100"
-                               Height="40">
-                            <Image Source="avares://CyberBits/Assets/game_die.png" />
-                       </Button>
                        <TextBlock Text="Aesthetics" HorizontalAlignment="Center" />
                        <ListBox ItemsSource="{Binding AestheticsList}"
                                  SelectedItem="{Binding SelectedAesthetics}"
diff --git a/CyberBits/Views/MainWindow.axaml.cs b/CyberBits/Views/MainWindow.axaml.cs
index 50032c7..525f0fc 100644
--- a/CyberBits/Views/MainWindow.axaml.cs
+++ b/CyberBits/Views/MainWindow.axaml.cs
@@ -1,5 +1,3 @@
-using System;
-using System.IO;
 using System.Reflection;
 using System.Text.Json;
 using Avalonia.Controls;
@@ -8,7 +6,8 @@ namespace CyberBits.Views;
 
 public partial class MainWindow : Window
 {
-    string? AppPath => Path.GetDirectoryName(Assembly.GetAssembly(typeof(MainWindow))?.Location);
+    private string? AppPath => Path.GetDirectoryName(Assembly.GetAssembly(typeof(MainWindow))?.Location);
+
 
     public MainWindow()
     {
@@ -16,13 +15,14 @@ public partial class MainWindow : Window
 
         try
         {
-            var univieralFile = File.ReadAllText($"{AppPath}//{DataFiles.UNIVERSAL_JSON}");
-            var univieralData = JsonSerializer.Deserialize<UniversalModel>(univieralFile);
+            var commonFile = File.ReadAllText($"{AppPath}//{DataFiles.COMMON_JSON}");
+            var commonData = JsonSerializer.Deserialize<UniversalModel>(commonFile);
+
+            PubesItems.ItemsSource = commonData?.Pubes;
+            CyberwareItems.ItemsSource = commonData?.Cyberware;
+            AestheticsItems.ItemsSource = commonData?.Aesthetic;
+            ButtOptions.ItemsSource = commonData?.Butt;
 
-            PubesItems.ItemsSource = univieralData?.Pubes;
-            CyberwareItems.ItemsSource = univieralData?.Cyberware;
-            AestheticsItems.ItemsSource = univieralData?.Aesthetic;
-            ButtOptions.ItemsSource = univieralData?.Butt;
         }
         catch (Exception e)
         {
@@ -38,7 +38,7 @@ public partial class MainWindow : Window
 
     }
 
-    void GenitalSwap(string image, string data)
+    private void GenitalSwap(string image, string data)
     {
 
         try