diff --git a/src/Settings/Main.Designer.cs b/src/Settings/Main.Designer.cs
index 4f6bc0b..4c7f878 100644
--- a/src/Settings/Main.Designer.cs
+++ b/src/Settings/Main.Designer.cs
@@ -1,4 +1,4 @@
-namespace Settings
+namespace Settings
 {
     partial class Main
     {
@@ -28,168 +28,169 @@ protected override void Dispose(bool disposing)
         /// </summary>
         private void InitializeComponent()
         {
-			this.titleLabel = new System.Windows.Forms.Label();
-			this.speedTrackBar = new System.Windows.Forms.TrackBar();
-			this.speedLabel = new System.Windows.Forms.Label();
-			this.speedNumeric = new System.Windows.Forms.NumericUpDown();
-			this.activeCheckBox = new System.Windows.Forms.CheckBox();
-			this.disableScCheckBox = new System.Windows.Forms.CheckBox();
-			this.loadButton = new System.Windows.Forms.Button();
-			this.saveButton = new System.Windows.Forms.Button();
-			this.rotStyleBox = new System.Windows.Forms.ComboBox();
-			this.rStyleLabel = new System.Windows.Forms.Label();
-			((System.ComponentModel.ISupportInitialize)(this.speedTrackBar)).BeginInit();
-			((System.ComponentModel.ISupportInitialize)(this.speedNumeric)).BeginInit();
-			this.SuspendLayout();
-			// 
-			// titleLabel
-			// 
-			this.titleLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 36F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-			this.titleLabel.Location = new System.Drawing.Point(12, 9);
-			this.titleLabel.Name = "titleLabel";
-			this.titleLabel.Size = new System.Drawing.Size(329, 55);
-			this.titleLabel.TabIndex = 0;
-			this.titleLabel.Text = "SIC - Settings";
-			this.titleLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-			// 
-			// speedTrackBar
-			// 
-			this.speedTrackBar.AutoSize = false;
-			this.speedTrackBar.Location = new System.Drawing.Point(66, 130);
-			this.speedTrackBar.Maximum = 100;
-			this.speedTrackBar.Minimum = 1;
-			this.speedTrackBar.Name = "speedTrackBar";
-			this.speedTrackBar.Size = new System.Drawing.Size(193, 32);
-			this.speedTrackBar.TabIndex = 1;
-			this.speedTrackBar.TickFrequency = 10;
-			this.speedTrackBar.TickStyle = System.Windows.Forms.TickStyle.None;
-			this.speedTrackBar.Value = 75;
-			this.speedTrackBar.ValueChanged += new System.EventHandler(this.SpeedTrackBar_ValueChanged);
-			// 
-			// speedLabel
-			// 
-			this.speedLabel.AutoSize = true;
-			this.speedLabel.Location = new System.Drawing.Point(19, 130);
-			this.speedLabel.Name = "speedLabel";
-			this.speedLabel.Size = new System.Drawing.Size(41, 13);
-			this.speedLabel.TabIndex = 3;
-			this.speedLabel.Text = "Speed:";
-			this.speedLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-			// 
-			// speedNumeric
-			// 
-			this.speedNumeric.Increment = new decimal(new int[] {
+            this.titleLabel = new System.Windows.Forms.Label();
+            this.speedTrackBar = new System.Windows.Forms.TrackBar();
+            this.speedLabel = new System.Windows.Forms.Label();
+            this.speedNumeric = new System.Windows.Forms.NumericUpDown();
+            this.activeCheckBox = new System.Windows.Forms.CheckBox();
+            this.disableScCheckBox = new System.Windows.Forms.CheckBox();
+            this.loadButton = new System.Windows.Forms.Button();
+            this.saveButton = new System.Windows.Forms.Button();
+            this.rotStyleBox = new System.Windows.Forms.ComboBox();
+            this.rStyleLabel = new System.Windows.Forms.Label();
+            ((System.ComponentModel.ISupportInitialize)(this.speedTrackBar)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.speedNumeric)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // titleLabel
+            // 
+            this.titleLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 36F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.titleLabel.Location = new System.Drawing.Point(12, 9);
+            this.titleLabel.Name = "titleLabel";
+            this.titleLabel.Size = new System.Drawing.Size(329, 55);
+            this.titleLabel.TabIndex = 0;
+            this.titleLabel.Text = "SIC - Settings";
+            this.titleLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // speedTrackBar
+            // 
+            this.speedTrackBar.AutoSize = false;
+            this.speedTrackBar.Location = new System.Drawing.Point(66, 130);
+            this.speedTrackBar.Maximum = 100;
+            this.speedTrackBar.Minimum = 1;
+            this.speedTrackBar.Name = "speedTrackBar";
+            this.speedTrackBar.Size = new System.Drawing.Size(193, 32);
+            this.speedTrackBar.TabIndex = 1;
+            this.speedTrackBar.TickFrequency = 10;
+            this.speedTrackBar.TickStyle = System.Windows.Forms.TickStyle.None;
+            this.speedTrackBar.Value = 75;
+            this.speedTrackBar.ValueChanged += new System.EventHandler(this.SpeedTrackBar_ValueChanged);
+            // 
+            // speedLabel
+            // 
+            this.speedLabel.AutoSize = true;
+            this.speedLabel.Location = new System.Drawing.Point(19, 130);
+            this.speedLabel.Name = "speedLabel";
+            this.speedLabel.Size = new System.Drawing.Size(41, 13);
+            this.speedLabel.TabIndex = 3;
+            this.speedLabel.Text = "Speed:";
+            this.speedLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // speedNumeric
+            // 
+            this.speedNumeric.Increment = new decimal(new int[] {
             5,
             0,
             0,
             0});
-			this.speedNumeric.Location = new System.Drawing.Point(266, 130);
-			this.speedNumeric.Minimum = new decimal(new int[] {
+            this.speedNumeric.Location = new System.Drawing.Point(266, 130);
+            this.speedNumeric.Minimum = new decimal(new int[] {
             1,
             0,
             0,
             0});
-			this.speedNumeric.Name = "speedNumeric";
-			this.speedNumeric.Size = new System.Drawing.Size(57, 20);
-			this.speedNumeric.TabIndex = 4;
-			this.speedNumeric.Value = new decimal(new int[] {
+            this.speedNumeric.Name = "speedNumeric";
+            this.speedNumeric.Size = new System.Drawing.Size(57, 20);
+            this.speedNumeric.TabIndex = 4;
+            this.speedNumeric.Value = new decimal(new int[] {
             75,
             0,
             0,
             0});
-			this.speedNumeric.ValueChanged += new System.EventHandler(this.SpeedNumeric_ValueChanged);
-			// 
-			// activeCheckBox
-			// 
-			this.activeCheckBox.AutoSize = true;
-			this.activeCheckBox.Checked = true;
-			this.activeCheckBox.CheckState = System.Windows.Forms.CheckState.Checked;
-			this.activeCheckBox.Location = new System.Drawing.Point(22, 81);
-			this.activeCheckBox.Name = "activeCheckBox";
-			this.activeCheckBox.Size = new System.Drawing.Size(71, 17);
-			this.activeCheckBox.TabIndex = 6;
-			this.activeCheckBox.Text = "Activated";
-			this.activeCheckBox.UseVisualStyleBackColor = true;
-			this.activeCheckBox.CheckedChanged += new System.EventHandler(this.ActiveCheckBox_CheckedChanged);
-			// 
-			// disableScCheckBox
-			// 
-			this.disableScCheckBox.AutoSize = true;
-			this.disableScCheckBox.Location = new System.Drawing.Point(100, 80);
-			this.disableScCheckBox.Name = "disableScCheckBox";
-			this.disableScCheckBox.Size = new System.Drawing.Size(107, 17);
-			this.disableScCheckBox.TabIndex = 7;
-			this.disableScCheckBox.Text = "Disable shortcuts";
-			this.disableScCheckBox.UseVisualStyleBackColor = true;
-			this.disableScCheckBox.CheckedChanged += new System.EventHandler(this.DisableScCheckBox_CheckedChanged);
-			// 
-			// loadButton
-			// 
-			this.loadButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-			this.loadButton.Location = new System.Drawing.Point(185, 189);
-			this.loadButton.Name = "loadButton";
-			this.loadButton.Size = new System.Drawing.Size(75, 23);
-			this.loadButton.TabIndex = 8;
-			this.loadButton.Text = "Load";
-			this.loadButton.UseVisualStyleBackColor = true;
-			this.loadButton.Click += new System.EventHandler(this.LoadButton_Click);
-			// 
-			// saveButton
-			// 
-			this.saveButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-			this.saveButton.Location = new System.Drawing.Point(266, 189);
-			this.saveButton.Name = "saveButton";
-			this.saveButton.Size = new System.Drawing.Size(75, 23);
-			this.saveButton.TabIndex = 9;
-			this.saveButton.Text = "Save";
-			this.saveButton.UseVisualStyleBackColor = true;
-			this.saveButton.Click += new System.EventHandler(this.SaveButton_Click);
-			// 
-			// rotStyleBox
-			// 
-			this.rotStyleBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-			this.rotStyleBox.FormattingEnabled = true;
-			this.rotStyleBox.Items.AddRange(new object[] {
+            this.speedNumeric.ValueChanged += new System.EventHandler(this.SpeedNumeric_ValueChanged);
+            // 
+            // activeCheckBox
+            // 
+            this.activeCheckBox.AutoSize = true;
+            this.activeCheckBox.Checked = true;
+            this.activeCheckBox.CheckState = System.Windows.Forms.CheckState.Checked;
+            this.activeCheckBox.Location = new System.Drawing.Point(22, 81);
+            this.activeCheckBox.Name = "activeCheckBox";
+            this.activeCheckBox.Size = new System.Drawing.Size(71, 17);
+            this.activeCheckBox.TabIndex = 6;
+            this.activeCheckBox.Text = "Activated";
+            this.activeCheckBox.UseVisualStyleBackColor = true;
+            this.activeCheckBox.CheckedChanged += new System.EventHandler(this.ActiveCheckBox_CheckedChanged);
+            // 
+            // disableScCheckBox
+            // 
+            this.disableScCheckBox.AutoSize = true;
+            this.disableScCheckBox.Location = new System.Drawing.Point(100, 80);
+            this.disableScCheckBox.Name = "disableScCheckBox";
+            this.disableScCheckBox.Size = new System.Drawing.Size(101, 17);
+            this.disableScCheckBox.TabIndex = 7;
+            this.disableScCheckBox.Text = "Disable hotkeys";
+            this.disableScCheckBox.UseVisualStyleBackColor = true;
+            this.disableScCheckBox.CheckedChanged += new System.EventHandler(this.DisableScCheckBox_CheckedChanged);
+            // 
+            // loadButton
+            // 
+            this.loadButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.loadButton.Location = new System.Drawing.Point(185, 189);
+            this.loadButton.Name = "loadButton";
+            this.loadButton.Size = new System.Drawing.Size(75, 23);
+            this.loadButton.TabIndex = 8;
+            this.loadButton.Text = "Load";
+            this.loadButton.UseVisualStyleBackColor = true;
+            this.loadButton.Click += new System.EventHandler(this.LoadButton_Click);
+            // 
+            // saveButton
+            // 
+            this.saveButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.saveButton.Location = new System.Drawing.Point(266, 189);
+            this.saveButton.Name = "saveButton";
+            this.saveButton.Size = new System.Drawing.Size(75, 23);
+            this.saveButton.TabIndex = 9;
+            this.saveButton.Text = "Save";
+            this.saveButton.UseVisualStyleBackColor = true;
+            this.saveButton.Click += new System.EventHandler(this.SaveButton_Click);
+            // 
+            // rotStyleBox
+            // 
+            this.rotStyleBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.rotStyleBox.FormattingEnabled = true;
+            this.rotStyleBox.Items.AddRange(new object[] {
             "Linear",
-            "Smooth"});
-			this.rotStyleBox.Location = new System.Drawing.Point(100, 103);
-			this.rotStyleBox.Name = "rotStyleBox";
-			this.rotStyleBox.Size = new System.Drawing.Size(121, 21);
-			this.rotStyleBox.TabIndex = 10;
-			this.rotStyleBox.SelectedIndexChanged += new System.EventHandler(this.RotStyleBox_SelectedIndexChanged);
-			// 
-			// rStyleLabel
-			// 
-			this.rStyleLabel.AutoSize = true;
-			this.rStyleLabel.Location = new System.Drawing.Point(19, 106);
-			this.rStyleLabel.Name = "rStyleLabel";
-			this.rStyleLabel.Size = new System.Drawing.Size(74, 13);
-			this.rStyleLabel.TabIndex = 11;
-			this.rStyleLabel.Text = "Rotation style:";
-			// 
-			// Main
-			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(353, 224);
-			this.Controls.Add(this.rStyleLabel);
-			this.Controls.Add(this.rotStyleBox);
-			this.Controls.Add(this.saveButton);
-			this.Controls.Add(this.loadButton);
-			this.Controls.Add(this.disableScCheckBox);
-			this.Controls.Add(this.activeCheckBox);
-			this.Controls.Add(this.speedLabel);
-			this.Controls.Add(this.speedTrackBar);
-			this.Controls.Add(this.titleLabel);
-			this.Controls.Add(this.speedNumeric);
-			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
-			this.Name = "Main";
-			this.Text = "SIC - Settings";
-			this.Shown += new System.EventHandler(this.Main_Shown);
-			((System.ComponentModel.ISupportInitialize)(this.speedTrackBar)).EndInit();
-			((System.ComponentModel.ISupportInitialize)(this.speedNumeric)).EndInit();
-			this.ResumeLayout(false);
-			this.PerformLayout();
+            "EaseInOut",
+            "EaseOut"});
+            this.rotStyleBox.Location = new System.Drawing.Point(100, 103);
+            this.rotStyleBox.Name = "rotStyleBox";
+            this.rotStyleBox.Size = new System.Drawing.Size(121, 21);
+            this.rotStyleBox.TabIndex = 10;
+            this.rotStyleBox.SelectedIndexChanged += new System.EventHandler(this.RotStyleBox_SelectedIndexChanged);
+            // 
+            // rStyleLabel
+            // 
+            this.rStyleLabel.AutoSize = true;
+            this.rStyleLabel.Location = new System.Drawing.Point(19, 106);
+            this.rStyleLabel.Name = "rStyleLabel";
+            this.rStyleLabel.Size = new System.Drawing.Size(74, 13);
+            this.rStyleLabel.TabIndex = 11;
+            this.rStyleLabel.Text = "Rotation style:";
+            // 
+            // Main
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(353, 224);
+            this.Controls.Add(this.rStyleLabel);
+            this.Controls.Add(this.rotStyleBox);
+            this.Controls.Add(this.saveButton);
+            this.Controls.Add(this.loadButton);
+            this.Controls.Add(this.disableScCheckBox);
+            this.Controls.Add(this.activeCheckBox);
+            this.Controls.Add(this.speedLabel);
+            this.Controls.Add(this.speedTrackBar);
+            this.Controls.Add(this.titleLabel);
+            this.Controls.Add(this.speedNumeric);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
+            this.Name = "Main";
+            this.Text = "SIC - Settings";
+            this.Shown += new System.EventHandler(this.Main_Shown);
+            ((System.ComponentModel.ISupportInitialize)(this.speedTrackBar)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.speedNumeric)).EndInit();
+            this.ResumeLayout(false);
+            this.PerformLayout();
 
         }
 
diff --git a/src/Settings/Main.cs b/src/Settings/Main.cs
index 0e6fd63..b5b8832 100644
--- a/src/Settings/Main.cs
+++ b/src/Settings/Main.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
@@ -8,9 +8,9 @@
 using System.Threading.Tasks;
 using System.IO;
 using System.Windows.Forms;
+using System.Diagnostics;
 
 using Newtonsoft.Json;
-using System.Diagnostics;
 
 namespace Settings
 {
@@ -85,17 +85,14 @@ bool LoadSettings()
 				activeCheckBox.Checked = settings.active;
 				disableScCheckBox.Checked = settings.disable_shortcuts;
 
-				switch (settings.rotation_style)
-				{
-					case 0:
-						rotStyleBox.Text = "Linear";
-						break;
-					case 1:
-						rotStyleBox.Text = "Smooth";
-						break;
-				}
+                if (settings.rotation_style < 0 || settings.rotation_style > 2)
+                {
+                    settings.rotation_style = 1;
+                }
+
+                rotStyleBox.SelectedIndex = settings.rotation_style;
 
-				if (settings.speed > speedTrackBar.Maximum)
+                if (settings.speed > speedTrackBar.Maximum)
 				{
 					MessageBox.Show("Speed value is too high!", "Error!", MessageBoxButtons.OK, MessageBoxIcon.Error);
 					this.Close();
diff --git a/src/Settings/Main.resx b/src/Settings/Main.resx
index 1af7de1..44e9f97 100644
--- a/src/Settings/Main.resx
+++ b/src/Settings/Main.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -117,4 +117,4 @@
   <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
+</root>
diff --git a/src/Settings/Settings.csproj b/src/Settings/Settings.csproj
index b0f2af5..2f8927d 100644
--- a/src/Settings/Settings.csproj
+++ b/src/Settings/Settings.csproj
@@ -50,6 +50,24 @@
   <PropertyGroup>
     <SignManifests>false</SignManifests>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\x86\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.10.0.2\lib\net40\Newtonsoft.Json.dll</HintPath>
diff --git a/src/Smooth Interior Camera.sln b/src/Smooth Interior Camera.sln
index 1faf57c..9585743 100644
--- a/src/Smooth Interior Camera.sln	
+++ b/src/Smooth Interior Camera.sln	
@@ -9,45 +9,36 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Settings", "Settings\Settin
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		ATS Debug|Any CPU = ATS Debug|Any CPU
-		ATS Debug|x64 = ATS Debug|x64
-		ATS Release|Any CPU = ATS Release|Any CPU
-		ATS Release|x64 = ATS Release|x64
-		ETS 2 Debug|Any CPU = ETS 2 Debug|Any CPU
-		ETS 2 Debug|x64 = ETS 2 Debug|x64
-		ETS 2 Release|Any CPU = ETS 2 Release|Any CPU
-		ETS 2 Release|x64 = ETS 2 Release|x64
+		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{E9D259A8-AB47-4898-A8FF-B32CAC2C766C}.ATS Debug|Any CPU.ActiveCfg = ATS Debug|x64
-		{E9D259A8-AB47-4898-A8FF-B32CAC2C766C}.ATS Debug|x64.ActiveCfg = ATS Debug|x64
-		{E9D259A8-AB47-4898-A8FF-B32CAC2C766C}.ATS Debug|x64.Build.0 = ATS Debug|x64
-		{E9D259A8-AB47-4898-A8FF-B32CAC2C766C}.ATS Release|Any CPU.ActiveCfg = ATS Release|x64
-		{E9D259A8-AB47-4898-A8FF-B32CAC2C766C}.ATS Release|x64.ActiveCfg = ATS Release|x64
-		{E9D259A8-AB47-4898-A8FF-B32CAC2C766C}.ATS Release|x64.Build.0 = ATS Release|x64
-		{E9D259A8-AB47-4898-A8FF-B32CAC2C766C}.ETS 2 Debug|Any CPU.ActiveCfg = ETS 2 Debug|x64
-		{E9D259A8-AB47-4898-A8FF-B32CAC2C766C}.ETS 2 Debug|x64.ActiveCfg = ETS 2 Debug|x64
-		{E9D259A8-AB47-4898-A8FF-B32CAC2C766C}.ETS 2 Debug|x64.Build.0 = ETS 2 Debug|x64
-		{E9D259A8-AB47-4898-A8FF-B32CAC2C766C}.ETS 2 Release|Any CPU.ActiveCfg = ATS Debug|x64
-		{E9D259A8-AB47-4898-A8FF-B32CAC2C766C}.ETS 2 Release|Any CPU.Build.0 = ATS Debug|x64
-		{E9D259A8-AB47-4898-A8FF-B32CAC2C766C}.ETS 2 Release|x64.ActiveCfg = ETS 2 Release|x64
-		{E9D259A8-AB47-4898-A8FF-B32CAC2C766C}.ETS 2 Release|x64.Build.0 = ETS 2 Release|x64
-		{08D200DA-EBC3-4D45-B17F-7336B0C4CCB4}.ATS Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{08D200DA-EBC3-4D45-B17F-7336B0C4CCB4}.ATS Debug|Any CPU.Build.0 = Debug|Any CPU
-		{08D200DA-EBC3-4D45-B17F-7336B0C4CCB4}.ATS Debug|x64.ActiveCfg = Debug|Any CPU
-		{08D200DA-EBC3-4D45-B17F-7336B0C4CCB4}.ATS Debug|x64.Build.0 = Debug|Any CPU
-		{08D200DA-EBC3-4D45-B17F-7336B0C4CCB4}.ATS Release|Any CPU.ActiveCfg = Release|Any CPU
-		{08D200DA-EBC3-4D45-B17F-7336B0C4CCB4}.ATS Release|Any CPU.Build.0 = Release|Any CPU
-		{08D200DA-EBC3-4D45-B17F-7336B0C4CCB4}.ATS Release|x64.ActiveCfg = Debug|Any CPU
-		{08D200DA-EBC3-4D45-B17F-7336B0C4CCB4}.ATS Release|x64.Build.0 = Debug|Any CPU
-		{08D200DA-EBC3-4D45-B17F-7336B0C4CCB4}.ETS 2 Debug|Any CPU.ActiveCfg = Release|Any CPU
-		{08D200DA-EBC3-4D45-B17F-7336B0C4CCB4}.ETS 2 Debug|Any CPU.Build.0 = Release|Any CPU
-		{08D200DA-EBC3-4D45-B17F-7336B0C4CCB4}.ETS 2 Debug|x64.ActiveCfg = Release|Any CPU
-		{08D200DA-EBC3-4D45-B17F-7336B0C4CCB4}.ETS 2 Debug|x64.Build.0 = Release|Any CPU
-		{08D200DA-EBC3-4D45-B17F-7336B0C4CCB4}.ETS 2 Release|Any CPU.ActiveCfg = Release|Any CPU
-		{08D200DA-EBC3-4D45-B17F-7336B0C4CCB4}.ETS 2 Release|Any CPU.Build.0 = Release|Any CPU
-		{08D200DA-EBC3-4D45-B17F-7336B0C4CCB4}.ETS 2 Release|x64.ActiveCfg = Release|Any CPU
-		{08D200DA-EBC3-4D45-B17F-7336B0C4CCB4}.ETS 2 Release|x64.Build.0 = Release|Any CPU
+		{E9D259A8-AB47-4898-A8FF-B32CAC2C766C}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{E9D259A8-AB47-4898-A8FF-B32CAC2C766C}.Debug|x64.ActiveCfg = Debug|x64
+		{E9D259A8-AB47-4898-A8FF-B32CAC2C766C}.Debug|x64.Build.0 = Debug|x64
+		{E9D259A8-AB47-4898-A8FF-B32CAC2C766C}.Debug|x86.ActiveCfg = Debug|Win32
+		{E9D259A8-AB47-4898-A8FF-B32CAC2C766C}.Debug|x86.Build.0 = Debug|Win32
+		{E9D259A8-AB47-4898-A8FF-B32CAC2C766C}.Release|Any CPU.ActiveCfg = Release|Win32
+		{E9D259A8-AB47-4898-A8FF-B32CAC2C766C}.Release|x64.ActiveCfg = Release|x64
+		{E9D259A8-AB47-4898-A8FF-B32CAC2C766C}.Release|x64.Build.0 = Release|x64
+		{E9D259A8-AB47-4898-A8FF-B32CAC2C766C}.Release|x86.ActiveCfg = Release|Win32
+		{E9D259A8-AB47-4898-A8FF-B32CAC2C766C}.Release|x86.Build.0 = Release|Win32
+		{08D200DA-EBC3-4D45-B17F-7336B0C4CCB4}.Debug|Any CPU.ActiveCfg = Release|Any CPU
+		{08D200DA-EBC3-4D45-B17F-7336B0C4CCB4}.Debug|Any CPU.Build.0 = Release|Any CPU
+		{08D200DA-EBC3-4D45-B17F-7336B0C4CCB4}.Debug|x64.ActiveCfg = Release|Any CPU
+		{08D200DA-EBC3-4D45-B17F-7336B0C4CCB4}.Debug|x64.Build.0 = Release|Any CPU
+		{08D200DA-EBC3-4D45-B17F-7336B0C4CCB4}.Debug|x86.ActiveCfg = Debug|x86
+		{08D200DA-EBC3-4D45-B17F-7336B0C4CCB4}.Debug|x86.Build.0 = Debug|x86
+		{08D200DA-EBC3-4D45-B17F-7336B0C4CCB4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{08D200DA-EBC3-4D45-B17F-7336B0C4CCB4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{08D200DA-EBC3-4D45-B17F-7336B0C4CCB4}.Release|x64.ActiveCfg = Release|Any CPU
+		{08D200DA-EBC3-4D45-B17F-7336B0C4CCB4}.Release|x64.Build.0 = Release|Any CPU
+		{08D200DA-EBC3-4D45-B17F-7336B0C4CCB4}.Release|x86.ActiveCfg = Release|x86
+		{08D200DA-EBC3-4D45-B17F-7336B0C4CCB4}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/src/Smooth Interior Camera/AHEasing/easing.cpp b/src/Smooth Interior Camera/AHEasing/easing.cpp
new file mode 100644
index 0000000..f4ce7ef
--- /dev/null
+++ b/src/Smooth Interior Camera/AHEasing/easing.cpp	
@@ -0,0 +1,302 @@
+//
+//  easing.c
+//
+//  Copyright (c) 2011, Auerhaus Development, LLC
+//
+//  This program is free software. It comes without any warranty, to
+//  the extent permitted by applicable law. You can redistribute it
+//  and/or modify it under the terms of the Do What The Fuck You Want
+//  To Public License, Version 2, as published by Sam Hocevar. See
+//  http://sam.zoy.org/wtfpl/COPYING for more details.
+//
+#define _USE_MATH_DEFINES
+#include <cmath>
+#include "easing.h"
+
+// Modeled after the line y = x
+AHFloat LinearInterpolation(AHFloat p)
+{
+	return static_cast<AHFloat>(static_cast<AHFloat>(p));
+}
+
+// Modeled after the parabola y = x^2
+AHFloat QuadraticEaseIn(AHFloat p)
+{
+	return static_cast<AHFloat>(p * p);
+}
+
+// Modeled after the parabola y = -x^2 + 2x
+AHFloat QuadraticEaseOut(AHFloat p)
+{
+	return static_cast<AHFloat>(-(p * (p - 2)));
+}
+
+// Modeled after the piecewise quadratic
+// y = (1/2)((2x)^2)             ; [0, 0.5)
+// y = -(1/2)((2x-1)*(2x-3) - 1) ; [0.5, 1]
+AHFloat QuadraticEaseInOut(AHFloat p)
+{
+	if(p < 0.5)
+	{
+		return static_cast<AHFloat>(2 * p * p);
+	}
+	else
+	{
+		return static_cast<AHFloat>((-2 * p * p) + (4 * p) - 1);
+	}
+}
+
+// Modeled after the cubic y = x^3
+AHFloat CubicEaseIn(AHFloat p)
+{
+	return static_cast<AHFloat>(p * p * p);
+}
+
+// Modeled after the cubic y = (x - 1)^3 + 1
+AHFloat CubicEaseOut(AHFloat p)
+{
+	AHFloat f = (p - 1);
+	return static_cast<AHFloat>(f * f * f + 1);
+}
+
+// Modeled after the piecewise cubic
+// y = (1/2)((2x)^3)       ; [0, 0.5)
+// y = (1/2)((2x-2)^3 + 2) ; [0.5, 1]
+AHFloat CubicEaseInOut(AHFloat p)
+{
+	if(p < 0.5)
+	{
+		return static_cast<AHFloat>(4 * p * p * p);
+	}
+	else
+	{
+		AHFloat f = ((2 * p) - 2);
+		return static_cast<AHFloat>(0.5 * f * f * f + 1);
+	}
+}
+
+// Modeled after the quartic x^4
+AHFloat QuarticEaseIn(AHFloat p)
+{
+	return static_cast<AHFloat>(p * p * p * p);
+}
+
+// Modeled after the quartic y = 1 - (x - 1)^4
+AHFloat QuarticEaseOut(AHFloat p)
+{
+	AHFloat f = (p - 1);
+	return static_cast<AHFloat>(f * f * f * (1 - p) + 1);
+}
+
+// Modeled after the piecewise quartic
+// y = (1/2)((2x)^4)        ; [0, 0.5)
+// y = -(1/2)((2x-2)^4 - 2) ; [0.5, 1]
+AHFloat QuarticEaseInOut(AHFloat p) 
+{
+	if(p < 0.5)
+	{
+		return static_cast<AHFloat>(8 * p * p * p * p);
+	}
+	else
+	{
+		AHFloat f = (p - 1);
+		return static_cast<AHFloat>(-8 * f * f * f * f + 1);
+	}
+}
+
+// Modeled after the quintic y = x^5
+AHFloat QuinticEaseIn(AHFloat p) 
+{
+	return static_cast<AHFloat>(p * p * p * p * p);
+}
+
+// Modeled after the quintic y = (x - 1)^5 + 1
+AHFloat QuinticEaseOut(AHFloat p) 
+{
+	AHFloat f = (p - 1);
+	return static_cast<AHFloat>(f * f * f * f * f + 1);
+}
+
+// Modeled after the piecewise quintic
+// y = (1/2)((2x)^5)       ; [0, 0.5)
+// y = (1/2)((2x-2)^5 + 2) ; [0.5, 1]
+AHFloat QuinticEaseInOut(AHFloat p) 
+{
+	if(p < 0.5)
+	{
+		return static_cast<AHFloat>(16 * p * p * p * p * p);
+	}
+	else
+	{
+		AHFloat f = ((2 * p) - 2);
+		return static_cast<AHFloat>( 0.5 * f * f * f * f * f + 1);
+	}
+}
+
+// Modeled after quarter-cycle of sine wave
+AHFloat SineEaseIn(AHFloat p)
+{
+	return static_cast<AHFloat>(sin((p - 1) * M_PI_2) + 1);
+}
+
+// Modeled after quarter-cycle of sine wave (different phase)
+AHFloat SineEaseOut(AHFloat p)
+{
+	return static_cast<AHFloat>(sin(p * M_PI_2));
+}
+
+// Modeled after half sine wave
+AHFloat SineEaseInOut(AHFloat p)
+{
+	return static_cast<AHFloat>(0.5 * (1 - cos(p * M_PI)));
+}
+
+// Modeled after shifted quadrant IV of unit circle
+AHFloat CircularEaseIn(AHFloat p)
+{
+	return static_cast<AHFloat>(1 - sqrt(1 - (p * p)));
+}
+
+// Modeled after shifted quadrant II of unit circle
+AHFloat CircularEaseOut(AHFloat p)
+{
+	return static_cast<AHFloat>(sqrt((2 - p) * p));
+}
+
+// Modeled after the piecewise circular function
+// y = (1/2)(1 - sqrt(1 - 4x^2))           ; [0, 0.5)
+// y = (1/2)(sqrt(-(2x - 3)*(2x - 1)) + 1) ; [0.5, 1]
+AHFloat CircularEaseInOut(AHFloat p)
+{
+	if(p < 0.5)
+	{
+		return static_cast<AHFloat>(0.5 * (1 - sqrt(1 - 4 * (p * p))));
+	}
+	else
+	{
+		return static_cast<AHFloat>(0.5 * (sqrt(-((2 * p) - 3) * ((2 * p) - 1)) + 1));
+	}
+}
+
+// Modeled after the exponential function y = 2^(10(x - 1))
+AHFloat ExponentialEaseIn(AHFloat p)
+{
+	return static_cast<AHFloat>((p == 0.0) ? p : pow(2, 10 * (p - 1)));
+}
+
+// Modeled after the exponential function y = -2^(-10x) + 1
+AHFloat ExponentialEaseOut(AHFloat p)
+{
+	return static_cast<AHFloat>((p == 1.0) ? p : 1 - pow(2, -10 * p));
+}
+
+// Modeled after the piecewise exponential
+// y = (1/2)2^(10(2x - 1))         ; [0,0.5)
+// y = -(1/2)*2^(-10(2x - 1))) + 1 ; [0.5,1]
+AHFloat ExponentialEaseInOut(AHFloat p)
+{
+	if(p == 0.0 || p == 1.0) return static_cast<AHFloat>(p);
+	
+	if(p < 0.5)
+	{
+		return static_cast<AHFloat>(0.5 * pow(2, (20 * p) - 10));
+	}
+	else
+	{
+		return static_cast<AHFloat>(-0.5 * pow(2, (-20 * p) + 10) + 1);
+	}
+}
+
+// Modeled after the damped sine wave y = sin(13pi/2*x)*pow(2, 10 * (x - 1))
+AHFloat ElasticEaseIn(AHFloat p)
+{
+	return static_cast<AHFloat>(sin(13 * M_PI_2 * p) * pow(2, 10 * (p - 1)));
+}
+
+// Modeled after the damped sine wave y = sin(-13pi/2*(x + 1))*pow(2, -10x) + 1
+AHFloat ElasticEaseOut(AHFloat p)
+{
+	return static_cast<AHFloat>(sin(-13 * M_PI_2 * (p + 1)) * pow(2, -10 * p) + 1);
+}
+
+// Modeled after the piecewise exponentially-damped sine wave:
+// y = (1/2)*sin(13pi/2*(2*x))*pow(2, 10 * ((2*x) - 1))      ; [0,0.5)
+// y = (1/2)*(sin(-13pi/2*((2x-1)+1))*pow(2,-10(2*x-1)) + 2) ; [0.5, 1]
+AHFloat ElasticEaseInOut(AHFloat p)
+{
+	if(p < 0.5)
+	{
+		return static_cast<AHFloat>(0.5 * sin(13 * M_PI_2 * (2 * p)) * pow(2, 10 * ((2 * p) - 1)));
+	}
+	else
+	{
+		return static_cast<AHFloat>(0.5 * (sin(-13 * M_PI_2 * ((2 * p - 1) + 1)) * pow(2, -10 * (2 * p - 1)) + 2));
+	}
+}
+
+// Modeled after the overshooting cubic y = x^3-x*sin(x*pi)
+AHFloat BackEaseIn(AHFloat p)
+{
+	return static_cast<AHFloat>(p * p * p - p * sin(p * M_PI));
+}
+
+// Modeled after overshooting cubic y = 1-((1-x)^3-(1-x)*sin((1-x)*pi))
+AHFloat BackEaseOut(AHFloat p)
+{
+	AHFloat f = (1 - p);
+	return static_cast<AHFloat>(1 - (f * f * f - f * sin(f * M_PI)));
+}
+
+// Modeled after the piecewise overshooting cubic function:
+// y = (1/2)*((2x)^3-(2x)*sin(2*x*pi))           ; [0, 0.5)
+// y = (1/2)*(1-((1-x)^3-(1-x)*sin((1-x)*pi))+1) ; [0.5, 1]
+AHFloat BackEaseInOut(AHFloat p)
+{
+	if(p < 0.5)
+	{
+		AHFloat f = 2 * p;
+		return static_cast<AHFloat>(0.5 * (f * f * f - f * sin(f * M_PI)));
+	}
+	else
+	{
+		AHFloat f = (1 - (2*p - 1));
+		return static_cast<AHFloat>(0.5 * (1 - (f * f * f - f * sin(f * M_PI))) + 0.5);
+	}
+}
+
+AHFloat BounceEaseIn(AHFloat p)
+{
+	return static_cast<AHFloat>(1 - BounceEaseOut(1 - p));
+}
+
+AHFloat BounceEaseOut(AHFloat p)
+{
+	if(p < 4/11.0)
+	{
+		return static_cast<AHFloat>((121 * p * p)/16.0);
+	}
+	else if(p < 8/11.0)
+	{
+		return static_cast<AHFloat>((363/40.0 * p * p) - (99/10.0 * p) + 17/5.0);
+	}
+	else if(p < 9/10.0)
+	{
+		return static_cast<AHFloat>((4356/361.0 * p * p) - (35442/1805.0 * p) + 16061/1805.0);
+	}
+	else
+	{
+		return static_cast<AHFloat>((54/5.0 * p * p) - (513/25.0 * p) + 268/25.0);
+	}
+}
+
+AHFloat BounceEaseInOut(AHFloat p)
+{
+	if(p < 0.5)
+	{
+		return static_cast<AHFloat>(0.5 * BounceEaseIn(p*2));
+	}
+	else
+	{
+		return static_cast<AHFloat>(0.5 * BounceEaseOut(p * 2 - 1) + 0.5);
+	}
+}
diff --git a/src/Smooth Interior Camera/AHEasing/easing.h b/src/Smooth Interior Camera/AHEasing/easing.h
new file mode 100644
index 0000000..72e20db
--- /dev/null
+++ b/src/Smooth Interior Camera/AHEasing/easing.h	
@@ -0,0 +1,90 @@
+//
+//  easing.h
+//
+//  Copyright (c) 2011, Auerhaus Development, LLC
+//
+//  This program is free software. It comes without any warranty, to
+//  the extent permitted by applicable law. You can redistribute it
+//  and/or modify it under the terms of the Do What The Fuck You Want
+//  To Public License, Version 2, as published by Sam Hocevar. See
+//  http://sam.zoy.org/wtfpl/COPYING for more details.
+//
+
+#ifndef AH_EASING_H
+#define AH_EASING_H
+
+#if defined(__LP64__) && !defined(AH_EASING_USE_DBL_PRECIS)
+#define AH_EASING_USE_DBL_PRECIS
+#endif
+
+#ifdef AH_EASING_USE_DBL_PRECIS
+#define AH_FLOAT_TYPE double
+#else
+#define AH_FLOAT_TYPE float
+#endif
+typedef AH_FLOAT_TYPE AHFloat;
+
+#if defined __cplusplus
+extern "C" {
+#endif
+
+typedef AHFloat (*AHEasingFunction)(AHFloat);
+
+// Linear interpolation (no easing)
+AHFloat LinearInterpolation(AHFloat p);
+
+// Quadratic easing; p^2
+AHFloat QuadraticEaseIn(AHFloat p);
+AHFloat QuadraticEaseOut(AHFloat p);
+AHFloat QuadraticEaseInOut(AHFloat p);
+
+// Cubic easing; p^3
+AHFloat CubicEaseIn(AHFloat p);
+AHFloat CubicEaseOut(AHFloat p);
+AHFloat CubicEaseInOut(AHFloat p);
+
+// Quartic easing; p^4
+AHFloat QuarticEaseIn(AHFloat p);
+AHFloat QuarticEaseOut(AHFloat p);
+AHFloat QuarticEaseInOut(AHFloat p);
+
+// Quintic easing; p^5
+AHFloat QuinticEaseIn(AHFloat p);
+AHFloat QuinticEaseOut(AHFloat p);
+AHFloat QuinticEaseInOut(AHFloat p);
+
+// Sine wave easing; sin(p * PI/2)
+AHFloat SineEaseIn(AHFloat p);
+AHFloat SineEaseOut(AHFloat p);
+AHFloat SineEaseInOut(AHFloat p);
+
+// Circular easing; sqrt(1 - p^2)
+AHFloat CircularEaseIn(AHFloat p);
+AHFloat CircularEaseOut(AHFloat p);
+AHFloat CircularEaseInOut(AHFloat p);
+
+// Exponential easing, base 2
+AHFloat ExponentialEaseIn(AHFloat p);
+AHFloat ExponentialEaseOut(AHFloat p);
+AHFloat ExponentialEaseInOut(AHFloat p);
+
+// Exponentially-damped sine wave easing
+AHFloat ElasticEaseIn(AHFloat p);
+AHFloat ElasticEaseOut(AHFloat p);
+AHFloat ElasticEaseInOut(AHFloat p);
+
+// Overshooting cubic easing; 
+AHFloat BackEaseIn(AHFloat p);
+AHFloat BackEaseOut(AHFloat p);
+AHFloat BackEaseInOut(AHFloat p);
+
+// Exponentially-decaying bounce easing
+AHFloat BounceEaseIn(AHFloat p);
+AHFloat BounceEaseOut(AHFloat p);
+AHFloat BounceEaseInOut(AHFloat p);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
\ No newline at end of file
diff --git a/src/Smooth Interior Camera/Common.cpp b/src/Smooth Interior Camera/Common.cpp
index 503022d..2621db2 100644
--- a/src/Smooth Interior Camera/Common.cpp	
+++ b/src/Smooth Interior Camera/Common.cpp	
@@ -3,7 +3,7 @@
  ** @license MIT License
  **/
 
-#include "Common.h"
+#include "Common.hpp"
 
 #include <cmath>
 
diff --git a/src/Smooth Interior Camera/Common.h b/src/Smooth Interior Camera/Common.hpp
similarity index 100%
rename from src/Smooth Interior Camera/Common.h
rename to src/Smooth Interior Camera/Common.hpp
diff --git a/src/Smooth Interior Camera/Game/Hooks.cpp b/src/Smooth Interior Camera/Game/Hooks.cpp
index f4e4ee3..0b6cffd 100644
--- a/src/Smooth Interior Camera/Game/Hooks.cpp	
+++ b/src/Smooth Interior Camera/Game/Hooks.cpp	
@@ -3,38 +3,41 @@
  ** @license MIT License
  **/
 
-#include "Hooks.h"
+#include "Hooks.hpp"
 
 #include <Windows.h>
 #include <iostream>
 #include <sstream>
 #include <iomanip>
 
-#include "Memory/Hooking.Patterns.h"
-#include "Memory/MemMgr.h"
-#include "Mod/Mod.h"
-#include "Mod/Camera.h"
-#include "Mod/Config.h"
-#include "Game/prism.h"
-#include "Common.h"
-#include "Version.h"
+#include "Memory/Hooking.Patterns.hpp"
+#include "Memory/MemMgr.hpp"
+#include "Mod/Mod.hpp"
+#include "Mod/Camera.hpp"
+#include "Mod/Config.hpp"
+#include "Game/prism.hpp"
+#include "Common.hpp"
+#include "Version.hpp"
 
 namespace Hooks
 {
 	Mod* g_pMod;
 
-	void CameraEvent(prism::Camera *pGameCam)
+	std::uint16_t gameCamOffset = 0;
+	std::uint16_t gameCamPosOffset = 0;
+
+	void __cdecl CameraEvent(uintptr_t gameCamAddr)
 	{
-		if (!pGameCam)
-			return;
+		auto pGameCam = reinterpret_cast<prism::GameCamera*>(gameCamAddr + gameCamOffset);
+		auto pGameCamPos = reinterpret_cast<prism::GameCameraPos*>(gameCamAddr + gameCamPosOffset);
 
 		auto pCam = g_pMod->GetCamera();
-		pCam->UpdateGameCamera(pGameCam);
+		pCam->UpdateGameCamera(pGameCamPos);
 
 		if (!g_pMod->IsPlaying() || !g_pMod->IsActive()) // default
 		{
-			pGameCam->m_rx = pGameCam->m_rx_predef;
-			pGameCam->m_ry = pGameCam->m_ry_predef;
+			pGameCamPos->m_rx = pGameCam->m_rxEnd;
+			pGameCamPos->m_ry = pGameCam->m_ryEnd;
 			pGameCam->m_keyboardEv = false;
 		}
 		else if (g_pMod->IsConfiguring())
@@ -43,10 +46,10 @@ namespace Hooks
 			{
 				for (short i = 0; i < 6; ++i)
 				{
-					if (floatEquals(pGameCam->m_rx_predef, Config::Get()->GetDefaultValue((Config::CameraPos)i)))
+					if (floatEquals(pGameCam->m_rxEnd, Config::Get()->GetDefaultValue((Config::GameCameraPos)i)))
 					{
-						g_pMod->Log(SCS_LOG_TYPE_message, "New value for [%d] %f is %f", i, Config::Get()->m_interiorCamPos[i], pGameCam->m_rx);
-						Config::Get()->m_interiorCamPos[i] = pGameCam->m_rx;
+						g_pMod->Log(SCS_LOG_TYPE_message, "New value for [%d] %f is %f", i, Config::Get()->m_interiorCamPos[i], pGameCamPos->m_rx);
+						Config::Get()->m_interiorCamPos[i] = pGameCamPos->m_rx;
 						g_pMod->DisableConfigurating();
 						Config::Get()->Save();
 					}
@@ -59,23 +62,23 @@ namespace Hooks
 		{
 			if (pGameCam->m_keyboardEv)
 			{
-				float rx = pGameCam->m_rx_predef;
+				float rx = pGameCam->m_rxEnd;
 
 				for (short i = 0; i < 6; ++i)
 				{
-					if (floatEquals(pGameCam->m_rx_predef, Config::Get()->GetDefaultValue((Config::CameraPos)i)))
+					if (floatEquals(pGameCam->m_rxEnd, Config::Get()->GetDefaultValue((Config::GameCameraPos)i)))
 					{
-						rx = Config::Get()->GetValue((Config::CameraPos)i);
+						rx = Config::Get()->GetValue((Config::GameCameraPos)i);
 
 					#ifdef TESTING
-						std::cout << "New value for '" << pGameCam->m_rx_predef << "' is '" << rx << "'\n";
+						std::cout << "New value for '" << pGameCam->m_rxEnd << "' is '" << rx << "'\n";
 					#endif
 
 						break;
 					}
 				}
 
-				pCam->UpdateRX(pGameCam->m_rx);
+				pCam->UpdateRX(pGameCamPos->m_rx);
 				pCam->MoveTo(rx);
 
 				pGameCam->m_keyboardEv = false;
@@ -85,18 +88,38 @@ namespace Hooks
 
 	uintptr_t CameraEvent_addr;
 
-#if defined(HOOK_V1)
-	auto CameraEvent_pattern = "8B 81 B0 02 00 00 89 81 48 03 00 00 8B 81 B4 02 00 00 89 81 4C 03 00 00 C7 81 AC 02 00 00 00 00 00 00";
-#elif defined(HOOK_V2)
-	auto CameraEvent_pattern = "8B 81 B8 02 00 00 89 81 50 03 00 00 8B 81 BC 02 00 00 89 81 54 03 00 00 C7 81 B4 02 00 00 00 00 00 00";
-#endif
+	auto CameraEvent_pattern = "8B 81 ?? ?? 00 00 89 81 ?? ?? 00 00 8B 81 ?? ?? 00 00 89 81 ?? ?? 00 00 C7 81 ?? ?? 00 00 00 00 00 00";
+
+#if defined(X64)
 
 	extern "C"
 	{
-		ptrdiff_t CameraEvent_Address = 0;
+		uintptr_t CameraEvent_Address = 0;
 		void Asm_CameraEvent();
 	}
 
+#elif defined(X86)
+
+	uintptr_t CameraEvent_Address = 0;
+
+	void __declspec(naked) Asm_CameraEvent()
+	{
+		__asm 
+		{
+			pushad
+				push ecx
+				call CameraEvent_Address
+				add esp, 4
+			popad
+
+			mov     esp, ebp
+			pop     ebp
+			ret
+		}
+	}
+
+#endif
+
 	bool Hook_CameraEvent()
 	{
 		auto pattern = hook::pattern(CameraEvent_pattern);
@@ -109,8 +132,13 @@ namespace Hooks
 			std::cout << "CameraEvent addr: " << std::hex << CameraEvent_addr << "\n";
 		#endif
 
-			CameraEvent_Address = (uintptr_t)CameraEvent;
-			MemMgr::LongJmpHook(CameraEvent_addr, (uintptr_t)Asm_CameraEvent);
+			gameCamOffset = *reinterpret_cast<std::uint16_t*>(CameraEvent_addr + 2) - 4;
+			gameCamPosOffset = *reinterpret_cast<std::uint16_t*>(CameraEvent_addr + 8);
+
+			printf("Offsets: %i %i\n", gameCamOffset, gameCamPosOffset);
+
+			CameraEvent_Address = reinterpret_cast<uintptr_t>(CameraEvent);
+			MemMgr::JmpHook(CameraEvent_addr, (uintptr_t)Asm_CameraEvent);
 
 			return true;
 		}
diff --git a/src/Smooth Interior Camera/Game/Hooks.h b/src/Smooth Interior Camera/Game/Hooks.hpp
similarity index 100%
rename from src/Smooth Interior Camera/Game/Hooks.h
rename to src/Smooth Interior Camera/Game/Hooks.hpp
diff --git a/src/Smooth Interior Camera/Game/HooksASM.asm b/src/Smooth Interior Camera/Game/HooksASM.asm
index 7e9f615..752c0a7 100644
--- a/src/Smooth Interior Camera/Game/HooksASM.asm	
+++ b/src/Smooth Interior Camera/Game/HooksASM.asm	
@@ -3,6 +3,8 @@
 ; ** @license MIT License
 ; **
 
+IFDEF RAX
+
 extern CameraEvent_Address: qword
 
 .code
@@ -30,4 +32,6 @@ Asm_CameraEvent PROC
 
 Asm_CameraEvent ENDP
 
+ENDIF
+
 End
diff --git a/src/Smooth Interior Camera/Game/prism.h b/src/Smooth Interior Camera/Game/prism.h
deleted file mode 100644
index d337556..0000000
--- a/src/Smooth Interior Camera/Game/prism.h	
+++ /dev/null
@@ -1,31 +0,0 @@
-/** @file prism.h
- ** @author Piotr Krupa (piotrkrupa06@gmail.com)
- ** @license MIT License
- **/
-
-#pragma once
-
-#include "Version.h"
-
-namespace prism
-{
-	template <size_t Offset1, size_t Offset2>
-	class CameraBase
-	{
-	public:
-		char pad1[Offset1];			// +0
-		unsigned m_keyboardEv;		// +Offset1
-		float m_rx_predef;			// +Offset1 + 4
-		float m_ry_predef;			// +Offset1 + 8
-		char pad2[Offset2];			// +Offset1 + 12
-		float m_rx;					// +Offset2
-		float m_ry;					// +Offset2 + 4
-	};
-
-
-#if defined(HOOK_V1)
-	using Camera = CameraBase<684, 144>;
-#elif defined(HOOK_V2)
-	using Camera = CameraBase<692, 144>;
-#endif
-}
diff --git a/src/Smooth Interior Camera/Game/prism.hpp b/src/Smooth Interior Camera/Game/prism.hpp
new file mode 100644
index 0000000..cf0a5f2
--- /dev/null
+++ b/src/Smooth Interior Camera/Game/prism.hpp	
@@ -0,0 +1,26 @@
+/** @file prism.h
+ ** @author Piotr Krupa (piotrkrupa06@gmail.com)
+ ** @license MIT License
+ **/
+
+#pragma once
+
+#include "Version.hpp"
+
+namespace prism
+{
+	class GameCamera
+	{
+	public:
+		unsigned m_keyboardEv;	// +0
+		float m_rxEnd;			// +4
+		float m_ryEnd;			// +8
+	};	
+
+	class GameCameraPos
+	{
+	public:
+		float m_rx;		// +0
+		float m_ry;		// +4
+	};
+}
diff --git a/src/Smooth Interior Camera/Main.cpp b/src/Smooth Interior Camera/Main.cpp
index f16c61c..729c6cc 100644
--- a/src/Smooth Interior Camera/Main.cpp	
+++ b/src/Smooth Interior Camera/Main.cpp	
@@ -3,7 +3,7 @@
  ** @license MIT License
  **/
 
-#include "Mod\Mod.h"
+#include "Mod\Mod.hpp"
 
 #include <Windows.h>
 #include <memory>
diff --git a/src/Smooth Interior Camera/Memory/Hooking.Patterns.cpp b/src/Smooth Interior Camera/Memory/Hooking.Patterns.cpp
index f89ef07..d7ad6be 100644
--- a/src/Smooth Interior Camera/Memory/Hooking.Patterns.cpp	
+++ b/src/Smooth Interior Camera/Memory/Hooking.Patterns.cpp	
@@ -5,7 +5,7 @@
  * regarding licensing.
  */
 
-#include "Hooking.Patterns.h"
+#include "Hooking.Patterns.hpp"
 
 #define WIN32_LEAN_AND_MEAN
 
diff --git a/src/Smooth Interior Camera/Memory/Hooking.Patterns.h b/src/Smooth Interior Camera/Memory/Hooking.Patterns.hpp
similarity index 100%
rename from src/Smooth Interior Camera/Memory/Hooking.Patterns.h
rename to src/Smooth Interior Camera/Memory/Hooking.Patterns.hpp
diff --git a/src/Smooth Interior Camera/Memory/MemMgr.cpp b/src/Smooth Interior Camera/Memory/MemMgr.cpp
index 5f54367..cad8d2e 100644
--- a/src/Smooth Interior Camera/Memory/MemMgr.cpp	
+++ b/src/Smooth Interior Camera/Memory/MemMgr.cpp	
@@ -3,10 +3,13 @@
  ** @license MIT License
  **/
 
-#include "MemMgr.h"
+#include "MemMgr.hpp"
 
 #include <Windows.h>
 
+#include "Version.hpp"
+
+#ifdef X64
 /*
 	push rax
 	mov rax addr   ; @addr - address to original
@@ -14,6 +17,7 @@
 	ret
 */
 unsigned char g_jmpHook[] = { 0x50, 0x48, 0xB8, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0x48, 0x87, 0x04, 0x24, 0xC3 };
+#endif 
 
 void MemMgr::UnprotectMemory(uintptr_t addr, size_t size)
 {
@@ -21,10 +25,22 @@ void MemMgr::UnprotectMemory(uintptr_t addr, size_t size)
 	VirtualProtect((void*)addr, size, PAGE_EXECUTE_READWRITE, &temp);
 }
 
-void MemMgr::LongJmpHook(uintptr_t addr, uintptr_t addrTo)
+#if defined(X64)
+void MemMgr::JmpHook(uintptr_t addr, uintptr_t addrTo)
 {
 	UnprotectMemory(addr, sizeof(g_jmpHook));
 
+	// long jump
 	memcpy((unsigned char*)addr, g_jmpHook, sizeof(g_jmpHook));
 	*(uintptr_t*)&((unsigned char*)addr)[3] = addrTo;
 }
+#elif defined(X86)
+void MemMgr::JmpHook(uintptr_t addr, uintptr_t addrTo)
+{
+	UnprotectMemory(addr, 5);
+
+	*(unsigned char*)(addr) = 0xE9;
+	*(unsigned*)(addr + 1) = addrTo - (addr + 5);
+
+}
+#endif
diff --git a/src/Smooth Interior Camera/Memory/MemMgr.h b/src/Smooth Interior Camera/Memory/MemMgr.hpp
similarity index 75%
rename from src/Smooth Interior Camera/Memory/MemMgr.h
rename to src/Smooth Interior Camera/Memory/MemMgr.hpp
index 4b77da5..cea2118 100644
--- a/src/Smooth Interior Camera/Memory/MemMgr.h	
+++ b/src/Smooth Interior Camera/Memory/MemMgr.hpp	
@@ -12,7 +12,6 @@ class MemMgr
 public:
 	static void UnprotectMemory(uintptr_t addr, size_t size);
 
-	// 16 bytes
-	static void LongJmpHook(uintptr_t addr, uintptr_t addrTo);
+	static void JmpHook(uintptr_t addr, uintptr_t addrTo);
 };
 
diff --git a/src/Smooth Interior Camera/Mod/Camera.cpp b/src/Smooth Interior Camera/Mod/Camera.cpp
index edd054f..e50b5fb 100644
--- a/src/Smooth Interior Camera/Mod/Camera.cpp	
+++ b/src/Smooth Interior Camera/Mod/Camera.cpp	
@@ -3,13 +3,15 @@
  ** @license MIT License
  **/
 
-#include "Camera.h"
+#include "Camera.hpp"
 
 #include <Windows.h>
 #include <iostream>
 
-#include "Common.h"
-#include "Config.h"
+#include "Common.hpp"
+#include "Config.hpp"
+
+#include "AHEasing/easing.h"
 
 Camera::Camera()
 {
@@ -24,30 +26,30 @@ void Camera::MoveTo(float rx)
 	if (rx == m_rxCurr)
 		return;
 
+	m_rxStart = m_rxCurr;
 	m_rxEnd = rx;
 
-	m_delta = abs(m_rxCurr - m_rxEnd);
+	m_delta = abs(m_rxStart - m_rxEnd);
 
-	if (m_rxCurr > m_rxEnd)
-		m_dir = -1;
-	else if (m_rxCurr < m_rxEnd)
-		m_dir = 1;
+	m_progress = 0.f;
 
-	if (Config::Get()->m_rotationStyle == Config::LINEAR)
-	{
-		m_speed = (Config::Get()->m_speed * MAX_LINEARLY_SPEED) / 100;
-	}
-	else if (Config::Get()->m_rotationStyle == Config::SMOOTH)
+	switch (Config::Get()->m_rotationStyle)
 	{
-		m_acceleration = (Config::Get()->m_speed * MAX_SMOOTH_SPEED) / 100;
-		m_speed = 0.f;
-		m_movingStage = 1;
+		case Config::EaseInOut:
+		case Config::EaseOut:
+		{
+			m_speed = ((MAX_EASEINOUT_SPEED * Config::Get()->m_speed) / 100);
+		} break;
+		case Config::Linear:
+		{
+			m_speed = ((MAX_LINEARLY_SPEED * Config::Get()->m_speed) / 100);
+		} break;
 	}
 
-	m_stopInNextPulse = false;
+	m_speed /= (((m_delta) / 2.f) + 1.f);
 
 #ifdef TESTING
-	std::cout << "Moving to " << m_rxEnd << "\n";
+	std::cout << "Moving to " << m_rxEnd << " with speed " << m_speed << "\n";
 #endif
 
 	m_anim = true;
@@ -60,41 +62,33 @@ void Camera::Pulse()
 
 	if (m_anim)
 	{
-		m_pGameCamera->m_rx = m_rxCurr;
+		m_progress += m_speed;
 
-		if (m_stopInNextPulse)
+		if (m_progress >= 1.f)
 		{
+			m_progress = 1.f;
 			m_anim = false;
-			m_stopInNextPulse = false;
-			return;
 		}
 
-		if (Config::Get()->m_rotationStyle == Config::SMOOTH)
+		m_pGameCamera->m_rx = (m_rxEnd - m_rxStart);
+
+		switch (Config::Get()->m_rotationStyle)
 		{
-			if (abs(m_rxCurr - m_rxEnd) >= m_delta / 2 && m_movingStage == 1)
+			case Config::EaseInOut:
 			{
-				m_speed += m_acceleration;
-			}
-			else
+				m_pGameCamera->m_rx *= QuadraticEaseInOut(m_progress);
+			} break;
+			case Config::EaseOut:
 			{
-				m_speed -= m_acceleration;
-
-				if (m_speed <= 0.f)
-					m_speed = m_acceleration;
-
-				m_movingStage = 2;
-			}
+				m_pGameCamera->m_rx *= QuadraticEaseOut(m_progress);
+			} break;
+			case Config::Linear:
+			{
+				m_pGameCamera->m_rx *= m_progress;
+			} break;
 		}
 
-		if (m_rxCurr * m_dir + m_speed < m_rxEnd * m_dir)
-		{
-			m_rxCurr += m_speed * m_dir;
-		}
-		else
-		{
-			m_rxCurr = m_rxEnd;
-			m_stopInNextPulse = true;
-		}
+		m_pGameCamera->m_rx += m_rxStart;
 	}
 	else
 	{
diff --git a/src/Smooth Interior Camera/Mod/Camera.h b/src/Smooth Interior Camera/Mod/Camera.h
deleted file mode 100644
index c05371a..0000000
--- a/src/Smooth Interior Camera/Mod/Camera.h	
+++ /dev/null
@@ -1,54 +0,0 @@
-/** @file Camera.h
- ** @author Piotr Krupa (piotrkrupa06@gmail.com)
- ** @license MIT License
- **/
-
-#pragma once
-
-#include "Game/prism.h"
-
-class Camera
-{
-	enum MoveTo
-	{
-		BIGGER,
-		SMALLER
-	};		
-
-private:
-	prism::Camera	*m_pGameCamera = nullptr;
-
-	MoveTo			m_moveType;
-
-	float			m_rxCurr = 0.f;
-	float			m_rxEnd = 0.f;
-
-	float			m_delta;
-	int				m_dir;
-
-	float			m_acceleration;
-	float			m_speed = 0.01f;
-
-	int				m_movingStage;
-
-	bool			m_anim = false;
-	bool			m_stopInNextPulse = false;
-
-	const float MAX_LINEARLY_SPEED = 0.12f;
-	const float MAX_SMOOTH_SPEED = 0.01f;
-
-public:
-	Camera();
-	~Camera();
-
-	void MoveTo(float rx);
-	void UpdateRX(float rx) { m_rxCurr = rx; }
-
-	void UpdateGameCamera(prism::Camera *gameCamera) { m_pGameCamera = gameCamera; }
-
-	prism::Camera *GetGameCamera() { return m_pGameCamera; }
-
-	void Pulse();
-
-	bool IsAnimation() { return m_anim; }
-};
diff --git a/src/Smooth Interior Camera/Mod/Camera.hpp b/src/Smooth Interior Camera/Mod/Camera.hpp
new file mode 100644
index 0000000..50fb250
--- /dev/null
+++ b/src/Smooth Interior Camera/Mod/Camera.hpp	
@@ -0,0 +1,44 @@
+/** @file Camera.h
+ ** @author Piotr Krupa (piotrkrupa06@gmail.com)
+ ** @license MIT License
+ **/
+
+#pragma once
+
+#include "Game/prism.hpp"
+
+class Camera
+{
+private:
+	prism::GameCameraPos *m_pGameCamera = nullptr;
+
+	float	m_rxCurr = 0.f;
+	float	m_rxStart = 0.f;
+	float	m_rxEnd = 0.f;
+
+	float	m_delta = 0.f;
+
+	float	m_progress = 0.f;
+
+	float	m_speed = 0.01f;
+
+	bool	m_anim = false;
+
+	const float MAX_LINEARLY_SPEED = 0.12f;
+	const float MAX_EASEINOUT_SPEED = 0.1f;
+
+public:
+	Camera();
+	~Camera();
+
+	void MoveTo(float rx);
+	void UpdateRX(float rx) { m_rxCurr = rx; }
+
+	void UpdateGameCamera(prism::GameCameraPos *gameCamera) { m_pGameCamera = gameCamera; }
+
+	prism::GameCameraPos *GetGameCamera() { return m_pGameCamera; }
+
+	void Pulse();
+
+	bool IsAnimation() { return m_anim; }
+};
diff --git a/src/Smooth Interior Camera/Mod/Config.cpp b/src/Smooth Interior Camera/Mod/Config.cpp
index 804572a..fcaa99e 100644
--- a/src/Smooth Interior Camera/Mod/Config.cpp	
+++ b/src/Smooth Interior Camera/Mod/Config.cpp	
@@ -3,7 +3,7 @@
  ** @license MIT License
  **/
 
-#include "Config.h"
+#include "Config.hpp"
 
 #include <iostream>
 #include <string>
@@ -11,8 +11,8 @@
 
 #include <json.hpp>
 
-#include "Common.h"
-#include "Mod.h"
+#include "Common.hpp"
+#include "Mod.hpp"
 
 Config *Config::s_pInst;
 
@@ -79,28 +79,39 @@ void Config::Load()
 	int version = json["version"];
 
 #ifdef TESTING
-	std::cout << "Version: " << version << "\n";
+	std::cout << "Version: " << std::dec << version << "\n";
 #endif
 
+
+	bool needSave = false;
+
+	if (version != CURRENT_VERSION_SHORT)
+		needSave = true;
+
 	if (!json["active"].is_null())
 		m_active = json["active"];
 	else
-		Save();
-
+		needSave = true;
+	
 	if (!json["speed"].is_null())
 		m_speed = json["speed"];
 	else
-		Save();
+		needSave = true;
 
 	if (!json["disable_shortcuts"].is_null())
 		m_disableShortcuts = json["disable_shortcuts"];
 	else
-		Save();
+		needSave = true;
 
 	if (!json["rotation_style"].is_null())
 		m_rotationStyle = json["rotation_style"];
 	else
+		needSave = true;
+
+	if (needSave)
+	{
 		Save();
+	}
 
 #ifdef TESTING
 	std::cout << "active: " << (m_active ? "true" : "false") << "\n";
@@ -151,7 +162,7 @@ void Config::CreateDefaultFile()
 	m_active = true;
 	m_speed = 75;
 	m_disableShortcuts = false;
-	m_rotationStyle = SMOOTH;
+	m_rotationStyle = EaseInOut;
 
 	for (unsigned i = 0; i < 6; ++i)
 	{
diff --git a/src/Smooth Interior Camera/Mod/Config.h b/src/Smooth Interior Camera/Mod/Config.hpp
similarity index 88%
rename from src/Smooth Interior Camera/Mod/Config.h
rename to src/Smooth Interior Camera/Mod/Config.hpp
index 30ff764..12cc48b 100644
--- a/src/Smooth Interior Camera/Mod/Config.h	
+++ b/src/Smooth Interior Camera/Mod/Config.hpp	
@@ -18,20 +18,21 @@ class Config
 public:
 	enum RotationStyle
 	{
-		LINEAR = 0,
-		SMOOTH
+		Linear = 0,
+		EaseInOut,
+		EaseOut
 	};
 
 	// global settings with default values
 	bool			m_active = true;
-	int				m_speed = 70;
+	int				m_speed = 75;
 	bool			m_disableShortcuts = false;
-	RotationStyle	m_rotationStyle = SMOOTH;
+	RotationStyle	m_rotationStyle = EaseInOut;
 
 	float	m_interiorCamPos[6];
 
 
-	enum CameraPos
+	enum GameCameraPos
 	{
 		INTERIOR_LOOK_FORWARD = 0,
 		INTERIOR_LOOK_UP_RIGHT,
diff --git a/src/Smooth Interior Camera/Mod/Mod.cpp b/src/Smooth Interior Camera/Mod/Mod.cpp
index 734f5fd..294c2e7 100644
--- a/src/Smooth Interior Camera/Mod/Mod.cpp	
+++ b/src/Smooth Interior Camera/Mod/Mod.cpp	
@@ -3,17 +3,17 @@
  ** @license MIT License
  **/
 
-#include "Mod.h"
+#include "Mod.hpp"
 
 #include <cstdio>
 #include <Windows.h>
 #include <iostream>
 
-#include "Memory/MemMgr.h"
-#include "Game/Hooks.h"
-#include "Mod/Camera.h"
-#include "Mod/Config.h"
-#include "Common.h"
+#include "Memory/MemMgr.hpp"
+#include "Game/Hooks.hpp"
+#include "Mod/Camera.hpp"
+#include "Mod/Config.hpp"
+#include "Common.hpp"
 
 Mod *Mod::s_pInst;
 
@@ -46,7 +46,7 @@ int Mod::Init(scs_telemetry_init_params_v100_t *scsTelemetry)
 
 	if (!Hooks::Init())
 	{
-		Mod::Log(SCS_LOG_TYPE_error, "This version isn't supported! Check %s or $s for updates", forumLinkETS2, forumLinkATS);
+		Mod::Log(SCS_LOG_TYPE_error, "This version isn't supported! Check %s or %s for updates", forumLinkETS2, forumLinkATS);
 		return SCS_RESULT_unsupported;
 	}
 
diff --git a/src/Smooth Interior Camera/Mod/Mod.h b/src/Smooth Interior Camera/Mod/Mod.hpp
similarity index 77%
rename from src/Smooth Interior Camera/Mod/Mod.h
rename to src/Smooth Interior Camera/Mod/Mod.hpp
index 2471c6b..34dcd7b 100644
--- a/src/Smooth Interior Camera/Mod/Mod.h	
+++ b/src/Smooth Interior Camera/Mod/Mod.hpp	
@@ -10,8 +10,8 @@
 
 #include <scssdk_telemetry.h>
 
-#include "Config.h"
-#include "Camera.h"
+#include "Config.hpp"
+#include "Camera.hpp"
 
 class Mod
 {
@@ -49,7 +49,7 @@ class Mod
 	Camera *GetCamera()		{ return m_pCam.get(); }
 	static Mod *Get()		{ return s_pInst; }
 
-	static void TelemetryFrameEnd(const scs_event_t, const void *const, const scs_context_t);
-	static void TelemetryPause(const scs_event_t event, const void *const, const scs_context_t);
+	static void __stdcall TelemetryFrameEnd(const scs_event_t, const void *const, const scs_context_t);
+	static void __stdcall TelemetryPause(const scs_event_t event, const void *const, const scs_context_t);
 };
 
diff --git a/src/Smooth Interior Camera/Smooth Interior Camera.vcxproj b/src/Smooth Interior Camera/Smooth Interior Camera.vcxproj
index adcbaf0..3696974 100644
--- a/src/Smooth Interior Camera/Smooth Interior Camera.vcxproj	
+++ b/src/Smooth Interior Camera/Smooth Interior Camera.vcxproj	
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="ATS Debug|x64">
-      <Configuration>ATS Debug</Configuration>
-      <Platform>x64</Platform>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="ATS Release|x64">
-      <Configuration>ATS Release</Configuration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="ETS 2 Debug|x64">
-      <Configuration>ETS 2 Debug</Configuration>
-      <Platform>x64</Platform>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="ETS 2 Release|x64">
-      <Configuration>ETS 2 Release</Configuration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
@@ -26,33 +26,33 @@
     <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ETS 2 Release|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <PlatformToolset>v141</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>NotSet</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ETS 2 Debug|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <PlatformToolset>v141</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>NotSet</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ATS Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <PlatformToolset>v141</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>NotSet</CharacterSet>
+    <CLRSupport>false</CLRSupport>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ATS Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <PlatformToolset>v141</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>NotSet</CharacterSet>
+    <CLRSupport>false</CLRSupport>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -60,51 +60,46 @@
   </ImportGroup>
   <ImportGroup Label="Shared">
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='ETS 2 Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ETS 2 Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ATS Debug|x64'" Label="PropertySheets">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ATS Release|x64'" Label="PropertySheets">
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ETS 2 Release|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\bin\$(Configuration)\</OutDir>
-    <IntDir>..\..\obj\$(Configuration)\</IntDir>
-    <TargetName>ets2_sic</TargetName>
+    <IntDir>..\..\obj\$(Platform)\$(Configuration)\</IntDir>
+    <TargetName>sic_x64</TargetName>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ETS 2 Debug|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\bin\$(Configuration)\</OutDir>
-    <IntDir>..\..\obj\$(Configuration)\</IntDir>
-    <TargetName>ets2_sic</TargetName>
+    <IntDir>..\..\obj\$(Platform)\$(Configuration)\</IntDir>
+    <TargetName>sic_x64</TargetName>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ATS Debug|x64'">
-    <LinkIncremental>false</LinkIncremental>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <OutDir>..\..\bin\$(Configuration)\</OutDir>
-    <IntDir>..\..\obj\$(Configuration)\</IntDir>
-    <TargetName>ats_sic</TargetName>
+    <IntDir>..\..\obj\$(Platform)\$(Configuration)\</IntDir>
+    <TargetName>sic_x86</TargetName>
+    <TargetExt>.dll</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ATS Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <IntDir>..\..\obj\$(Platform)\$(Configuration)\</IntDir>
+    <TargetName>sic_x86</TargetName>
+    <TargetExt>.dll</TargetExt>
     <OutDir>..\..\bin\$(Configuration)\</OutDir>
-    <IntDir>..\..\obj\$(Configuration)\</IntDir>
-    <TargetName>ats_sic</TargetName>
+    <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ETS 2 Release|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <Optimization>Disabled</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>NDEBUG;ETS2;_WINDOWS;_USRDLL;ETS2TEST_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <IntrinsicFunctions>false</IntrinsicFunctions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>..\vendor\json\src;..\vendor\ets2-sdk\scs_sdk_1_5\include;.\.</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4996</DisableSpecificWarnings>
@@ -120,17 +115,17 @@
       <AdditionalLibraryDirectories>
       </AdditionalLibraryDirectories>
       <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <ModuleDefinitionFile>ets2.def</ModuleDefinitionFile>
+      <ModuleDefinitionFile>sic_x64.def</ModuleDefinitionFile>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ETS 2 Debug|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <Optimization>Disabled</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>TESTING;ETS2;NDEBUG;_WINDOWS;_USRDLL;ETS2TEST_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <IntrinsicFunctions>false</IntrinsicFunctions>
+      <PreprocessorDefinitions>TESTING;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>..\vendor\json\src;..\vendor\ets2-sdk\scs_sdk_1_5\include;.\.</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4996</DisableSpecificWarnings>
@@ -150,63 +145,48 @@
       <AdditionalLibraryDirectories>
       </AdditionalLibraryDirectories>
       <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <ModuleDefinitionFile>ets2.def</ModuleDefinitionFile>
+      <ModuleDefinitionFile>sic_x64.def</ModuleDefinitionFile>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ATS Debug|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
+      <AdditionalIncludeDirectories>..\vendor\json\src;..\vendor\ets2-sdk\scs_sdk_1_5\include;.\.</AdditionalIncludeDirectories>
+      <SDLCheck>true</SDLCheck>
       <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <Optimization>Disabled</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>_AFXDLL;ATS;TESTING;NDEBUG;_WINDOWS;_USRDLL;ETS2TEST_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>..\vendor\json\src;..\vendor\ets2-sdk\scs_sdk_1_5\include;.\.</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
+      <PreprocessorDefinitions>TESTING;_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <LanguageStandard>stdcpp17</LanguageStandard>
-      <DebugInformationFormat>None</DebugInformationFormat>
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
     </ClCompile>
     <Link>
-      <SubSystem>Windows</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalLibraryDirectories>
-      </AdditionalLibraryDirectories>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <ModuleDefinitionFile>ats.def</ModuleDefinitionFile>
+      <ModuleDefinitionFile>sic_x86.def</ModuleDefinitionFile>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ATS Release|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
+      <AdditionalIncludeDirectories>..\vendor\json\src;..\vendor\ets2-sdk\scs_sdk_1_5\include;.\.</AdditionalIncludeDirectories>
+      <SDLCheck>true</SDLCheck>
       <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <Optimization>Disabled</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>_AFXDLL;ATS;NDEBUG;_WINDOWS;_USRDLL;ETS2TEST_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>..\vendor\json\src;..\vendor\ets2-sdk\scs_sdk_1_5\include;.\.</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <LanguageStandard>stdcpp17</LanguageStandard>
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
       <DebugInformationFormat>None</DebugInformationFormat>
+      <PreprocessorDefinitions>NDEBUG;_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
     </ClCompile>
     <Link>
+      <ModuleDefinitionFile>sic_x86.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalLibraryDirectories>
-      </AdditionalLibraryDirectories>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <ModuleDefinitionFile>ats.def</ModuleDefinitionFile>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="Main.cpp" />
+    <ClCompile Include="AHEasing\easing.cpp" />
     <ClCompile Include="Mod\Camera.cpp" />
     <ClCompile Include="Common.cpp" />
     <ClCompile Include="Mod\Config.cpp" />
@@ -216,23 +196,24 @@
     <ClCompile Include="Mod\Mod.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="Mod\Camera.h" />
-    <ClInclude Include="Common.h" />
-    <ClInclude Include="Mod\Config.h" />
-    <ClInclude Include="Memory\Hooking.Patterns.h" />
-    <ClInclude Include="Game\Hooks.h" />
-    <ClInclude Include="Memory\MemMgr.h" />
-    <ClInclude Include="Mod\Mod.h" />
-    <ClInclude Include="Game\prism.h" />
+    <ClInclude Include="AHEasing\easing.h" />
+    <ClInclude Include="Mod\Camera.hpp" />
+    <ClInclude Include="Common.hpp" />
+    <ClInclude Include="Mod\Config.hpp" />
+    <ClInclude Include="Memory\Hooking.Patterns.hpp" />
+    <ClInclude Include="Game\Hooks.hpp" />
+    <ClInclude Include="Memory\MemMgr.hpp" />
+    <ClInclude Include="Mod\Mod.hpp" />
+    <ClInclude Include="Game\prism.hpp" />
     <ClInclude Include="resource.h" />
-    <ClInclude Include="Version.h" />
+    <ClInclude Include="Version.hpp" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="Resource.rc" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="ats.def" />
-    <None Include="ets2.def" />
+    <None Include="sic_x64.def" />
+    <None Include="sic_x86.def" />
   </ItemGroup>
   <ItemGroup>
     <MASM Include="Game\HooksASM.asm" />
diff --git a/src/Smooth Interior Camera/Smooth Interior Camera.vcxproj.filters b/src/Smooth Interior Camera/Smooth Interior Camera.vcxproj.filters
index c5a3b0a..450cc74 100644
--- a/src/Smooth Interior Camera/Smooth Interior Camera.vcxproj.filters	
+++ b/src/Smooth Interior Camera/Smooth Interior Camera.vcxproj.filters	
@@ -57,36 +57,42 @@
     <ClCompile Include="Game\Hooks.cpp">
       <Filter>Source Files\Game</Filter>
     </ClCompile>
+    <ClCompile Include="AHEasing\easing.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="Common.h">
+    <ClInclude Include="resource.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="resource.h">
+    <ClInclude Include="AHEasing\easing.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Game\Hooks.h">
+    <ClInclude Include="Game\Hooks.hpp">
       <Filter>Header Files\Game</Filter>
     </ClInclude>
-    <ClInclude Include="Game\prism.h">
+    <ClInclude Include="Game\prism.hpp">
       <Filter>Header Files\Game</Filter>
     </ClInclude>
-    <ClInclude Include="Memory\Hooking.Patterns.h">
+    <ClInclude Include="Memory\Hooking.Patterns.hpp">
       <Filter>Header Files\Memory</Filter>
     </ClInclude>
-    <ClInclude Include="Memory\MemMgr.h">
+    <ClInclude Include="Memory\MemMgr.hpp">
       <Filter>Header Files\Memory</Filter>
     </ClInclude>
-    <ClInclude Include="Mod\Camera.h">
+    <ClInclude Include="Mod\Camera.hpp">
       <Filter>Header Files\Mod</Filter>
     </ClInclude>
-    <ClInclude Include="Mod\Config.h">
+    <ClInclude Include="Mod\Config.hpp">
       <Filter>Header Files\Mod</Filter>
     </ClInclude>
-    <ClInclude Include="Mod\Mod.h">
+    <ClInclude Include="Mod\Mod.hpp">
       <Filter>Header Files\Mod</Filter>
     </ClInclude>
-    <ClInclude Include="Version.h">
+    <ClInclude Include="Common.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Version.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
@@ -95,13 +101,15 @@
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="ets2.def" />
-    <None Include="ats.def" />
-  </ItemGroup>
   <ItemGroup>
     <MASM Include="Game\HooksASM.asm">
       <Filter>Source Files</Filter>
     </MASM>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="sic_x64.def" />
+    <None Include="sic_x86.def">
+      <Filter>Source Files</Filter>
+    </None>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Smooth Interior Camera/Version.h b/src/Smooth Interior Camera/Version.h
deleted file mode 100644
index 83f9a5b..0000000
--- a/src/Smooth Interior Camera/Version.h	
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma once
-
-#define CURRENT_VERSION "1.2.1.0"
-#define CURRENT_VERSION_SHORT 1210
-#define CURRENT_VERSION_NUMBER 1,2,1,0
-
-// Hook Version
-#define HOOK_V1 // for ETS2 1.27 - 1.32 and ATS 1.6+
-// #define HOOK_V2 // for ETS 1.33+
-// ...
diff --git a/src/Smooth Interior Camera/Version.hpp b/src/Smooth Interior Camera/Version.hpp
new file mode 100644
index 0000000..79af6b1
--- /dev/null
+++ b/src/Smooth Interior Camera/Version.hpp	
@@ -0,0 +1,13 @@
+#pragma once
+
+#define CURRENT_VERSION "1.3.0.0"
+#define CURRENT_VERSION_SHORT 1300
+#define CURRENT_VERSION_NUMBER 1,3,0,0
+
+
+#ifdef _WIN64
+#	define X64
+#else
+#	define X86
+#endif
+
diff --git a/src/Smooth Interior Camera/resource.h b/src/Smooth Interior Camera/resource.h
index 875686b..ec50a34 100644
--- a/src/Smooth Interior Camera/resource.h	
+++ b/src/Smooth Interior Camera/resource.h	
@@ -10,7 +10,7 @@
 // Next default values for new objects
 // 
 
-#include "Version.h"
+#include "Version.hpp"
 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
diff --git a/src/Smooth Interior Camera/ats.def b/src/Smooth Interior Camera/sic_x64.def
similarity index 85%
rename from src/Smooth Interior Camera/ats.def
rename to src/Smooth Interior Camera/sic_x64.def
index 933f279..b98092f 100644
--- a/src/Smooth Interior Camera/ats.def	
+++ b/src/Smooth Interior Camera/sic_x64.def	
@@ -1,4 +1,4 @@
-LIBRARY ats_sic
+LIBRARY sic_x64
 EXPORTS
 scs_telemetry_init=scs_telemetry_init
 scs_telemetry_shutdown=scs_telemetry_shutdown
diff --git a/src/Smooth Interior Camera/ets2.def b/src/Smooth Interior Camera/sic_x86.def
similarity index 84%
rename from src/Smooth Interior Camera/ets2.def
rename to src/Smooth Interior Camera/sic_x86.def
index b08b2e7..0489579 100644
--- a/src/Smooth Interior Camera/ets2.def	
+++ b/src/Smooth Interior Camera/sic_x86.def	
@@ -1,4 +1,4 @@
-LIBRARY ets2_sic
+LIBRARY sic_x86
 EXPORTS
 scs_telemetry_init=scs_telemetry_init
 scs_telemetry_shutdown=scs_telemetry_shutdown