diff --git a/AVPPH_CustomLauncher.sdf b/AVPPH_CustomLauncher.sdf
index 965c4dd..2e8b3b9 100644
Binary files a/AVPPH_CustomLauncher.sdf and b/AVPPH_CustomLauncher.sdf differ
diff --git a/MainForm.Designer.cs b/MainForm.Designer.cs
index 0e832a7..e8d2e73 100644
--- a/MainForm.Designer.cs
+++ b/MainForm.Designer.cs
@@ -32,8 +32,8 @@ private void InitializeComponent()
             this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
             this.B_Exit = new System.Windows.Forms.Button();
             this.B_DisplaySettings = new System.Windows.Forms.Button();
-            this.B_StartGame = new System.Windows.Forms.Button();
             this.pictureBox1 = new System.Windows.Forms.PictureBox();
+            this.B_StartGame = new System.Windows.Forms.Button();
             this.tableLayoutPanel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
             this.SuspendLayout();
@@ -84,6 +84,16 @@ private void InitializeComponent()
             this.B_DisplaySettings.UseVisualStyleBackColor = true;
             this.B_DisplaySettings.Click += new System.EventHandler(this.B_DisplaySettings_Click);
             // 
+            // pictureBox1
+            // 
+            this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Top;
+            this.pictureBox1.Image = global::AVP_CustomLauncher.Properties.Resources.yes1;
+            this.pictureBox1.Location = new System.Drawing.Point(4, 4);
+            this.pictureBox1.Name = "pictureBox1";
+            this.pictureBox1.Size = new System.Drawing.Size(348, 210);
+            this.pictureBox1.TabIndex = 0;
+            this.pictureBox1.TabStop = false;
+            // 
             // B_StartGame
             // 
             this.B_StartGame.Anchor = System.Windows.Forms.AnchorStyles.None;
@@ -96,16 +106,6 @@ private void InitializeComponent()
             this.B_StartGame.UseVisualStyleBackColor = true;
             this.B_StartGame.Click += new System.EventHandler(this.B_StartGame_Click);
             // 
-            // pictureBox1
-            // 
-            this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Top;
-            this.pictureBox1.Image = global::AVP_CustomLauncher.Properties.Resources.yes1;
-            this.pictureBox1.Location = new System.Drawing.Point(4, 4);
-            this.pictureBox1.Name = "pictureBox1";
-            this.pictureBox1.Size = new System.Drawing.Size(348, 210);
-            this.pictureBox1.TabIndex = 0;
-            this.pictureBox1.TabStop = false;
-            // 
             // mainform
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -119,7 +119,9 @@ private void InitializeComponent()
             this.Name = "mainform";
             this.ShowIcon = false;
             this.Text = "Aliens vs. Predator 2: Primal Hunt  - Custom Launcher";
+            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.mainform_FormClosing);
             this.Load += new System.EventHandler(this.mainform_Load);
+            this.LocationChanged += new System.EventHandler(this.mainform_LocationChanged);
             this.tableLayoutPanel1.ResumeLayout(false);
             this.tableLayoutPanel1.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
diff --git a/MainForm.cs b/MainForm.cs
index 353e773..817e3bb 100644
--- a/MainForm.cs
+++ b/MainForm.cs
@@ -19,48 +19,119 @@ public partial class mainform : Form
         GameSettings _GraphicsSettings;
         ConfigChoice _ConfigChoice;
         GameHack _gamehack = new GameHack();
+        int _posX = 0;
+        int _posY = 0;
 
         public mainform()
         {
+            if (File.Exists("autoexecextended.cfg"))
+            {
+                setPositionFromConfig();
+            }
             InitializeComponent();
         }
 
-        private void mainform_Load(object sender, EventArgs e)
+        #region Functions
+        private void CheckForRequiredGameFiles()
         {
-            CheckForRequiredGameFiles();
+            string[] files = { "lithtech.exe", "AVP2X.REZ", "AVP2DLL.REZ", "AVP2L.REZ", "DIALOGUE.REZ", "AVP2P1.REZ", "AVP2P.REZ", "binkw32.dll", "MULTI.REZ", "server.dll", "ltmsg.dll", "binkw32.dll" };
 
-            if(!File.Exists(@"autoexec.cfg"))
+            for (int i = 0; i < files.Length; i++)
             {
-                _ConfigChoice = new ConfigChoice();
-                _ConfigChoice.ShowDialog();
+                if (!File.Exists(@files[i]))
+                {
+                    MessageBox.Show("No " + files[i] + " found. Please place the custom launcher in the directory with the game!", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    Close();
+                }
             }
 
-            if (!File.Exists(@"avp2cmds.txt"))
+            if (!File.Exists(@"widescreenfix.dll"))
             {
-                MessageBox.Show("No avp2cmds.txt found. The launcher will try to create it based on files in your current directory.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);
-                CreateGenericAVP2Cmds();
+                MessageBox.Show("Widescreenfix.dll has not been found. This file is required for Widescreen support.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
             }
-
-            _GraphicsSettings = new GameSettings(this);
         }
 
-        private void CheckForRequiredGameFiles()
+        private void CreateGenericAVP2Cmds()
         {
-            string[] files = { "lithtech.exe", "AVP2X.REZ", "AVP2DLL.REZ", "AVP2L.REZ", "DIALOGUE.REZ", "AVP2P1.REZ", "AVP2P.REZ", "binkw32.dll", "MULTI.REZ", "server.dll", "ltmsg.dll", "binkw32.dll"};
+            string basePath = "";
+            object key = Registry.GetValue("HKEY_LOCAL_MACHINE\\SOFTWARE\\Monolith Productions\\Aliens vs. Predator 2\\1.0", "InstallDir", "");
 
-            for (int i=0; i<files.Length; i++)
+            if (key != null)
             {
-                if (!File.Exists(@files[i]))
+                basePath = key.ToString();
+            }
+            else
+            {
+                MessageBox.Show("Launcher was not able to find the location of the base game. Please specify it manually.", "Notification", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                FolderBrowserDialog fld = new FolderBrowserDialog();
+                fld.ShowNewFolderButton = false;
+                fld.Description = "Select a folder where the base game is located.";
+                DialogResult result = fld.ShowDialog();
+
+                if (result == DialogResult.OK)
+                {
+                    basePath = fld.SelectedPath;
+                }
+                else
                 {
-                    MessageBox.Show("No " +files[i] + " found. Please place the custom launcher in the directory with the game!", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
                     Close();
                 }
             }
 
-            if (!File.Exists(@"widescreenfix.dll"))
+            string output = String.Format("-windowtitle \"Aliens versus Predator 2: Primal Hunt\" -rez \"{0}AVP2.rez\" -rez \"{0}sounds.rez\" -rez \"{0}Alien.rez\" -rez \"{0}Marine.rez\" -rez \"{0}Predator.rez\" -rez \"{0}Multi.rez\" -rez multi.rez -rez \"AVP2dll.rez\" -rez \"AVP2l.rez\" -rez dialogue.rez -rez avp2p.rez -rez avp2p1.rez -rez avp2x.rez -rez custom", basePath + "\\");
+
+            StreamWriter SW = new StreamWriter(@"avp2cmds.txt");
+            SW.WriteLine(output);
+            SW.Close();
+        }
+
+        private void setPositionFromConfig()
+        {
+            uint positionX = 0;
+            uint positionY = 0;
+            string[] setings = File.ReadAllLines("autoexecextended.cfg");
+            foreach (string line in setings)
             {
-                MessageBox.Show("Widescreenfix.dll has not been found. This file is required for Widescreen support.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                if (line.StartsWith("PositionX:"))
+                {
+                    positionX = parsePosition(line);
+                }
+                else if (line.StartsWith("PositionY:"))
+                {
+                    positionY = parsePosition(line);
+                }
+            }
+
+            if (checkIfPosIsCorrect(positionX, positionY))
+            {
+                this.StartPosition = FormStartPosition.Manual;
+                this.SetDesktopLocation((int)positionX, (int)positionY);
+            }
+            else
+            {
+                this.StartPosition = FormStartPosition.CenterScreen;
+            }
+        }
+        #endregion
+
+        #region EventHandlers
+        private void mainform_Load(object sender, EventArgs e)
+        {
+            CheckForRequiredGameFiles();
+
+            if (!File.Exists(@"autoexec.cfg"))
+            {
+                _ConfigChoice = new ConfigChoice();
+                _ConfigChoice.ShowDialog();
+            }
+
+            if (!File.Exists(@"avp2cmds.txt"))
+            {
+                MessageBox.Show("No avp2cmds.txt found. The launcher will try to create it based on files in your current directory.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                CreateGenericAVP2Cmds();
             }
+
+            _GraphicsSettings = new GameSettings(this);
         }
 
         private void B_StartGame_Click(object sender, EventArgs e)
@@ -74,7 +145,7 @@ private void B_StartGame_Click(object sender, EventArgs e)
             if (_GraphicsSettings.windowed)
                 cmdlineparamters = cmdlineparamters + " +windowed 1";
             else
-                cmdlineparamters = cmdlineparamters + " +windowed 0";  
+                cmdlineparamters = cmdlineparamters + " +windowed 0";
 
             if (_GraphicsSettings.disablesound)
                 cmdlineparamters = cmdlineparamters + " +DisableSound 1";
@@ -107,9 +178,6 @@ private void B_StartGame_Click(object sender, EventArgs e)
                 cmdlineparamters = cmdlineparamters + " +DisableHardwareCursor 0";
 
             cmdlineparamters = cmdlineparamters + " " + _GraphicsSettings.T_CommandLine.Text;
-                
-
-
 
             Thread GameHackThread = new Thread(_gamehack.DoWork);
             if (_GraphicsSettings.aspectratiohack)
@@ -119,25 +187,66 @@ private void B_StartGame_Click(object sender, EventArgs e)
             }
 
             try
-            {                
+            {
                 Process gameProcess = new Process();
                 gameProcess.StartInfo.FileName = "Lithtech.exe";
                 gameProcess.StartInfo.Arguments = cmdlineparamters;
                 gameProcess.EnableRaisingEvents = true;
                 this.WindowState = FormWindowState.Minimized;
-                
+
                 gameProcess.Start();
                 gameProcess.WaitForExit();
                 _gamehack.RequestStop();
                 this.Close();
             }
-            catch(Exception ex)
+            catch (Exception ex)
             {
                 Console.WriteLine("An error occurred!: " + ex.Message);
                 return;
             }
         }
 
+        private void mainform_FormClosing(object sender, FormClosingEventArgs e)
+        {
+            if (File.Exists("autoexecextended.cfg")) //well should have thought about this earlier... whatever
+            {
+                bool flagX = false;
+                bool flagY = false;
+                string[] settings = File.ReadAllLines("autoexecextended.cfg");
+                for (int i = 0; i < settings.Length; i++)
+                {
+                    if (settings[i].StartsWith("PositionX:"))
+                    {
+                        settings[i] = "PositionX:" + _posX.ToString();
+                        flagX = true;
+                    }
+                    else if (settings[i].StartsWith("PositionY:"))
+                    {
+                        settings[i] = "PositionY:" + _posY.ToString();
+                        flagY = true;
+                    }
+                }
+
+                string output = string.Join("\n", settings);
+
+                if (!flagX)
+                    output += "\nPositionX:" + this._posX.ToString();
+                if (!flagY)
+                    output += "\nPositionY:" + this._posY.ToString();
+
+                File.WriteAllText("autoexecextended.cfg", output);
+            }
+        }
+
+        private void mainform_LocationChanged(object sender, EventArgs e)
+        {
+            if (this.WindowState == FormWindowState.Normal)
+            {
+                _posX = this.DesktopLocation.X;
+                _posY = this.DesktopLocation.Y;
+            }
+        }
+
         private void B_DisplaySettings_Click(object sender, EventArgs e)
         {
             _GraphicsSettings.SetDesktopLocation(this.DesktopLocation.X + 10, this.DesktopLocation.Y + 10);
@@ -149,39 +258,38 @@ private void B_Exit_Click(object sender, EventArgs e)
             _gamehack.RequestStop();
             this.Close();
         }
+        #endregion
 
-        private void CreateGenericAVP2Cmds()
+        #region ParseFunctions
+        private uint parsePosition(string line)
         {
-            string basePath = "";
-            object key = Registry.GetValue("HKEY_LOCAL_MACHINE\\SOFTWARE\\Monolith Productions\\Aliens vs. Predator 2\\1.0", "InstallDir", "");
-
-            if(key != null)
+            uint outVal = 0;
+            string valText = line.Split(':')[1];
+            if (valText != String.Empty)
             {
-                basePath = key.ToString();
-            }
-            else
-            {
-                MessageBox.Show("Launcher was not able to find the location of the base game. Please specify it manually.", "Notification", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                FolderBrowserDialog fld = new FolderBrowserDialog();
-                fld.ShowNewFolderButton = false;
-                fld.Description = "Select a folder where the base game is located.";
-                DialogResult result = fld.ShowDialog();
-
-                if(result == DialogResult.OK)
+                if (uint.TryParse(valText, out outVal))
                 {
-                    basePath = fld.SelectedPath;
+                    return outVal;
                 }
                 else
-                {
-                    Close();
-                }
+                    return 0;
             }
-            
-            string output = String.Format("-windowtitle \"Aliens versus Predator 2: Primal Hunt\" -rez \"{0}AVP2.rez\" -rez \"{0}sounds.rez\" -rez \"{0}Alien.rez\" -rez \"{0}Marine.rez\" -rez \"{0}Predator.rez\" -rez \"{0}Multi.rez\" -rez multi.rez -rez \"AVP2dll.rez\" -rez \"AVP2l.rez\" -rez dialogue.rez -rez avp2p.rez -rez avp2p1.rez -rez avp2x.rez -rez custom", basePath + "\\");
-            
-            StreamWriter SW = new StreamWriter(@"avp2cmds.txt");
-            SW.WriteLine(output);
-            SW.Close();
+            else
+                return 0;
+        }
+
+        private bool checkIfPosIsCorrect(uint PosX, uint PosY)
+        {
+            Screen[] screens = Screen.AllScreens;
+            foreach (Screen screen in screens)
+            {
+                Rectangle scrRect = screen.WorkingArea;
+                if (PosX > scrRect.X && PosX < scrRect.X + scrRect.Width &&
+                    PosY > scrRect.Y && PosY < scrRect.Y + scrRect.Height)
+                    return true;
+            }
+            return false;
         }
+        #endregion
     }
 }
diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
index f6a9095..f88d491 100644
--- a/Properties/AssemblyInfo.cs
+++ b/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.6.0.0")]
-[assembly: AssemblyFileVersion("0.6.0.0")]
+[assembly: AssemblyVersion("0.6.1.0")]
+[assembly: AssemblyFileVersion("0.6.1.0")]
diff --git a/Release/AVP2PH_CustomLauncher.exe b/Release/AVP2PH_CustomLauncher.exe
index 9e31c06..ddaf03d 100644
Binary files a/Release/AVP2PH_CustomLauncher.exe and b/Release/AVP2PH_CustomLauncher.exe differ
diff --git a/Release/widescreenfix.dll b/Release/widescreenfix.dll
index cbfe09d..34b61e6 100644
Binary files a/Release/widescreenfix.dll and b/Release/widescreenfix.dll differ
diff --git a/SettingsForms/GameSettingsForm.cs b/SettingsForms/GameSettingsForm.cs
index 0338bde..9a131e9 100644
--- a/SettingsForms/GameSettingsForm.cs
+++ b/SettingsForms/GameSettingsForm.cs
@@ -40,6 +40,8 @@ public GameSettings(mainform parent)
             }
             else
                 readcustomconfig();
+
+            readfile();
         }
 
         
@@ -55,7 +57,6 @@ struct autoexecstruct
 
         private void GraphicsSettings_Load(object sender, EventArgs e)
         {
-            readfile();
         }
         
         public void readcustomconfig()
diff --git a/widescreenfix/Main.cpp b/widescreenfix/Main.cpp
index b790631..9dcad5c 100644
--- a/widescreenfix/Main.cpp
+++ b/widescreenfix/Main.cpp
@@ -32,7 +32,16 @@ bool Hook(void * toHook, void * ourFunction, int lenght)
 
 DWORD jmpResAddress;
 DWORD jmpFovAddress;
-float horizontalRadiansF;
+float horizontalRadiansF = 1.57f;
+float ViewmodelFOVF;
+DWORD jmpViewModelRet;
+bool d3drenHooked = false;
+
+static float modifyViewmodels(float val)
+{
+	float tempVradian = 2 * atanf(tanf(val / 2.0f) * ((float)resolutionY/resolutionX));
+	return (2.0f * atanf(tanf(tempVradian / 2.0f) * 1.333333f));
+}
 
 static float increaseHorFOV()
 {
@@ -40,6 +49,46 @@ static float increaseHorFOV()
 	return (2.0f * atanf(tanf(tempVradian / 2.0f) * aspectRatio));
 }
 
+void __declspec(naked) ViewModelHack()
+{
+	/*
+	"d3d.ren"+107F2:
+	fstp dword ptr [ebx+4C]
+	fld dword ptr [ebx+00000098]
+	*/
+	__asm
+	{
+		fstp dword ptr[ViewmodelFOVF]
+		push eax
+		push ebx
+		push ecx
+		push edx
+		push esi
+		push edi
+		push esp
+		push ebp
+	}
+
+	ViewmodelFOVF = modifyViewmodels(ViewmodelFOVF);
+	ViewmodelFOVF = modifyViewmodels(ViewmodelFOVF);
+
+	__asm
+	{
+		pop ebp
+		pop esp
+		pop edi
+		pop esi
+		pop edx
+		pop ecx
+		pop ebx
+		pop eax
+		fld dword ptr[ViewmodelFOVF]
+		fstp dword ptr[ebx + 0x4C]
+		fld dword ptr[ebx + 0x00000098]
+		jmp[jmpViewModelRet]
+	}
+}
+
 void __declspec(naked) fovHack()
 {
 	__asm
@@ -70,6 +119,7 @@ void __declspec(naked) fovHack()
 		jmp[jmpFovAddress]
 	}
 }
+
 void __declspec(naked) resHack()
 {
 	__asm
@@ -110,6 +160,27 @@ DWORD WINAPI HookThread(LPVOID param)
 	while (true)
 	{
 		aspectRatio = (float)(1.0 * resolutionX / resolutionY);
+		MODULEINFO d3dren = GetModuleInfo("d3d.ren");
+		if (d3dren.lpBaseOfDll == 0x0)
+		{
+			d3drenHooked = false;
+		}
+		else if(!d3drenHooked)
+		{
+			#ifdef _DEBUG
+			OutputDebugString("d3dRenHooked");
+			#endif // DEBUG
+
+			//ViewModel hack
+			//Overriding:
+			//fstp dword ptr [ebx+4C]
+			//fld dword ptr[ebx + 00000098]
+			int hookLenght = 9;
+			DWORD hookAddress = (DWORD)d3dren.lpBaseOfDll + 0x107F2; 		//Solve address = "cshell.dll"+64A0B
+			jmpViewModelRet = hookAddress + hookLenght;
+			Hook((void*)hookAddress, ViewModelHack, hookLenght);
+			d3drenHooked = true;
+		}
 		Sleep(400);
 	}
 }
diff --git a/widescreenfix/widescreenfix.vcxproj b/widescreenfix/widescreenfix.vcxproj
index ebf9961..5bf569e 100644
--- a/widescreenfix/widescreenfix.vcxproj
+++ b/widescreenfix/widescreenfix.vcxproj
@@ -120,7 +120,7 @@
       <IntrinsicFunctions>false</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;WIDESCREENFIX_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>