WebSVN – spk – Diff – //Creator/src/Forms/PackageForm.h

 			ofd->RestoreDirectory = true;
 			ofd->AddExtension =  true;
 			ofd->Title = "Select the archive to export to";
 			if ( ofd->ShowDialog(this) == Windows::Forms::DialogResult::OK )
+			{
-				if ( m_pPackage->SaveToArchive(CyStringFromSystemString(ofd->FileName), game) )
+				if ( m_pPackage->SaveToArchive(CyStringFromSystemString(ofd->FileName), game, m_pP->GetGameExe()) )
 					MessageBox::Show(this, "Package saved to archive, " + ofd->FileName, "Package Exported", MessageBoxButtons::OK, MessageBoxIcon::Information);
 				else
 					MessageBox::Show(this, "Unable to export to archive, " + ofd->FileName, "Export Failed", MessageBoxButtons::OK, MessageBoxIcon::Error);
+			}
+		}
 			this->toolStripButton4 = (gcnew System::Windows::Forms::ToolStripButton());
 			this->toolStripSeparator4 = (gcnew System::Windows::Forms::ToolStripSeparator());
 			this->ToolCustomise = (gcnew System::Windows::Forms::ToolStripButton());
 			this->toolTip1 = (gcnew System::Windows::Forms::ToolTip(this->components));
 			this->toolTip2 = (gcnew System::Windows::Forms::ToolTip(this->components));
-			(cli::safe_cast<System::ComponentModel::ISupportInitialize^  >(this->PicChange5))->BeginInit();
+			(cli::safe_cast<System::ComponentModel::ISupportInitialize^>(this->PicChange5))->BeginInit();
-			(cli::safe_cast<System::ComponentModel::ISupportInitialize^  >(this->PicChange1))->BeginInit();
+			(cli::safe_cast<System::ComponentModel::ISupportInitialize^>(this->PicChange1))->BeginInit();
-			(cli::safe_cast<System::ComponentModel::ISupportInitialize^  >(this->PicRec5))->BeginInit();
+			(cli::safe_cast<System::ComponentModel::ISupportInitialize^>(this->PicRec5))->BeginInit();
 			this->groupBox1->SuspendLayout();
 			this->ContextFiles->SuspendLayout();
 			this->panel6->SuspendLayout();
 			this->panel5->SuspendLayout();
 			this->tabControl1->SuspendLayout();
 			this->panel20->SuspendLayout();
 			this->panel18->SuspendLayout();
 			this->groupBox6->SuspendLayout();
 			this->panel17->SuspendLayout();
 			this->GroupChange->SuspendLayout();
-			(cli::safe_cast<System::ComponentModel::ISupportInitialize^  >(this->PicChange4))->BeginInit();
+			(cli::safe_cast<System::ComponentModel::ISupportInitialize^>(this->PicChange4))->BeginInit();
-			(cli::safe_cast<System::ComponentModel::ISupportInitialize^  >(this->PicChange3))->BeginInit();
+			(cli::safe_cast<System::ComponentModel::ISupportInitialize^>(this->PicChange3))->BeginInit();
-			(cli::safe_cast<System::ComponentModel::ISupportInitialize^  >(this->PicChange2))->BeginInit();
+			(cli::safe_cast<System::ComponentModel::ISupportInitialize^>(this->PicChange2))->BeginInit();
 			this->GroupRec->SuspendLayout();
-			(cli::safe_cast<System::ComponentModel::ISupportInitialize^  >(this->PicRec4))->BeginInit();
+			(cli::safe_cast<System::ComponentModel::ISupportInitialize^>(this->PicRec4))->BeginInit();
-			(cli::safe_cast<System::ComponentModel::ISupportInitialize^  >(this->PicRec3))->BeginInit();
+			(cli::safe_cast<System::ComponentModel::ISupportInitialize^>(this->PicRec3))->BeginInit();
-			(cli::safe_cast<System::ComponentModel::ISupportInitialize^  >(this->PicRec2))->BeginInit();
+			(cli::safe_cast<System::ComponentModel::ISupportInitialize^>(this->PicRec2))->BeginInit();
-			(cli::safe_cast<System::ComponentModel::ISupportInitialize^  >(this->PicRec1))->BeginInit();
+			(cli::safe_cast<System::ComponentModel::ISupportInitialize^>(this->PicRec1))->BeginInit();
 			this->GroupEase->SuspendLayout();
-			(cli::safe_cast<System::ComponentModel::ISupportInitialize^  >(this->PicEase5))->BeginInit();
+			(cli::safe_cast<System::ComponentModel::ISupportInitialize^>(this->PicEase5))->BeginInit();
-			(cli::safe_cast<System::ComponentModel::ISupportInitialize^  >(this->PicEase4))->BeginInit();
+			(cli::safe_cast<System::ComponentModel::ISupportInitialize^>(this->PicEase4))->BeginInit();
-			(cli::safe_cast<System::ComponentModel::ISupportInitialize^  >(this->PicEase3))->BeginInit();
+			(cli::safe_cast<System::ComponentModel::ISupportInitialize^>(this->PicEase3))->BeginInit();
-			(cli::safe_cast<System::ComponentModel::ISupportInitialize^  >(this->PicEase2))->BeginInit();
+			(cli::safe_cast<System::ComponentModel::ISupportInitialize^>(this->PicEase2))->BeginInit();
-			(cli::safe_cast<System::ComponentModel::ISupportInitialize^  >(this->PicEase1))->BeginInit();
+			(cli::safe_cast<System::ComponentModel::ISupportInitialize^>(this->PicEase1))->BeginInit();
 			this->groupBox5->SuspendLayout();
-			(cli::safe_cast<System::ComponentModel::ISupportInitialize^  >(this->DisplayIcon))->BeginInit();
+			(cli::safe_cast<System::ComponentModel::ISupportInitialize^>(this->DisplayIcon))->BeginInit();
 			this->panel15->SuspendLayout();
-			(cli::safe_cast<System::ComponentModel::ISupportInitialize^  >(this->DisplayPicture))->BeginInit();
+			(cli::safe_cast<System::ComponentModel::ISupportInitialize^>(this->DisplayPicture))->BeginInit();
 			this->panel16->SuspendLayout();
 			this->tabPage2->SuspendLayout();
 			this->ContextLangName->SuspendLayout();
 			this->groupBox4->SuspendLayout();
 			this->ContextMirror->SuspendLayout();
 			this->panel14->SuspendLayout();
 			this->tabPage4->SuspendLayout();
 			this->ContextDep->SuspendLayout();
 			this->PageWares->SuspendLayout();
+			(cli::safe_cast<System::ComponentModel::ISupportInitialize^>(this->splitContainer1))->BeginInit();
 			this->splitContainer1->Panel1->SuspendLayout();
 			this->splitContainer1->Panel2->SuspendLayout();
 			this->splitContainer1->SuspendLayout();
 			this->ContextWare->SuspendLayout();
 			this->ContextWareText->SuspendLayout();
 			this->PageShip->SuspendLayout();
 			this->ContextShipText->SuspendLayout();
 			this->PanelTextID->SuspendLayout();
-			(cli::safe_cast<System::ComponentModel::ISupportInitialize^  >(this->NumTextID))->BeginInit();
+			(cli::safe_cast<System::ComponentModel::ISupportInitialize^>(this->NumTextID))->BeginInit();
 			this->flowLayoutPanel2->SuspendLayout();
 			this->PageRaw->SuspendLayout();
 			this->panel23->SuspendLayout();
 			this->panel24->SuspendLayout();
 			this->flowLayoutPanel3->SuspendLayout();
 			this->SuspendLayout();
 			//
 			// PicChange5
 			//
 			this->PicChange5->Dock = System::Windows::Forms::DockStyle::Left;
-			this->PicChange5->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"PicChange5.Image")));
+			this->PicChange5->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"PicChange5.Image")));
-			this->PicChange5->Location = System::Drawing::Point(99, 16);
+			this->PicChange5->Location = System::Drawing::Point(132, 19);
+			this->PicChange5->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->PicChange5->Name = L"PicChange5";
-			this->PicChange5->Size = System::Drawing::Size(24, 25);
+			this->PicChange5->Size = System::Drawing::Size(32, 32);
 			this->PicChange5->SizeMode = System::Windows::Forms::PictureBoxSizeMode::StretchImage;
 			this->PicChange5->TabIndex = 18;
 			this->PicChange5->TabStop = false;
 			this->PicChange5->Click += gcnew System::EventHandler(this, &PackageForm::PicChange5_Click);
 			//
 			// PicChange1
 			//
 			this->PicChange1->Dock = System::Windows::Forms::DockStyle::Left;
-			this->PicChange1->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"PicChange1.Image")));
+			this->PicChange1->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"PicChange1.Image")));
-			this->PicChange1->Location = System::Drawing::Point(3, 16);
+			this->PicChange1->Location = System::Drawing::Point(4, 19);
+			this->PicChange1->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->PicChange1->Name = L"PicChange1";
-			this->PicChange1->Size = System::Drawing::Size(24, 25);
+			this->PicChange1->Size = System::Drawing::Size(32, 32);
 			this->PicChange1->SizeMode = System::Windows::Forms::PictureBoxSizeMode::StretchImage;
 			this->PicChange1->TabIndex = 14;
 			this->PicChange1->TabStop = false;
 			this->PicChange1->Click += gcnew System::EventHandler(this, &PackageForm::PicChange1_Click);
 			//
 			// PicRec5
 			//
 			this->PicRec5->Dock = System::Windows::Forms::DockStyle::Left;
-			this->PicRec5->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"PicRec5.Image")));
+			this->PicRec5->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"PicRec5.Image")));
-			this->PicRec5->Location = System::Drawing::Point(99, 16);
+			this->PicRec5->Location = System::Drawing::Point(132, 19);
+			this->PicRec5->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->PicRec5->Name = L"PicRec5";
-			this->PicRec5->Size = System::Drawing::Size(24, 25);
+			this->PicRec5->Size = System::Drawing::Size(32, 32);
 			this->PicRec5->SizeMode = System::Windows::Forms::PictureBoxSizeMode::StretchImage;
 			this->PicRec5->TabIndex = 18;
 			this->PicRec5->TabStop = false;
 			this->PicRec5->Click += gcnew System::EventHandler(this, &PackageForm::PicRec5_Click);
 			//
 			//
 			this->groupBox1->Controls->Add(this->ListFiles);
 			this->groupBox1->Controls->Add(this->panel6);
 			this->groupBox1->Controls->Add(this->panel5);
 			this->groupBox1->Dock = System::Windows::Forms::DockStyle::Fill;
-			this->groupBox1->Location = System::Drawing::Point(5, 375);
+			this->groupBox1->Location = System::Drawing::Point(7, 456);
+			this->groupBox1->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->groupBox1->Name = L"groupBox1";
+			this->groupBox1->Padding = System::Windows::Forms::Padding(4, 4, 4, 4);
-			this->groupBox1->Size = System::Drawing::Size(756, 330);
+			this->groupBox1->Size = System::Drawing::Size(1007, 412);
 			this->groupBox1->TabIndex = 0;
 			this->groupBox1->TabStop = false;
 			this->groupBox1->Text = L"Files";
 			//
 			// ListFiles
 			//
 			this->ListFiles->AllowDrop = true;
-			this->ListFiles->Columns->AddRange(gcnew cli::array< System::Windows::Forms::ColumnHeader^  >(7) {this->columnHeader1, this->columnHeader2,
+			this->ListFiles->Columns->AddRange(gcnew cli::array< System::Windows::Forms::ColumnHeader^  >(7) {
+				this->columnHeader1, this->columnHeader2,
-				this->columnHeader3, this->columnHeader4, this->columnHeader5, this->columnHeader25, this->columnHeader28});
+					this->columnHeader3, this->columnHeader4, this->columnHeader5, this->columnHeader25, this->columnHeader28
+			});
 			this->ListFiles->ContextMenuStrip = this->ContextFiles;
 			this->ListFiles->Dock = System::Windows::Forms::DockStyle::Fill;
 			this->ListFiles->FullRowSelect = true;
 			this->ListFiles->HideSelection = false;
-			this->ListFiles->Location = System::Drawing::Point(3, 41);
+			this->ListFiles->Location = System::Drawing::Point(4, 50);
+			this->ListFiles->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->ListFiles->Name = L"ListFiles";
-			this->ListFiles->Size = System::Drawing::Size(750, 246);
+			this->ListFiles->Size = System::Drawing::Size(999, 309);
 			this->ListFiles->Sorting = System::Windows::Forms::SortOrder::Ascending;
 			this->ListFiles->TabIndex = 1;
 			this->ListFiles->UseCompatibleStateImageBehavior = false;
 			this->ListFiles->View = System::Windows::Forms::View::Details;
-			this->ListFiles->MouseDoubleClick += gcnew System::Windows::Forms::MouseEventHandler(this, &PackageForm::ListFiles_MouseDoubleClick);
 			this->ListFiles->SelectedIndexChanged += gcnew System::EventHandler(this, &PackageForm::ListFiles_SelectedIndexChanged);
 			this->ListFiles->DragDrop += gcnew System::Windows::Forms::DragEventHandler(this, &PackageForm::ListFiles_DragDrop);
 			this->ListFiles->DragOver += gcnew System::Windows::Forms::DragEventHandler(this, &PackageForm::ListFiles_DragOver);
+			this->ListFiles->MouseDoubleClick += gcnew System::Windows::Forms::MouseEventHandler(this, &PackageForm::ListFiles_MouseDoubleClick);
 			//
 			// columnHeader1
 			//
 			this->columnHeader1->Text = L"";
 			this->columnHeader1->Width = 53;
 			//
 			this->columnHeader28->Text = L"Game";
 			//
 			// ContextFiles
 			//
+			this->ContextFiles->ImageScalingSize = System::Drawing::Size(20, 20);
-			this->ContextFiles->Items->AddRange(gcnew cli::array< System::Windows::Forms::ToolStripItem^  >(14) {this->addFileToolStripMenuItem,
+			this->ContextFiles->Items->AddRange(gcnew cli::array< System::Windows::Forms::ToolStripItem^  >(14) {
+				this->addFileToolStripMenuItem,
-				this->ContextFileSep1, this->ContextFileEdit, this->ContextFileDelete, this->renameFileToolStripMenuItem, this->toolStripSeparator5,
+					this->ContextFileSep1, this->ContextFileEdit, this->ContextFileDelete, this->renameFileToolStripMenuItem, this->toolStripSeparator5,
-				this->ToolGame, this->packFileToolStripMenuItem, this->unpackFileToolStripMenuItem, this->convertToFakePatchToolStripMenuItem,
+					this->ToolGame, this->packFileToolStripMenuItem, this->unpackFileToolStripMenuItem, this->convertToFakePatchToolStripMenuItem,
-				this->convertToAutoTextFileToolStripMenuItem, this->convertToNormalModToolStripMenuItem, this->ContextFileSep2, this->ContextFileClear});
+					this->convertToAutoTextFileToolStripMenuItem, this->convertToNormalModToolStripMenuItem, this->ContextFileSep2, this->ContextFileClear
+			});
 			this->ContextFiles->Name = L"ContextFiles";
-			this->ContextFiles->Size = System::Drawing::Size(225, 440);
+			this->ContextFiles->Size = System::Drawing::Size(260, 440);
 			this->ContextFiles->Opening += gcnew System::ComponentModel::CancelEventHandler(this, &PackageForm::ContextFiles_Opening);
 			//
 			// addFileToolStripMenuItem
 			//
-			this->addFileToolStripMenuItem->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"addFileToolStripMenuItem.Image")));
+			this->addFileToolStripMenuItem->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"addFileToolStripMenuItem.Image")));
 			this->addFileToolStripMenuItem->ImageScaling = System::Windows::Forms::ToolStripItemImageScaling::None;
 			this->addFileToolStripMenuItem->Name = L"addFileToolStripMenuItem";
-			this->addFileToolStripMenuItem->Size = System::Drawing::Size(224, 38);
+			this->addFileToolStripMenuItem->Size = System::Drawing::Size(259, 38);
 			this->addFileToolStripMenuItem->Text = L"Add File";
 			this->addFileToolStripMenuItem->Click += gcnew System::EventHandler(this, &PackageForm::addFileToolStripMenuItem_Click);
 			//
 			// ContextFileSep1
 			//
 			this->ContextFileSep1->Name = L"ContextFileSep1";
-			this->ContextFileSep1->Size = System::Drawing::Size(221, 6);
+			this->ContextFileSep1->Size = System::Drawing::Size(256, 6);
 			//
 			// ContextFileEdit
 			//
-			this->ContextFileEdit->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"ContextFileEdit.Image")));
+			this->ContextFileEdit->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"ContextFileEdit.Image")));
 			this->ContextFileEdit->ImageScaling = System::Windows::Forms::ToolStripItemImageScaling::None;
 			this->ContextFileEdit->Name = L"ContextFileEdit";
-			this->ContextFileEdit->Size = System::Drawing::Size(224, 38);
+			this->ContextFileEdit->Size = System::Drawing::Size(259, 38);
 			this->ContextFileEdit->Text = L"Edit Directory";
 			this->ContextFileEdit->Click += gcnew System::EventHandler(this, &PackageForm::ContextFileEdit_Click);
 			//
 			// ContextFileDelete
 			//
-			this->ContextFileDelete->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"ContextFileDelete.Image")));
+			this->ContextFileDelete->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"ContextFileDelete.Image")));
 			this->ContextFileDelete->ImageScaling = System::Windows::Forms::ToolStripItemImageScaling::None;
 			this->ContextFileDelete->Name = L"ContextFileDelete";
-			this->ContextFileDelete->Size = System::Drawing::Size(224, 38);
+			this->ContextFileDelete->Size = System::Drawing::Size(259, 38);
 			this->ContextFileDelete->Text = L"Remove Selected";
 			this->ContextFileDelete->Click += gcnew System::EventHandler(this, &PackageForm::ContextFileDelete_Click);
 			//
 			// renameFileToolStripMenuItem
 			//
-			this->renameFileToolStripMenuItem->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"renameFileToolStripMenuItem.Image")));
+			this->renameFileToolStripMenuItem->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"renameFileToolStripMenuItem.Image")));
 			this->renameFileToolStripMenuItem->ImageScaling = System::Windows::Forms::ToolStripItemImageScaling::None;
 			this->renameFileToolStripMenuItem->Name = L"renameFileToolStripMenuItem";
-			this->renameFileToolStripMenuItem->Size = System::Drawing::Size(224, 38);
+			this->renameFileToolStripMenuItem->Size = System::Drawing::Size(259, 38);
 			this->renameFileToolStripMenuItem->Text = L"Rename File";
 			this->renameFileToolStripMenuItem->Click += gcnew System::EventHandler(this, &PackageForm::renameFileToolStripMenuItem_Click);
 			//
 			// toolStripSeparator5
 			//
 			this->toolStripSeparator5->Name = L"toolStripSeparator5";
-			this->toolStripSeparator5->Size = System::Drawing::Size(221, 6);
+			this->toolStripSeparator5->Size = System::Drawing::Size(256, 6);
 			//
 			// ToolGame
 			//
-			this->ToolGame->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"ToolGame.Image")));
+			this->ToolGame->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"ToolGame.Image")));
 			this->ToolGame->ImageScaling = System::Windows::Forms::ToolStripItemImageScaling::None;
 			this->ToolGame->Name = L"ToolGame";
-			this->ToolGame->Size = System::Drawing::Size(224, 38);
+			this->ToolGame->Size = System::Drawing::Size(259, 38);
 			this->ToolGame->Text = L"Set Game";
 			//
 			// packFileToolStripMenuItem
 			//
-			this->packFileToolStripMenuItem->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"packFileToolStripMenuItem.Image")));
+			this->packFileToolStripMenuItem->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"packFileToolStripMenuItem.Image")));
 			this->packFileToolStripMenuItem->ImageScaling = System::Windows::Forms::ToolStripItemImageScaling::None;
 			this->packFileToolStripMenuItem->Name = L"packFileToolStripMenuItem";
-			this->packFileToolStripMenuItem->Size = System::Drawing::Size(224, 38);
+			this->packFileToolStripMenuItem->Size = System::Drawing::Size(259, 38);
 			this->packFileToolStripMenuItem->Text = L"Pack File";
 			this->packFileToolStripMenuItem->Click += gcnew System::EventHandler(this, &PackageForm::packFileToolStripMenuItem_Click);
 			//
 			// unpackFileToolStripMenuItem
 			//
-			this->unpackFileToolStripMenuItem->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"unpackFileToolStripMenuItem.Image")));
+			this->unpackFileToolStripMenuItem->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"unpackFileToolStripMenuItem.Image")));
 			this->unpackFileToolStripMenuItem->ImageScaling = System::Windows::Forms::ToolStripItemImageScaling::None;
 			this->unpackFileToolStripMenuItem->Name = L"unpackFileToolStripMenuItem";
-			this->unpackFileToolStripMenuItem->Size = System::Drawing::Size(224, 38);
+			this->unpackFileToolStripMenuItem->Size = System::Drawing::Size(259, 38);
 			this->unpackFileToolStripMenuItem->Text = L"Unpack File";
 			this->unpackFileToolStripMenuItem->Click += gcnew System::EventHandler(this, &PackageForm::unpackFileToolStripMenuItem_Click);
 			//
 			// convertToFakePatchToolStripMenuItem
 			//
-			this->convertToFakePatchToolStripMenuItem->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"convertToFakePatchToolStripMenuItem.Image")));
+			this->convertToFakePatchToolStripMenuItem->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"convertToFakePatchToolStripMenuItem.Image")));
 			this->convertToFakePatchToolStripMenuItem->ImageScaling = System::Windows::Forms::ToolStripItemImageScaling::None;
 			this->convertToFakePatchToolStripMenuItem->Name = L"convertToFakePatchToolStripMenuItem";
-			this->convertToFakePatchToolStripMenuItem->Size = System::Drawing::Size(224, 38);
+			this->convertToFakePatchToolStripMenuItem->Size = System::Drawing::Size(259, 38);
 			this->convertToFakePatchToolStripMenuItem->Text = L"Convert To Fake Patch";
 			this->convertToFakePatchToolStripMenuItem->Click += gcnew System::EventHandler(this, &PackageForm::convertToFakePatchToolStripMenuItem_Click);
 			//
 			// convertToAutoTextFileToolStripMenuItem
 			//
-			this->convertToAutoTextFileToolStripMenuItem->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"convertToAutoTextFileToolStripMenuItem.Image")));
+			this->convertToAutoTextFileToolStripMenuItem->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"convertToAutoTextFileToolStripMenuItem.Image")));
 			this->convertToAutoTextFileToolStripMenuItem->ImageScaling = System::Windows::Forms::ToolStripItemImageScaling::None;
 			this->convertToAutoTextFileToolStripMenuItem->Name = L"convertToAutoTextFileToolStripMenuItem";
-			this->convertToAutoTextFileToolStripMenuItem->Size = System::Drawing::Size(224, 38);
+			this->convertToAutoTextFileToolStripMenuItem->Size = System::Drawing::Size(259, 38);
 			this->convertToAutoTextFileToolStripMenuItem->Text = L"Convert To Auto Text File";
 			this->convertToAutoTextFileToolStripMenuItem->Click += gcnew System::EventHandler(this, &PackageForm::convertToAutoTextFileToolStripMenuItem_Click);
 			//
 			// convertToNormalModToolStripMenuItem
 			//
-			this->convertToNormalModToolStripMenuItem->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"convertToNormalModToolStripMenuItem.Image")));
+			this->convertToNormalModToolStripMenuItem->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"convertToNormalModToolStripMenuItem.Image")));
 			this->convertToNormalModToolStripMenuItem->ImageScaling = System::Windows::Forms::ToolStripItemImageScaling::None;
 			this->convertToNormalModToolStripMenuItem->Name = L"convertToNormalModToolStripMenuItem";
-			this->convertToNormalModToolStripMenuItem->Size = System::Drawing::Size(224, 38);
+			this->convertToNormalModToolStripMenuItem->Size = System::Drawing::Size(259, 38);
 			this->convertToNormalModToolStripMenuItem->Text = L"Convert To Normal Mod";
 			this->convertToNormalModToolStripMenuItem->Click += gcnew System::EventHandler(this, &PackageForm::convertToNormalModToolStripMenuItem_Click);
 			//
 			// ContextFileSep2
 			//
 			this->ContextFileSep2->Name = L"ContextFileSep2";
-			this->ContextFileSep2->Size = System::Drawing::Size(221, 6);
+			this->ContextFileSep2->Size = System::Drawing::Size(256, 6);
 			//
 			// ContextFileClear
 			//
-			this->ContextFileClear->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"ContextFileClear.Image")));
+			this->ContextFileClear->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"ContextFileClear.Image")));
 			this->ContextFileClear->ImageScaling = System::Windows::Forms::ToolStripItemImageScaling::None;
 			this->ContextFileClear->Name = L"ContextFileClear";
-			this->ContextFileClear->Size = System::Drawing::Size(224, 38);
+			this->ContextFileClear->Size = System::Drawing::Size(259, 38);
 			this->ContextFileClear->Text = L"Clear All";
 			this->ContextFileClear->Click += gcnew System::EventHandler(this, &PackageForm::ContextFileClear_Click);
 			//
 			// panel6
 			//
 			this->panel6->Controls->Add(this->ButRemoveFile);
 			this->panel6->Controls->Add(this->button2);
 			this->panel6->Controls->Add(this->button1);
 			this->panel6->Dock = System::Windows::Forms::DockStyle::Bottom;
-			this->panel6->Location = System::Drawing::Point(3, 287);
+			this->panel6->Location = System::Drawing::Point(4, 359);
+			this->panel6->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->panel6->Name = L"panel6";
-			this->panel6->Padding = System::Windows::Forms::Padding(5);
+			this->panel6->Padding = System::Windows::Forms::Padding(7, 6, 7, 6);
-			this->panel6->Size = System::Drawing::Size(750, 40);
+			this->panel6->Size = System::Drawing::Size(999, 49);
 			this->panel6->TabIndex = 2;
 			//
 			// ButRemoveFile
 			//
 			this->ButRemoveFile->Dock = System::Windows::Forms::DockStyle::Right;
-			this->ButRemoveFile->Location = System::Drawing::Point(492, 5);
+			this->ButRemoveFile->Location = System::Drawing::Point(655, 6);
+			this->ButRemoveFile->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->ButRemoveFile->Name = L"ButRemoveFile";
-			this->ButRemoveFile->Size = System::Drawing::Size(130, 30);
+			this->ButRemoveFile->Size = System::Drawing::Size(173, 37);
 			this->ButRemoveFile->TabIndex = 2;
 			this->ButRemoveFile->Text = L"Remove Selected";
 			this->ButRemoveFile->UseVisualStyleBackColor = true;
 			this->ButRemoveFile->Click += gcnew System::EventHandler(this, &PackageForm::ButRemoveFile_Click);
 			//
 			// button2
 			//
 			this->button2->Dock = System::Windows::Forms::DockStyle::Right;
-			this->button2->Location = System::Drawing::Point(622, 5);
+			this->button2->Location = System::Drawing::Point(828, 6);
+			this->button2->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->button2->Name = L"button2";
-			this->button2->Size = System::Drawing::Size(123, 30);
+			this->button2->Size = System::Drawing::Size(164, 37);
 			this->button2->TabIndex = 1;
 			this->button2->Text = L"Clear All";
 			this->button2->UseVisualStyleBackColor = true;
 			this->button2->Click += gcnew System::EventHandler(this, &PackageForm::button2_Click);
 			//
 			// button1
 			//
 			this->button1->Dock = System::Windows::Forms::DockStyle::Left;
-			this->button1->Location = System::Drawing::Point(5, 5);
+			this->button1->Location = System::Drawing::Point(7, 6);
+			this->button1->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->button1->Name = L"button1";
-			this->button1->Size = System::Drawing::Size(113, 30);
+			this->button1->Size = System::Drawing::Size(151, 37);
 			this->button1->TabIndex = 0;
 			this->button1->Text = L"Add File(s)";
 			this->button1->UseVisualStyleBackColor = true;
 			this->button1->Click += gcnew System::EventHandler(this, &PackageForm::button1_Click);
 			//
 			//
 			this->panel5->Controls->Add(this->ComboFileType);
 			this->panel5->Controls->Add(this->ComboGameFilter);
 			this->panel5->Controls->Add(this->label5);
 			this->panel5->Dock = System::Windows::Forms::DockStyle::Top;
-			this->panel5->Location = System::Drawing::Point(3, 16);
+			this->panel5->Location = System::Drawing::Point(4, 19);
+			this->panel5->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->panel5->Name = L"panel5";
-			this->panel5->Size = System::Drawing::Size(750, 25);
+			this->panel5->Size = System::Drawing::Size(999, 31);
 			this->panel5->TabIndex = 0;
 			//
 			// ComboFileType
 			//
 			this->ComboFileType->Dock = System::Windows::Forms::DockStyle::Fill;
 			this->ComboFileType->DropDownStyle = System::Windows::Forms::ComboBoxStyle::DropDownList;
 			this->ComboFileType->FormattingEnabled = true;
-			this->ComboFileType->Location = System::Drawing::Point(100, 0);
+			this->ComboFileType->Location = System::Drawing::Point(133, 0);
+			this->ComboFileType->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->ComboFileType->Name = L"ComboFileType";
-			this->ComboFileType->Size = System::Drawing::Size(444, 21);
+			this->ComboFileType->Size = System::Drawing::Size(593, 24);
 			this->ComboFileType->TabIndex = 1;
 			this->ComboFileType->SelectedIndexChanged += gcnew System::EventHandler(this, &PackageForm::ComboFileType_SelectedIndexChanged);
 			//
 			// ComboGameFilter
 			//
 			this->ComboGameFilter->Dock = System::Windows::Forms::DockStyle::Right;
 			this->ComboGameFilter->DropDownStyle = System::Windows::Forms::ComboBoxStyle::DropDownList;
 			this->ComboGameFilter->FormattingEnabled = true;
-			this->ComboGameFilter->Location = System::Drawing::Point(544, 0);
+			this->ComboGameFilter->Location = System::Drawing::Point(726, 0);
+			this->ComboGameFilter->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->ComboGameFilter->Name = L"ComboGameFilter";
-			this->ComboGameFilter->Size = System::Drawing::Size(206, 21);
+			this->ComboGameFilter->Size = System::Drawing::Size(273, 24);
 			this->ComboGameFilter->TabIndex = 2;
 			this->ComboGameFilter->SelectedIndexChanged += gcnew System::EventHandler(this, &PackageForm::ComboGameFilter_SelectedIndexChanged);
 			//
 			// label5
 			//
 			this->label5->Dock = System::Windows::Forms::DockStyle::Left;
 			this->label5->Font = (gcnew System::Drawing::Font(L"Microsoft Sans Serif", 9.75F, System::Drawing::FontStyle::Bold, System::Drawing::GraphicsUnit::Point,
 				static_cast<System::Byte>(0)));
 			this->label5->Location = System::Drawing::Point(0, 0);
+			this->label5->Margin = System::Windows::Forms::Padding(4, 0, 4, 0);
 			this->label5->Name = L"label5";
-			this->label5->Size = System::Drawing::Size(100, 25);
+			this->label5->Size = System::Drawing::Size(133, 31);
 			this->label5->TabIndex = 0;
 			this->label5->Text = L"Filters";
 			this->label5->TextAlign = System::Drawing::ContentAlignment::MiddleLeft;
 			//
 			// tabControl1
 			this->tabControl1->Controls->Add(this->PageWares);
 			this->tabControl1->Controls->Add(this->PageShip);
 			this->tabControl1->Controls->Add(this->PageRaw);
 			this->tabControl1->Controls->Add(this->PageShipComp);
 			this->tabControl1->Dock = System::Windows::Forms::DockStyle::Top;
-			this->tabControl1->Location = System::Drawing::Point(5, 133);
+			this->tabControl1->Location = System::Drawing::Point(7, 158);
-			this->tabControl1->Margin = System::Windows::Forms::Padding(6);
+			this->tabControl1->Margin = System::Windows::Forms::Padding(8, 7, 8, 7);
 			this->tabControl1->Multiline = true;
 			this->tabControl1->Name = L"tabControl1";
 			this->tabControl1->SelectedIndex = 0;
-			this->tabControl1->Size = System::Drawing::Size(756, 242);
+			this->tabControl1->Size = System::Drawing::Size(1007, 298);
 			this->tabControl1->TabIndex = 1;
 			//
 			// tabPage1
 			//
 			this->tabPage1->Controls->Add(this->groupBox2);
 			this->tabPage1->Controls->Add(this->panel13);
 			this->tabPage1->Controls->Add(this->panel12);
 			this->tabPage1->Controls->Add(this->panel11);
 			this->tabPage1->Controls->Add(this->LabelShipWarning);
-			this->tabPage1->Location = System::Drawing::Point(4, 22);
+			this->tabPage1->Location = System::Drawing::Point(4, 25);
+			this->tabPage1->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->tabPage1->Name = L"tabPage1";
-			this->tabPage1->Padding = System::Windows::Forms::Padding(8);
+			this->tabPage1->Padding = System::Windows::Forms::Padding(11, 10, 11, 10);
-			this->tabPage1->Size = System::Drawing::Size(748, 216);
+			this->tabPage1->Size = System::Drawing::Size(999, 269);
 			this->tabPage1->TabIndex = 0;
 			this->tabPage1->Text = L"Basic Settings";
 			this->tabPage1->UseVisualStyleBackColor = true;
 			//
 			// groupBox2
 			//
 			this->groupBox2->Controls->Add(this->TextDesc);
 			this->groupBox2->Dock = System::Windows::Forms::DockStyle::Fill;
-			this->groupBox2->Location = System::Drawing::Point(8, 89);
+			this->groupBox2->Location = System::Drawing::Point(11, 109);
+			this->groupBox2->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->groupBox2->Name = L"groupBox2";
-			this->groupBox2->Padding = System::Windows::Forms::Padding(5);
+			this->groupBox2->Padding = System::Windows::Forms::Padding(7, 6, 7, 6);
-			this->groupBox2->Size = System::Drawing::Size(732, 119);
+			this->groupBox2->Size = System::Drawing::Size(977, 150);
 			this->groupBox2->TabIndex = 1;
 			this->groupBox2->TabStop = false;
 			this->groupBox2->Text = L"Description";
 			//
 			// TextDesc
 			//
 			this->TextDesc->Dock = System::Windows::Forms::DockStyle::Fill;
-			this->TextDesc->Location = System::Drawing::Point(5, 18);
+			this->TextDesc->Location = System::Drawing::Point(7, 21);
+			this->TextDesc->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->TextDesc->Name = L"TextDesc";
-			this->TextDesc->Size = System::Drawing::Size(722, 96);
+			this->TextDesc->Size = System::Drawing::Size(963, 123);
 			this->TextDesc->TabIndex = 0;
 			this->TextDesc->Text = L"";
 			this->TextDesc->TextChanged += gcnew System::EventHandler(this, &PackageForm::TextDesc_TextChanged);
 			//
 			// panel13
 			//
 			this->panel13->Controls->Add(this->TextForum);
 			this->panel13->Controls->Add(this->label11);
 			this->panel13->Dock = System::Windows::Forms::DockStyle::Top;
-			this->panel13->Location = System::Drawing::Point(8, 67);
+			this->panel13->Location = System::Drawing::Point(11, 82);
+			this->panel13->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->panel13->Name = L"panel13";
-			this->panel13->Size = System::Drawing::Size(732, 22);
+			this->panel13->Size = System::Drawing::Size(977, 27);
 			this->panel13->TabIndex = 46;
 			//
 			// TextForum
 			//
 			this->TextForum->DetectUrls = false;
 			this->TextForum->Dock = System::Windows::Forms::DockStyle::Fill;
-			this->TextForum->Location = System::Drawing::Point(125, 0);
+			this->TextForum->Location = System::Drawing::Point(167, 0);
+			this->TextForum->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->TextForum->Name = L"TextForum";
-			this->TextForum->Size = System::Drawing::Size(607, 22);
+			this->TextForum->Size = System::Drawing::Size(810, 27);
 			this->TextForum->TabIndex = 43;
 			this->TextForum->Text = L"";
 			this->TextForum->TextChanged += gcnew System::EventHandler(this, &PackageForm::TextForum_TextChanged);
 			//
 			// label11
 			//
 			this->label11->Dock = System::Windows::Forms::DockStyle::Left;
 			this->label11->Font = (gcnew System::Drawing::Font(L"Microsoft Sans Serif", 9.75F, System::Drawing::FontStyle::Bold, System::Drawing::GraphicsUnit::Point,
 				static_cast<System::Byte>(0)));
 			this->label11->Location = System::Drawing::Point(0, 0);
+			this->label11->Margin = System::Windows::Forms::Padding(4, 0, 4, 0);
 			this->label11->Name = L"label11";
-			this->label11->Size = System::Drawing::Size(125, 22);
+			this->label11->Size = System::Drawing::Size(167, 27);
 			this->label11->TabIndex = 42;
 			this->label11->Text = L"Forum Link";
 			//
 			// panel12
 			//
 			this->panel12->Controls->Add(this->TextEmail);
 			this->panel12->Controls->Add(this->label10);
 			this->panel12->Dock = System::Windows::Forms::DockStyle::Top;
-			this->panel12->Location = System::Drawing::Point(8, 45);
+			this->panel12->Location = System::Drawing::Point(11, 55);
+			this->panel12->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->panel12->Name = L"panel12";
-			this->panel12->Size = System::Drawing::Size(732, 22);
+			this->panel12->Size = System::Drawing::Size(977, 27);
 			this->panel12->TabIndex = 45;
 			//
 			// TextEmail
 			//
 			this->TextEmail->DetectUrls = false;
 			this->TextEmail->Dock = System::Windows::Forms::DockStyle::Fill;
-			this->TextEmail->Location = System::Drawing::Point(125, 0);
+			this->TextEmail->Location = System::Drawing::Point(167, 0);
+			this->TextEmail->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->TextEmail->Name = L"TextEmail";
-			this->TextEmail->Size = System::Drawing::Size(607, 22);
+			this->TextEmail->Size = System::Drawing::Size(810, 27);
 			this->TextEmail->TabIndex = 43;
 			this->TextEmail->Text = L"";
 			this->TextEmail->TextChanged += gcnew System::EventHandler(this, &PackageForm::TextEmail_TextChanged);
 			//
 			// label10
 			//
 			this->label10->Dock = System::Windows::Forms::DockStyle::Left;
 			this->label10->Font = (gcnew System::Drawing::Font(L"Microsoft Sans Serif", 9.75F, System::Drawing::FontStyle::Bold, System::Drawing::GraphicsUnit::Point,
 				static_cast<System::Byte>(0)));
 			this->label10->Location = System::Drawing::Point(0, 0);
+			this->label10->Margin = System::Windows::Forms::Padding(4, 0, 4, 0);
 			this->label10->Name = L"label10";
-			this->label10->Size = System::Drawing::Size(125, 22);
+			this->label10->Size = System::Drawing::Size(167, 27);
 			this->label10->TabIndex = 42;
 			this->label10->Text = L"Email Address";
 			//
 			// panel11
 			//
 			this->panel11->Controls->Add(this->TextWebsite);
 			this->panel11->Controls->Add(this->label9);
 			this->panel11->Dock = System::Windows::Forms::DockStyle::Top;
-			this->panel11->Location = System::Drawing::Point(8, 26);
+			this->panel11->Location = System::Drawing::Point(11, 32);
+			this->panel11->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->panel11->Name = L"panel11";
-			this->panel11->Size = System::Drawing::Size(732, 19);
+			this->panel11->Size = System::Drawing::Size(977, 23);
 			this->panel11->TabIndex = 44;
 			//
 			// TextWebsite
 			//
 			this->TextWebsite->DetectUrls = false;
 			this->TextWebsite->Dock = System::Windows::Forms::DockStyle::Fill;
-			this->TextWebsite->Location = System::Drawing::Point(125, 0);
+			this->TextWebsite->Location = System::Drawing::Point(167, 0);
+			this->TextWebsite->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->TextWebsite->Name = L"TextWebsite";
-			this->TextWebsite->Size = System::Drawing::Size(607, 19);
+			this->TextWebsite->Size = System::Drawing::Size(810, 23);
 			this->TextWebsite->TabIndex = 41;
 			this->TextWebsite->Text = L"";
 			this->TextWebsite->TextChanged += gcnew System::EventHandler(this, &PackageForm::TextWebsite_TextChanged);
 			//
 			// label9
 			//
 			this->label9->Dock = System::Windows::Forms::DockStyle::Left;
 			this->label9->Font = (gcnew System::Drawing::Font(L"Microsoft Sans Serif", 9.75F, System::Drawing::FontStyle::Bold, System::Drawing::GraphicsUnit::Point,
 				static_cast<System::Byte>(0)));
 			this->label9->Location = System::Drawing::Point(0, 0);
+			this->label9->Margin = System::Windows::Forms::Padding(4, 0, 4, 0);
 			this->label9->Name = L"label9";
-			this->label9->Size = System::Drawing::Size(125, 19);
+			this->label9->Size = System::Drawing::Size(167, 23);
 			this->label9->TabIndex = 40;
 			this->label9->Text = L"Web Site";
 			//
 			// LabelShipWarning
 			//
 			this->LabelShipWarning->Dock = System::Windows::Forms::DockStyle::Top;
 			this->LabelShipWarning->Font = (gcnew System::Drawing::Font(L"Microsoft Sans Serif", 8.25F, System::Drawing::FontStyle::Italic, System::Drawing::GraphicsUnit::Point,
 				static_cast<System::Byte>(0)));
 			this->LabelShipWarning->ForeColor = System::Drawing::Color::Red;
-			this->LabelShipWarning->Location = System::Drawing::Point(8, 8);
+			this->LabelShipWarning->Location = System::Drawing::Point(11, 10);
+			this->LabelShipWarning->Margin = System::Windows::Forms::Padding(4, 0, 4, 0);
 			this->LabelShipWarning->Name = L"LabelShipWarning";
-			this->LabelShipWarning->Size = System::Drawing::Size(732, 18);
+			this->LabelShipWarning->Size = System::Drawing::Size(977, 22);
 			this->LabelShipWarning->TabIndex = 47;
 			this->LabelShipWarning->Text = L"NOTE: Ship files are not valid for X2, and only work in later games";
 			this->LabelShipWarning->TextAlign = System::Drawing::ContentAlignment::MiddleCenter;
 			//
 			// tabPage5
 			//
 			this->tabPage5->Controls->Add(this->ListGames);
 			this->tabPage5->Controls->Add(this->groupBox8);
-			this->tabPage5->Location = System::Drawing::Point(4, 22);
+			this->tabPage5->Location = System::Drawing::Point(4, 46);
+			this->tabPage5->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->tabPage5->Name = L"tabPage5";
-			this->tabPage5->Padding = System::Windows::Forms::Padding(3);
+			this->tabPage5->Padding = System::Windows::Forms::Padding(4, 4, 4, 4);
-			this->tabPage5->Size = System::Drawing::Size(748, 216);
+			this->tabPage5->Size = System::Drawing::Size(1000, 248);
 			this->tabPage5->TabIndex = 10;
 			this->tabPage5->Text = L"Game Compatability";
 			this->tabPage5->UseVisualStyleBackColor = true;
 			//
 			// ListGames
 			//
-			this->ListGames->Columns->AddRange(gcnew cli::array< System::Windows::Forms::ColumnHeader^  >(2) {this->columnHeader26, this->columnHeader27});
+			this->ListGames->Columns->AddRange(gcnew cli::array< System::Windows::Forms::ColumnHeader^  >(2) { this->columnHeader26, this->columnHeader27 });
 			this->ListGames->Dock = System::Windows::Forms::DockStyle::Fill;
 			this->ListGames->FullRowSelect = true;
+			this->ListGames->HideSelection = false;
-			this->ListGames->Location = System::Drawing::Point(3, 3);
+			this->ListGames->Location = System::Drawing::Point(4, 4);
+			this->ListGames->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->ListGames->MultiSelect = false;
 			this->ListGames->Name = L"ListGames";
-			this->ListGames->Size = System::Drawing::Size(742, 140);
+			this->ListGames->Size = System::Drawing::Size(992, 154);
 			this->ListGames->TabIndex = 2;
 			this->ListGames->UseCompatibleStateImageBehavior = false;
 			this->ListGames->View = System::Windows::Forms::View::Details;
 			this->ListGames->SelectedIndexChanged += gcnew System::EventHandler(this, &PackageForm::ListGames_SelectedIndexChanged);
 			this->ListGames->DoubleClick += gcnew System::EventHandler(this, &PackageForm::ListGames_DoubleClick);
 			//
 			// groupBox8
 			//
 			this->groupBox8->Controls->Add(this->panel10);
 			this->groupBox8->Dock = System::Windows::Forms::DockStyle::Bottom;
-			this->groupBox8->Location = System::Drawing::Point(3, 143);
+			this->groupBox8->Location = System::Drawing::Point(4, 158);
+			this->groupBox8->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->groupBox8->Name = L"groupBox8";
+			this->groupBox8->Padding = System::Windows::Forms::Padding(4, 4, 4, 4);
-			this->groupBox8->Size = System::Drawing::Size(742, 70);
+			this->groupBox8->Size = System::Drawing::Size(992, 86);
 			this->groupBox8->TabIndex = 1;
 			this->groupBox8->TabStop = false;
 			this->groupBox8->Text = L"Add/Edit Game";
 			//
 			// panel10
 			//
 			this->panel10->Controls->Add(this->panel21);
 			this->panel10->Controls->Add(this->ButGame);
 			this->panel10->Dock = System::Windows::Forms::DockStyle::Top;
-			this->panel10->Location = System::Drawing::Point(3, 16);
+			this->panel10->Location = System::Drawing::Point(4, 19);
+			this->panel10->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->panel10->Name = L"panel10";
-			this->panel10->Size = System::Drawing::Size(736, 43);
+			this->panel10->Size = System::Drawing::Size(984, 53);
 			this->panel10->TabIndex = 44;
 			//
 			// panel21
 			//
 			this->panel21->Controls->Add(this->ComboVersion);
 			this->panel21->Controls->Add(this->TextExactVersion);
 			this->panel21->Controls->Add(this->ButGameAdd);
 			this->panel21->Dock = System::Windows::Forms::DockStyle::Fill;
-			this->panel21->Location = System::Drawing::Point(218, 0);
+			this->panel21->Location = System::Drawing::Point(291, 0);
+			this->panel21->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->panel21->Name = L"panel21";
-			this->panel21->Size = System::Drawing::Size(518, 43);
+			this->panel21->Size = System::Drawing::Size(693, 53);
 			this->panel21->TabIndex = 44;
 			//
 			// ComboVersion
 			//
 			this->ComboVersion->Dock = System::Windows::Forms::DockStyle::Fill;
 			this->ComboVersion->DropDownStyle = System::Windows::Forms::ComboBoxStyle::DropDownList;
 			this->ComboVersion->Enabled = false;
 			this->ComboVersion->FormattingEnabled = true;
 			this->ComboVersion->Location = System::Drawing::Point(0, 0);
+			this->ComboVersion->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->ComboVersion->Name = L"ComboVersion";
-			this->ComboVersion->Size = System::Drawing::Size(465, 21);
+			this->ComboVersion->Size = System::Drawing::Size(622, 24);
 			this->ComboVersion->TabIndex = 41;
 			this->ComboVersion->SelectedIndexChanged += gcnew System::EventHandler(this, &PackageForm::ComboVersion_SelectedIndexChanged);
 			//
 			// TextExactVersion
 			//
 			this->TextExactVersion->Dock = System::Windows::Forms::DockStyle::Bottom;
-			this->TextExactVersion->Location = System::Drawing::Point(0, 23);
+			this->TextExactVersion->Location = System::Drawing::Point(0, 31);
+			this->TextExactVersion->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->TextExactVersion->Name = L"TextExactVersion";
-			this->TextExactVersion->Size = System::Drawing::Size(465, 20);
+			this->TextExactVersion->Size = System::Drawing::Size(622, 22);
 			this->TextExactVersion->TabIndex = 42;
 			//
 			// ButGameAdd
 			//
 			this->ButGameAdd->Dock = System::Windows::Forms::DockStyle::Right;
 			this->ButGameAdd->ForeColor = System::Drawing::Color::Green;
-			this->ButGameAdd->Location = System::Drawing::Point(465, 0);
+			this->ButGameAdd->Location = System::Drawing::Point(622, 0);
+			this->ButGameAdd->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->ButGameAdd->Name = L"ButGameAdd";
-			this->ButGameAdd->Size = System::Drawing::Size(53, 43);
+			this->ButGameAdd->Size = System::Drawing::Size(71, 53);
 			this->ButGameAdd->TabIndex = 43;
 			this->ButGameAdd->Text = L"Save!";
 			this->ButGameAdd->UseVisualStyleBackColor = true;
 			this->ButGameAdd->Click += gcnew System::EventHandler(this, &PackageForm::ButGameAdd_Click);
 			//
 			//
 			this->ButGame->ContextMenuStrip = this->ContextGames;
 			this->ButGame->Dock = System::Windows::Forms::DockStyle::Left;
 			this->ButGame->ImageAlign = System::Drawing::ContentAlignment::MiddleLeft;
 			this->ButGame->Location = System::Drawing::Point(0, 0);
+			this->ButGame->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->ButGame->Name = L"ButGame";
-			this->ButGame->Size = System::Drawing::Size(218, 43);
+			this->ButGame->Size = System::Drawing::Size(291, 53);
 			this->ButGame->TabIndex = 43;
 			this->ButGame->UseVisualStyleBackColor = true;
 			this->ButGame->Click += gcnew System::EventHandler(this, &PackageForm::ButGame_Click);
 			//
 			// ContextGames
 			//
 			this->ContextGames->ImageScalingSize = System::Drawing::Size(32, 32);
-			this->ContextGames->Items->AddRange(gcnew cli::array< System::Windows::Forms::ToolStripItem^  >(1) {this->testToolStripMenuItem});
+			this->ContextGames->Items->AddRange(gcnew cli::array< System::Windows::Forms::ToolStripItem^  >(1) { this->testToolStripMenuItem });
 			this->ContextGames->Name = L"ContextGames";
-			this->ContextGames->Size = System::Drawing::Size(97, 26);
+			this->ContextGames->Size = System::Drawing::Size(105, 28);
 			//
 			// testToolStripMenuItem
 			//
 			this->testToolStripMenuItem->Name = L"testToolStripMenuItem";
-			this->testToolStripMenuItem->Size = System::Drawing::Size(96, 22);
+			this->testToolStripMenuItem->Size = System::Drawing::Size(104, 24);
 			this->testToolStripMenuItem->Text = L"Test";
 			//
 			// PagePackage
 			//
 			this->PagePackage->Controls->Add(this->groupBox3);
 			this->PagePackage->Controls->Add(this->panel22);
 			this->PagePackage->Controls->Add(this->panel7);
-			this->PagePackage->Location = System::Drawing::Point(4, 22);
+			this->PagePackage->Location = System::Drawing::Point(4, 46);
+			this->PagePackage->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->PagePackage->Name = L"PagePackage";
-			this->PagePackage->Padding = System::Windows::Forms::Padding(3);
+			this->PagePackage->Padding = System::Windows::Forms::Padding(4, 4, 4, 4);
-			this->PagePackage->Size = System::Drawing::Size(748, 216);
+			this->PagePackage->Size = System::Drawing::Size(1000, 248);
 			this->PagePackage->TabIndex = 2;
 			this->PagePackage->Text = L"Package Settings";
 			this->PagePackage->UseVisualStyleBackColor = true;
 			//
 			// groupBox3
 			this->groupBox3->Controls->Add(this->label12);
 			this->groupBox3->Controls->Add(this->CheckOther);
 			this->groupBox3->Controls->Add(this->TextOtherAuthor);
 			this->groupBox3->Controls->Add(this->ButFromFile);
 			this->groupBox3->Dock = System::Windows::Forms::DockStyle::Top;
-			this->groupBox3->Location = System::Drawing::Point(3, 95);
+			this->groupBox3->Location = System::Drawing::Point(4, 117);
-			this->groupBox3->Margin = System::Windows::Forms::Padding(10);
+			this->groupBox3->Margin = System::Windows::Forms::Padding(13, 12, 13, 12);
 			this->groupBox3->Name = L"groupBox3";
-			this->groupBox3->Padding = System::Windows::Forms::Padding(10);
+			this->groupBox3->Padding = System::Windows::Forms::Padding(13, 12, 13, 12);
-			this->groupBox3->Size = System::Drawing::Size(742, 53);
+			this->groupBox3->Size = System::Drawing::Size(992, 65);
 			this->groupBox3->TabIndex = 1;
 			this->groupBox3->TabStop = false;
 			this->groupBox3->Text = L"Requires Parent Mod/Package";
 			//
 			// TextOtherName
 			//
 			this->TextOtherName->Dock = System::Windows::Forms::DockStyle::Fill;
-			this->TextOtherName->Location = System::Drawing::Point(107, 23);
+			this->TextOtherName->Location = System::Drawing::Point(140, 27);
+			this->TextOtherName->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->TextOtherName->Name = L"TextOtherName";
-			this->TextOtherName->Size = System::Drawing::Size(334, 20);
+			this->TextOtherName->Size = System::Drawing::Size(452, 22);
 			this->TextOtherName->TabIndex = 1;
 			this->TextOtherName->TextChanged += gcnew System::EventHandler(this, &PackageForm::TextOtherName_TextChanged);
 			//
 			// label13
 			//
 			this->label13->Dock = System::Windows::Forms::DockStyle::Right;
 			this->label13->Font = (gcnew System::Drawing::Font(L"Microsoft Sans Serif", 9, System::Drawing::FontStyle::Bold, System::Drawing::GraphicsUnit::Point,
 				static_cast<System::Byte>(0)));
-			this->label13->Location = System::Drawing::Point(441, 23);
+			this->label13->Location = System::Drawing::Point(592, 27);
+			this->label13->Margin = System::Windows::Forms::Padding(4, 0, 4, 0);
 			this->label13->Name = L"label13";
-			this->label13->Size = System::Drawing::Size(77, 20);
+			this->label13->Size = System::Drawing::Size(103, 26);
 			this->label13->TabIndex = 3;
 			this->label13->Text = L"Author";
 			this->label13->TextAlign = System::Drawing::ContentAlignment::MiddleRight;
 			//
 			// label12
 			//
 			this->label12->Dock = System::Windows::Forms::DockStyle::Left;
 			this->label12->Font = (gcnew System::Drawing::Font(L"Microsoft Sans Serif", 9, System::Drawing::FontStyle::Bold, System::Drawing::GraphicsUnit::Point,
 				static_cast<System::Byte>(0)));
 			this->label12->ImageAlign = System::Drawing::ContentAlignment::MiddleRight;
-			this->label12->Location = System::Drawing::Point(25, 23);
+			this->label12->Location = System::Drawing::Point(31, 27);
+			this->label12->Margin = System::Windows::Forms::Padding(4, 0, 4, 0);
 			this->label12->Name = L"label12";
 			this->label12->RightToLeft = System::Windows::Forms::RightToLeft::No;
-			this->label12->Size = System::Drawing::Size(82, 20);
+			this->label12->Size = System::Drawing::Size(109, 26);
 			this->label12->TabIndex = 2;
 			this->label12->Text = L"Package";
 			this->label12->TextAlign = System::Drawing::ContentAlignment::MiddleRight;
 			//
 			// CheckOther
 			//
 			this->CheckOther->AutoSize = true;
 			this->CheckOther->Dock = System::Windows::Forms::DockStyle::Left;
-			this->CheckOther->Location = System::Drawing::Point(10, 23);
+			this->CheckOther->Location = System::Drawing::Point(13, 27);
+			this->CheckOther->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->CheckOther->Name = L"CheckOther";
-			this->CheckOther->Size = System::Drawing::Size(15, 20);
+			this->CheckOther->Size = System::Drawing::Size(18, 26);
 			this->CheckOther->TabIndex = 0;
 			this->CheckOther->UseVisualStyleBackColor = true;
 			this->CheckOther->CheckedChanged += gcnew System::EventHandler(this, &PackageForm::CheckOther_CheckedChanged);
 			//
 			// TextOtherAuthor
 			//
 			this->TextOtherAuthor->Dock = System::Windows::Forms::DockStyle::Right;
-			this->TextOtherAuthor->Location = System::Drawing::Point(518, 23);
+			this->TextOtherAuthor->Location = System::Drawing::Point(695, 27);
+			this->TextOtherAuthor->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->TextOtherAuthor->Name = L"TextOtherAuthor";
-			this->TextOtherAuthor->Size = System::Drawing::Size(139, 20);
+			this->TextOtherAuthor->Size = System::Drawing::Size(184, 22);
 			this->TextOtherAuthor->TabIndex = 4;
 			this->TextOtherAuthor->TextChanged += gcnew System::EventHandler(this, &PackageForm::TextOtherName_TextChanged);
 			//
 			// ButFromFile
 			//
 			this->ButFromFile->Dock = System::Windows::Forms::DockStyle::Right;
-			this->ButFromFile->Location = System::Drawing::Point(657, 23);
+			this->ButFromFile->Location = System::Drawing::Point(879, 27);
+			this->ButFromFile->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->ButFromFile->Name = L"ButFromFile";
-			this->ButFromFile->Size = System::Drawing::Size(75, 20);
+			this->ButFromFile->Size = System::Drawing::Size(100, 26);
 			this->ButFromFile->TabIndex = 5;
 			this->ButFromFile->Text = L"From File";
 			this->ButFromFile->UseVisualStyleBackColor = true;
 			this->ButFromFile->Click += gcnew System::EventHandler(this, &PackageForm::ButFromFile_Click);
 			//
 			// panel22
 			//
 			this->panel22->Controls->Add(this->ComboPluginType);
 			this->panel22->Controls->Add(this->label15);
 			this->panel22->Dock = System::Windows::Forms::DockStyle::Top;
-			this->panel22->Location = System::Drawing::Point(3, 63);
+			this->panel22->Location = System::Drawing::Point(4, 78);
+			this->panel22->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->panel22->Name = L"panel22";
-			this->panel22->Size = System::Drawing::Size(742, 32);
+			this->panel22->Size = System::Drawing::Size(992, 39);
 			this->panel22->TabIndex = 2;
 			//
 			// ComboPluginType
 			//
 			this->ComboPluginType->Dock = System::Windows::Forms::DockStyle::Fill;
 			this->ComboPluginType->DropDownStyle = System::Windows::Forms::ComboBoxStyle::DropDownList;
 			this->ComboPluginType->FormattingEnabled = true;
-			this->ComboPluginType->Items->AddRange(gcnew cli::array< System::Object^  >(5) {L"Normal", L"Stable", L"Experimental", L"Cheat",
+			this->ComboPluginType->Items->AddRange(gcnew cli::array< System::Object^  >(5) {
+				L"Normal", L"Stable", L"Experimental", L"Cheat",
-				L"Mod";});
+					L"Mod"
+			});
-			this->ComboPluginType->Location = System::Drawing::Point(157, 0);
+			this->ComboPluginType->Location = System::Drawing::Point(209, 0);
+			this->ComboPluginType->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->ComboPluginType->Name = L"ComboPluginType";
-			this->ComboPluginType->Size = System::Drawing::Size(585, 21);
+			this->ComboPluginType->Size = System::Drawing::Size(783, 24);
 			this->ComboPluginType->TabIndex = 7;
 			this->ComboPluginType->SelectedIndexChanged += gcnew System::EventHandler(this, &PackageForm::ComboPluginType_SelectedIndexChanged);
 			//
 			// label15
 			//
 			this->label15->Dock = System::Windows::Forms::DockStyle::Left;
 			this->label15->Font = (gcnew System::Drawing::Font(L"Microsoft Sans Serif", 9.75F, System::Drawing::FontStyle::Bold, System::Drawing::GraphicsUnit::Point,
 				static_cast<System::Byte>(0)));
 			this->label15->Location = System::Drawing::Point(0, 0);
+			this->label15->Margin = System::Windows::Forms::Padding(4, 0, 4, 0);
 			this->label15->Name = L"label15";
-			this->label15->Size = System::Drawing::Size(157, 32);
+			this->label15->Size = System::Drawing::Size(209, 39);
 			this->label15->TabIndex = 2;
 			this->label15->Text = L"Plugin Type";
 			//
 			// panel7
 			//
 			this->panel7->Controls->Add(this->panel8);
 			this->panel7->Controls->Add(this->label7);
 			this->panel7->Dock = System::Windows::Forms::DockStyle::Top;
-			this->panel7->Location = System::Drawing::Point(3, 3);
+			this->panel7->Location = System::Drawing::Point(4, 4);
+			this->panel7->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->panel7->Name = L"panel7";
-			this->panel7->Padding = System::Windows::Forms::Padding(5, 5, 5, 10);
+			this->panel7->Padding = System::Windows::Forms::Padding(7, 6, 7, 12);
-			this->panel7->Size = System::Drawing::Size(742, 60);
+			this->panel7->Size = System::Drawing::Size(992, 74);
 			this->panel7->TabIndex = 0;
 			//
 			// panel8
 			//
 			this->panel8->Controls->Add(this->flowLayoutPanel1);
 			this->panel8->Controls->Add(this->panel9);
 			this->panel8->Dock = System::Windows::Forms::DockStyle::Fill;
-			this->panel8->Location = System::Drawing::Point(162, 5);
+			this->panel8->Location = System::Drawing::Point(216, 6);
+			this->panel8->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->panel8->Name = L"panel8";
-			this->panel8->Size = System::Drawing::Size(575, 45);
+			this->panel8->Size = System::Drawing::Size(769, 56);
 			this->panel8->TabIndex = 2;
 			//
 			// flowLayoutPanel1
 			//
 			this->flowLayoutPanel1->Controls->Add(this->RadioTypeUpdate);
 			this->flowLayoutPanel1->Controls->Add(this->RadioTypeLibrary);
 			this->flowLayoutPanel1->Controls->Add(this->RadioTypeStart);
 			this->flowLayoutPanel1->Controls->Add(this->RadioTypePatch);
 			this->flowLayoutPanel1->Dock = System::Windows::Forms::DockStyle::Fill;
 			this->flowLayoutPanel1->Location = System::Drawing::Point(0, 0);
+			this->flowLayoutPanel1->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->flowLayoutPanel1->Name = L"flowLayoutPanel1";
-			this->flowLayoutPanel1->Size = System::Drawing::Size(575, 22);
+			this->flowLayoutPanel1->Size = System::Drawing::Size(769, 28);
 			this->flowLayoutPanel1->TabIndex = 4;
 			//
 			// RadioTypeUpdate
 			//
 			this->RadioTypeUpdate->AutoSize = true;
-			this->RadioTypeUpdate->Location = System::Drawing::Point(3, 3);
+			this->RadioTypeUpdate->Location = System::Drawing::Point(4, 4);
+			this->RadioTypeUpdate->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->RadioTypeUpdate->Name = L"RadioTypeUpdate";
-			this->RadioTypeUpdate->Size = System::Drawing::Size(106, 17);
+			this->RadioTypeUpdate->Size = System::Drawing::Size(134, 21);
 			this->RadioTypeUpdate->TabIndex = 1;
 			this->RadioTypeUpdate->TabStop = true;
 			this->RadioTypeUpdate->Text = L"Update Package";
 			this->RadioTypeUpdate->UseVisualStyleBackColor = true;
 			this->RadioTypeUpdate->CheckedChanged += gcnew System::EventHandler(this, &PackageForm::RadioTypeUpdate_CheckedChanged);
 			//
 			// RadioTypeLibrary
 			//
 			this->RadioTypeLibrary->AutoSize = true;
-			this->RadioTypeLibrary->Location = System::Drawing::Point(115, 3);
+			this->RadioTypeLibrary->Location = System::Drawing::Point(146, 4);
+			this->RadioTypeLibrary->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->RadioTypeLibrary->Name = L"RadioTypeLibrary";
-			this->RadioTypeLibrary->Size = System::Drawing::Size(86, 17);
+			this->RadioTypeLibrary->Size = System::Drawing::Size(113, 21);
 			this->RadioTypeLibrary->TabIndex = 3;
 			this->RadioTypeLibrary->TabStop = true;
 			this->RadioTypeLibrary->Text = L"Script Library";
 			this->RadioTypeLibrary->UseVisualStyleBackColor = true;
 			this->RadioTypeLibrary->CheckedChanged += gcnew System::EventHandler(this, &PackageForm::RadioTypeLibrary_CheckedChanged);
 			//
 			// RadioTypeStart
 			//
 			this->RadioTypeStart->AutoSize = true;
-			this->RadioTypeStart->Location = System::Drawing::Point(207, 3);
+			this->RadioTypeStart->Location = System::Drawing::Point(267, 4);
+			this->RadioTypeStart->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->RadioTypeStart->Name = L"RadioTypeStart";
-			this->RadioTypeStart->Size = System::Drawing::Size(85, 17);
+			this->RadioTypeStart->Size = System::Drawing::Size(110, 21);
 			this->RadioTypeStart->TabIndex = 0;
 			this->RadioTypeStart->TabStop = true;
 			this->RadioTypeStart->Text = L"Custom Start";
 			this->RadioTypeStart->UseVisualStyleBackColor = true;
 			this->RadioTypeStart->CheckedChanged += gcnew System::EventHandler(this, &PackageForm::RadioTypeStart_CheckedChanged);
 			//
 			// RadioTypePatch
 			//
 			this->RadioTypePatch->AutoSize = true;
-			this->RadioTypePatch->Location = System::Drawing::Point(298, 3);
+			this->RadioTypePatch->Location = System::Drawing::Point(385, 4);
+			this->RadioTypePatch->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->RadioTypePatch->Name = L"RadioTypePatch";
-			this->RadioTypePatch->Size = System::Drawing::Size(77, 17);
+			this->RadioTypePatch->Size = System::Drawing::Size(96, 21);
 			this->RadioTypePatch->TabIndex = 2;
 			this->RadioTypePatch->TabStop = true;
 			this->RadioTypePatch->Text = L"Mod Patch";
 			this->RadioTypePatch->UseVisualStyleBackColor = true;
 			this->RadioTypePatch->CheckedChanged += gcnew System::EventHandler(this, &PackageForm::RadioTypePatch_CheckedChanged);
 			//
 			this->panel9->Controls->Add(this->TextCustomType);
 			this->panel9->Controls->Add(this->ComboType);
 			this->panel9->Controls->Add(this->RadioTypeScript);
 			this->panel9->Dock = System::Windows::Forms::DockStyle::Bottom;
-			this->panel9->Location = System::Drawing::Point(0, 22);
+			this->panel9->Location = System::Drawing::Point(0, 28);
+			this->panel9->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->panel9->Name = L"panel9";
-			this->panel9->Size = System::Drawing::Size(575, 23);
+			this->panel9->Size = System::Drawing::Size(769, 28);
 			this->panel9->TabIndex = 6;
 			//
 			// TextCustomType
 			//
 			this->TextCustomType->Dock = System::Windows::Forms::DockStyle::Fill;
-			this->TextCustomType->Location = System::Drawing::Point(146, 0);
+			this->TextCustomType->Location = System::Drawing::Point(192, 0);
+			this->TextCustomType->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->TextCustomType->Name = L"TextCustomType";
-			this->TextCustomType->Size = System::Drawing::Size(429, 20);
+			this->TextCustomType->Size = System::Drawing::Size(577, 22);
 			this->TextCustomType->TabIndex = 7;
 			this->TextCustomType->TextChanged += gcnew System::EventHandler(this, &PackageForm::TextCustomType_TextChanged);
 			//
 			// ComboType
 			//
 			this->ComboType->Dock = System::Windows::Forms::DockStyle::Left;
 			this->ComboType->DropDownStyle = System::Windows::Forms::ComboBoxStyle::DropDownList;
 			this->ComboType->FormattingEnabled = true;
-			this->ComboType->Location = System::Drawing::Point(14, 0);
+			this->ComboType->Location = System::Drawing::Point(17, 0);
+			this->ComboType->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->ComboType->Name = L"ComboType";
-			this->ComboType->Size = System::Drawing::Size(132, 21);
+			this->ComboType->Size = System::Drawing::Size(175, 24);
 			this->ComboType->TabIndex = 6;
 			this->ComboType->SelectedIndexChanged += gcnew System::EventHandler(this, &PackageForm::ComboType_SelectedIndexChanged);
 			//
 			// RadioTypeScript
 			//
 			this->RadioTypeScript->AutoSize = true;
 			this->RadioTypeScript->Dock = System::Windows::Forms::DockStyle::Left;
 			this->RadioTypeScript->Location = System::Drawing::Point(0, 0);
+			this->RadioTypeScript->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->RadioTypeScript->Name = L"RadioTypeScript";
-			this->RadioTypeScript->Size = System::Drawing::Size(14, 23);
+			this->RadioTypeScript->Size = System::Drawing::Size(17, 28);
 			this->RadioTypeScript->TabIndex = 5;
 			this->RadioTypeScript->TabStop = true;
 			this->RadioTypeScript->UseVisualStyleBackColor = true;
 			this->RadioTypeScript->CheckedChanged += gcnew System::EventHandler(this, &PackageForm::RadioTypeScript_CheckedChanged);
 			//
 			// label7
 			//
 			this->label7->Dock = System::Windows::Forms::DockStyle::Left;
 			this->label7->Font = (gcnew System::Drawing::Font(L"Microsoft Sans Serif", 9.75F, System::Drawing::FontStyle::Bold, System::Drawing::GraphicsUnit::Point,
 				static_cast<System::Byte>(0)));
-			this->label7->Location = System::Drawing::Point(5, 5);
+			this->label7->Location = System::Drawing::Point(7, 6);
+			this->label7->Margin = System::Windows::Forms::Padding(4, 0, 4, 0);
 			this->label7->Name = L"label7";
-			this->label7->Size = System::Drawing::Size(157, 45);
+			this->label7->Size = System::Drawing::Size(209, 56);
 			this->label7->TabIndex = 1;
 			this->label7->Text = L"Package Type";
 			this->label7->TextAlign = System::Drawing::ContentAlignment::MiddleLeft;
 			//
 			// tabPage3
 			//
 			this->tabPage3->Controls->Add(this->groupBox7);
 			this->tabPage3->Controls->Add(this->groupBox6);
 			this->tabPage3->Controls->Add(this->groupBox5);
 			this->tabPage3->Controls->Add(this->panel15);
-			this->tabPage3->Location = System::Drawing::Point(4, 22);
+			this->tabPage3->Location = System::Drawing::Point(4, 46);
+			this->tabPage3->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->tabPage3->Name = L"tabPage3";
-			this->tabPage3->Padding = System::Windows::Forms::Padding(3);
+			this->tabPage3->Padding = System::Windows::Forms::Padding(4, 4, 4, 4);
-			this->tabPage3->Size = System::Drawing::Size(748, 216);
+			this->tabPage3->Size = System::Drawing::Size(1000, 248);
 			this->tabPage3->TabIndex = 4;
 			this->tabPage3->Text = L"Display";
 			this->tabPage3->UseVisualStyleBackColor = true;
 			//
 			// groupBox7
 			//
 			this->groupBox7->Controls->Add(this->TextText);
 			this->groupBox7->Controls->Add(this->panel19);
 			this->groupBox7->Controls->Add(this->panel18);
 			this->groupBox7->Dock = System::Windows::Forms::DockStyle::Fill;
-			this->groupBox7->Location = System::Drawing::Point(210, 66);
+			this->groupBox7->Location = System::Drawing::Point(280, 82);
+			this->groupBox7->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->groupBox7->Name = L"groupBox7";
-			this->groupBox7->Padding = System::Windows::Forms::Padding(5, 0, 5, 5);
+			this->groupBox7->Padding = System::Windows::Forms::Padding(7, 0, 7, 6);
-			this->groupBox7->Size = System::Drawing::Size(535, 147);
+			this->groupBox7->Size = System::Drawing::Size(716, 162);
 			this->groupBox7->TabIndex = 4;
 			this->groupBox7->TabStop = false;
 			this->groupBox7->Text = L"Text";
 			//
 			// TextText
 			//
 			this->TextText->Dock = System::Windows::Forms::DockStyle::Fill;
-			this->TextText->Location = System::Drawing::Point(104, 40);
+			this->TextText->Location = System::Drawing::Point(139, 48);
+			this->TextText->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->TextText->Name = L"TextText";
-			this->TextText->Size = System::Drawing::Size(426, 102);
+			this->TextText->Size = System::Drawing::Size(570, 108);
 			this->TextText->TabIndex = 3;
 			this->TextText->Text = L"";
 			this->TextText->TextChanged += gcnew System::EventHandler(this, &PackageForm::TextText_TextChanged);
 			//
 			// panel19
 			//
 			this->panel19->Controls->Add(this->ListLang);
 			this->panel19->Controls->Add(this->panel20);
 			this->panel19->Dock = System::Windows::Forms::DockStyle::Left;
-			this->panel19->Location = System::Drawing::Point(5, 40);
+			this->panel19->Location = System::Drawing::Point(7, 48);
+			this->panel19->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->panel19->Name = L"panel19";
-			this->panel19->Size = System::Drawing::Size(99, 102);
+			this->panel19->Size = System::Drawing::Size(132, 108);
 			this->panel19->TabIndex = 5;
 			//
 			// ListLang
 			//
 			this->ListLang->Dock = System::Windows::Forms::DockStyle::Fill;
 			this->ListLang->FormattingEnabled = true;
+			this->ListLang->ItemHeight = 16;
-			this->ListLang->Items->AddRange(gcnew cli::array< System::Object^  >(1) {L"- Default -"});
+			this->ListLang->Items->AddRange(gcnew cli::array< System::Object^  >(1) { L"- Default -" });
 			this->ListLang->Location = System::Drawing::Point(0, 0);
+			this->ListLang->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->ListLang->Name = L"ListLang";
-			this->ListLang->Size = System::Drawing::Size(99, 82);
+			this->ListLang->Size = System::Drawing::Size(132, 83);
 			this->ListLang->TabIndex = 4;
 			this->ListLang->SelectedIndexChanged += gcnew System::EventHandler(this, &PackageForm::ListLang_SelectedIndexChanged);
 			//
 			// panel20
 			//
 			this->panel20->Controls->Add(this->ButTextDel);
 			this->panel20->Controls->Add(this->ButTextAdd);
 			this->panel20->Dock = System::Windows::Forms::DockStyle::Bottom;
-			this->panel20->Location = System::Drawing::Point(0, 82);
+			this->panel20->Location = System::Drawing::Point(0, 83);
+			this->panel20->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->panel20->Name = L"panel20";
-			this->panel20->Size = System::Drawing::Size(99, 20);
+			this->panel20->Size = System::Drawing::Size(132, 25);
 			this->panel20->TabIndex = 7;
 			//
 			// ButTextDel
 			//
 			this->ButTextDel->Dock = System::Windows::Forms::DockStyle::Left;
-			this->ButTextDel->Location = System::Drawing::Point(51, 0);
+			this->ButTextDel->Location = System::Drawing::Point(68, 0);
+			this->ButTextDel->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->ButTextDel->Name = L"ButTextDel";
-			this->ButTextDel->Size = System::Drawing::Size(46, 20);
+			this->ButTextDel->Size = System::Drawing::Size(61, 25);
 			this->ButTextDel->TabIndex = 5;
 			this->ButTextDel->Text = L"-";
 			this->ButTextDel->UseVisualStyleBackColor = true;
 			this->ButTextDel->Click += gcnew System::EventHandler(this, &PackageForm::ButTextDel_Click);
 			//
 			// ButTextAdd
 			//
 			this->ButTextAdd->Dock = System::Windows::Forms::DockStyle::Left;
 			this->ButTextAdd->Location = System::Drawing::Point(0, 0);
+			this->ButTextAdd->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->ButTextAdd->Name = L"ButTextAdd";
-			this->ButTextAdd->Size = System::Drawing::Size(51, 20);
+			this->ButTextAdd->Size = System::Drawing::Size(68, 25);
 			this->ButTextAdd->TabIndex = 6;
 			this->ButTextAdd->Text = L"+";
 			this->ButTextAdd->UseVisualStyleBackColor = true;
 			this->ButTextAdd->Click += gcnew System::EventHandler(this, &PackageForm::ButTextAdd_Click);
 			//
 			this->panel18->Controls->Add(this->RadioUninstallAfter);
 			this->panel18->Controls->Add(this->RadioUninstallBefore);
 			this->panel18->Controls->Add(this->RadioInstallAfter);
 			this->panel18->Controls->Add(this->RadioInstallBefore);
 			this->panel18->Dock = System::Windows::Forms::DockStyle::Top;
-			this->panel18->Location = System::Drawing::Point(5, 13);
+			this->panel18->Location = System::Drawing::Point(7, 15);
+			this->panel18->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->panel18->Name = L"panel18";
-			this->panel18->Size = System::Drawing::Size(525, 27);
+			this->panel18->Size = System::Drawing::Size(702, 33);
 			this->panel18->TabIndex = 2;
 			//
 			// RadioUninstallAfter
 			//
 			this->RadioUninstallAfter->AutoSize = true;
 			this->RadioUninstallAfter->Dock = System::Windows::Forms::DockStyle::Left;
-			this->RadioUninstallAfter->Location = System::Drawing::Point(262, 0);
+			this->RadioUninstallAfter->Location = System::Drawing::Point(339, 0);
+			this->RadioUninstallAfter->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->RadioUninstallAfter->Name = L"RadioUninstallAfter";
-			this->RadioUninstallAfter->Size = System::Drawing::Size(90, 27);
+			this->RadioUninstallAfter->Size = System::Drawing::Size(117, 33);
 			this->RadioUninstallAfter->TabIndex = 3;
 			this->RadioUninstallAfter->TabStop = true;
 			this->RadioUninstallAfter->Text = L"Uninstall After";
 			this->RadioUninstallAfter->UseVisualStyleBackColor = true;
 			this->RadioUninstallAfter->CheckedChanged += gcnew System::EventHandler(this, &PackageForm::RadioUninstallAfter_CheckedChanged);
 			//
 			// RadioUninstallBefore
 			//
 			this->RadioUninstallBefore->AutoSize = true;
 			this->RadioUninstallBefore->Dock = System::Windows::Forms::DockStyle::Left;
-			this->RadioUninstallBefore->Location = System::Drawing::Point(163, 0);
+			this->RadioUninstallBefore->Location = System::Drawing::Point(210, 0);
+			this->RadioUninstallBefore->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->RadioUninstallBefore->Name = L"RadioUninstallBefore";
-			this->RadioUninstallBefore->Size = System::Drawing::Size(99, 27);
+			this->RadioUninstallBefore->Size = System::Drawing::Size(129, 33);
 			this->RadioUninstallBefore->TabIndex = 2;
 			this->RadioUninstallBefore->TabStop = true;
 			this->RadioUninstallBefore->Text = L"Uninstall Before";
 			this->RadioUninstallBefore->UseVisualStyleBackColor = true;
 			this->RadioUninstallBefore->CheckedChanged += gcnew System::EventHandler(this, &PackageForm::RadioUninstallBefore_CheckedChanged);
 			//
 			// RadioInstallAfter
 			//
 			this->RadioInstallAfter->AutoSize = true;
 			this->RadioInstallAfter->Dock = System::Windows::Forms::DockStyle::Left;
-			this->RadioInstallAfter->Location = System::Drawing::Point(86, 0);
+			this->RadioInstallAfter->Location = System::Drawing::Point(111, 0);
+			this->RadioInstallAfter->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->RadioInstallAfter->Name = L"RadioInstallAfter";
-			this->RadioInstallAfter->Size = System::Drawing::Size(77, 27);
+			this->RadioInstallAfter->Size = System::Drawing::Size(99, 33);
 			this->RadioInstallAfter->TabIndex = 1;
 			this->RadioInstallAfter->TabStop = true;
 			this->RadioInstallAfter->Text = L"Install After";
 			this->RadioInstallAfter->UseVisualStyleBackColor = true;
 			this->RadioInstallAfter->CheckedChanged += gcnew System::EventHandler(this, &PackageForm::RadioInstallAfter_CheckedChanged);
 			// RadioInstallBefore
 			//
 			this->RadioInstallBefore->AutoSize = true;
 			this->RadioInstallBefore->Dock = System::Windows::Forms::DockStyle::Left;
 			this->RadioInstallBefore->Location = System::Drawing::Point(0, 0);
+			this->RadioInstallBefore->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->RadioInstallBefore->Name = L"RadioInstallBefore";
-			this->RadioInstallBefore->Size = System::Drawing::Size(86, 27);
+			this->RadioInstallBefore->Size = System::Drawing::Size(111, 33);
 			this->RadioInstallBefore->TabIndex = 0;
 			this->RadioInstallBefore->TabStop = true;
 			this->RadioInstallBefore->Text = L"Install Before";
 			this->RadioInstallBefore->UseVisualStyleBackColor = true;
 			this->RadioInstallBefore->CheckedChanged += gcnew System::EventHandler(this, &PackageForm::RadioInstallBefore_CheckedChanged);
 			//
 			// groupBox6
 			//
 			this->groupBox6->Controls->Add(this->panel17);
 			this->groupBox6->Dock = System::Windows::Forms::DockStyle::Top;
-			this->groupBox6->Location = System::Drawing::Point(210, 3);
+			this->groupBox6->Location = System::Drawing::Point(280, 4);
+			this->groupBox6->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->groupBox6->Name = L"groupBox6";
+			this->groupBox6->Padding = System::Windows::Forms::Padding(4, 4, 4, 4);
-			this->groupBox6->Size = System::Drawing::Size(535, 63);
+			this->groupBox6->Size = System::Drawing::Size(716, 78);
 			this->groupBox6->TabIndex = 3;
 			this->groupBox6->TabStop = false;
 			this->groupBox6->Text = L"Ratings";
 			//
 			// panel17
 			//
 			this->panel17->Controls->Add(this->GroupChange);
 			this->panel17->Controls->Add(this->GroupRec);
 			this->panel17->Controls->Add(this->GroupEase);
 			this->panel17->Dock = System::Windows::Forms::DockStyle::Fill;
-			this->panel17->Location = System::Drawing::Point(3, 16);
+			this->panel17->Location = System::Drawing::Point(4, 19);
+			this->panel17->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->panel17->Name = L"panel17";
-			this->panel17->Size = System::Drawing::Size(529, 44);
+			this->panel17->Size = System::Drawing::Size(708, 55);
 			this->panel17->TabIndex = 4;
 			//
 			// GroupChange
 			//
 			this->GroupChange->Controls->Add(this->PicChange5);
 			this->GroupChange->Controls->Add(this->PicChange4);
 			this->GroupChange->Controls->Add(this->PicChange3);
 			this->GroupChange->Controls->Add(this->PicChange2);
 			this->GroupChange->Controls->Add(this->PicChange1);
 			this->GroupChange->Dock = System::Windows::Forms::DockStyle::Left;
-			this->GroupChange->Location = System::Drawing::Point(251, 0);
+			this->GroupChange->Location = System::Drawing::Point(335, 0);
+			this->GroupChange->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->GroupChange->Name = L"GroupChange";
+			this->GroupChange->Padding = System::Windows::Forms::Padding(4, 4, 4, 4);
-			this->GroupChange->Size = System::Drawing::Size(126, 44);
+			this->GroupChange->Size = System::Drawing::Size(168, 55);
 			this->GroupChange->TabIndex = 2;
 			this->GroupChange->TabStop = false;
 			this->GroupChange->Text = L"Game Changing";
 			//
 			// PicChange4
 			//
 			this->PicChange4->Dock = System::Windows::Forms::DockStyle::Left;
-			this->PicChange4->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"PicChange4.Image")));
+			this->PicChange4->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"PicChange4.Image")));
-			this->PicChange4->Location = System::Drawing::Point(75, 16);
+			this->PicChange4->Location = System::Drawing::Point(100, 19);
+			this->PicChange4->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->PicChange4->Name = L"PicChange4";
-			this->PicChange4->Size = System::Drawing::Size(24, 25);
+			this->PicChange4->Size = System::Drawing::Size(32, 32);
 			this->PicChange4->SizeMode = System::Windows::Forms::PictureBoxSizeMode::StretchImage;
 			this->PicChange4->TabIndex = 17;
 			this->PicChange4->TabStop = false;
 			this->PicChange4->Click += gcnew System::EventHandler(this, &PackageForm::PicChange4_Click);
 			//
 			// PicChange3
 			//
 			this->PicChange3->Dock = System::Windows::Forms::DockStyle::Left;
-			this->PicChange3->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"PicChange3.Image")));
+			this->PicChange3->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"PicChange3.Image")));
-			this->PicChange3->Location = System::Drawing::Point(51, 16);
+			this->PicChange3->Location = System::Drawing::Point(68, 19);
+			this->PicChange3->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->PicChange3->Name = L"PicChange3";
-			this->PicChange3->Size = System::Drawing::Size(24, 25);
+			this->PicChange3->Size = System::Drawing::Size(32, 32);
 			this->PicChange3->SizeMode = System::Windows::Forms::PictureBoxSizeMode::StretchImage;
 			this->PicChange3->TabIndex = 16;
 			this->PicChange3->TabStop = false;
 			this->PicChange3->Click += gcnew System::EventHandler(this, &PackageForm::PicChange3_Click);
 			//
 			// PicChange2
 			//
 			this->PicChange2->Dock = System::Windows::Forms::DockStyle::Left;
-			this->PicChange2->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"PicChange2.Image")));
+			this->PicChange2->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"PicChange2.Image")));
-			this->PicChange2->Location = System::Drawing::Point(27, 16);
+			this->PicChange2->Location = System::Drawing::Point(36, 19);
+			this->PicChange2->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->PicChange2->Name = L"PicChange2";
-			this->PicChange2->Size = System::Drawing::Size(24, 25);
+			this->PicChange2->Size = System::Drawing::Size(32, 32);
 			this->PicChange2->SizeMode = System::Windows::Forms::PictureBoxSizeMode::StretchImage;
 			this->PicChange2->TabIndex = 15;
 			this->PicChange2->TabStop = false;
 			this->PicChange2->Click += gcnew System::EventHandler(this, &PackageForm::PicChange2_Click);
 			//
 			this->GroupRec->Controls->Add(this->PicRec4);
 			this->GroupRec->Controls->Add(this->PicRec3);
 			this->GroupRec->Controls->Add(this->PicRec2);
 			this->GroupRec->Controls->Add(this->PicRec1);
 			this->GroupRec->Dock = System::Windows::Forms::DockStyle::Left;
-			this->GroupRec->Location = System::Drawing::Point(126, 0);
+			this->GroupRec->Location = System::Drawing::Point(168, 0);
+			this->GroupRec->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->GroupRec->Name = L"GroupRec";
+			this->GroupRec->Padding = System::Windows::Forms::Padding(4, 4, 4, 4);
-			this->GroupRec->Size = System::Drawing::Size(125, 44);
+			this->GroupRec->Size = System::Drawing::Size(167, 55);
 			this->GroupRec->TabIndex = 3;
 			this->GroupRec->TabStop = false;
 			this->GroupRec->Text = L"Recommended";
 			//
 			// PicRec4
 			//
 			this->PicRec4->Dock = System::Windows::Forms::DockStyle::Left;
-			this->PicRec4->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"PicRec4.Image")));
+			this->PicRec4->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"PicRec4.Image")));
-			this->PicRec4->Location = System::Drawing::Point(75, 16);
+			this->PicRec4->Location = System::Drawing::Point(100, 19);
+			this->PicRec4->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->PicRec4->Name = L"PicRec4";
-			this->PicRec4->Size = System::Drawing::Size(24, 25);
+			this->PicRec4->Size = System::Drawing::Size(32, 32);
 			this->PicRec4->SizeMode = System::Windows::Forms::PictureBoxSizeMode::StretchImage;
 			this->PicRec4->TabIndex = 17;
 			this->PicRec4->TabStop = false;
 			this->PicRec4->Click += gcnew System::EventHandler(this, &PackageForm::PicRec4_Click);
 			//
 			// PicRec3
 			//
 			this->PicRec3->Dock = System::Windows::Forms::DockStyle::Left;
-			this->PicRec3->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"PicRec3.Image")));
+			this->PicRec3->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"PicRec3.Image")));
-			this->PicRec3->Location = System::Drawing::Point(51, 16);
+			this->PicRec3->Location = System::Drawing::Point(68, 19);
+			this->PicRec3->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->PicRec3->Name = L"PicRec3";
-			this->PicRec3->Size = System::Drawing::Size(24, 25);
+			this->PicRec3->Size = System::Drawing::Size(32, 32);
 			this->PicRec3->SizeMode = System::Windows::Forms::PictureBoxSizeMode::StretchImage;
 			this->PicRec3->TabIndex = 16;
 			this->PicRec3->TabStop = false;
 			this->PicRec3->Click += gcnew System::EventHandler(this, &PackageForm::PicRec3_Click);
 			//
 			// PicRec2
 			//
 			this->PicRec2->Dock = System::Windows::Forms::DockStyle::Left;
-			this->PicRec2->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"PicRec2.Image")));
+			this->PicRec2->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"PicRec2.Image")));
-			this->PicRec2->Location = System::Drawing::Point(27, 16);
+			this->PicRec2->Location = System::Drawing::Point(36, 19);
+			this->PicRec2->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->PicRec2->Name = L"PicRec2";
-			this->PicRec2->Size = System::Drawing::Size(24, 25);
+			this->PicRec2->Size = System::Drawing::Size(32, 32);
 			this->PicRec2->SizeMode = System::Windows::Forms::PictureBoxSizeMode::StretchImage;
 			this->PicRec2->TabIndex = 15;
 			this->PicRec2->TabStop = false;
 			this->PicRec2->Click += gcnew System::EventHandler(this, &PackageForm::PicRec2_Click);
 			//
 			// PicRec1
 			//
 			this->PicRec1->Dock = System::Windows::Forms::DockStyle::Left;
-			this->PicRec1->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"PicRec1.Image")));
+			this->PicRec1->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"PicRec1.Image")));
-			this->PicRec1->Location = System::Drawing::Point(3, 16);
+			this->PicRec1->Location = System::Drawing::Point(4, 19);
+			this->PicRec1->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->PicRec1->Name = L"PicRec1";
-			this->PicRec1->Size = System::Drawing::Size(24, 25);
+			this->PicRec1->Size = System::Drawing::Size(32, 32);
 			this->PicRec1->SizeMode = System::Windows::Forms::PictureBoxSizeMode::StretchImage;
 			this->PicRec1->TabIndex = 14;
 			this->PicRec1->TabStop = false;
 			this->PicRec1->Click += gcnew System::EventHandler(this, &PackageForm::PicRec1_Click);
 			//
 			this->GroupEase->Controls->Add(this->PicEase3);
 			this->GroupEase->Controls->Add(this->PicEase2);
 			this->GroupEase->Controls->Add(this->PicEase1);
 			this->GroupEase->Dock = System::Windows::Forms::DockStyle::Left;
 			this->GroupEase->Location = System::Drawing::Point(0, 0);
+			this->GroupEase->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->GroupEase->Name = L"GroupEase";
+			this->GroupEase->Padding = System::Windows::Forms::Padding(4, 4, 4, 4);
-			this->GroupEase->Size = System::Drawing::Size(126, 44);
+			this->GroupEase->Size = System::Drawing::Size(168, 55);
 			this->GroupEase->TabIndex = 1;
 			this->GroupEase->TabStop = false;
 			this->GroupEase->Text = L"Ease of Use";
 			//
 			// PicEase5
 			//
 			this->PicEase5->Dock = System::Windows::Forms::DockStyle::Left;
-			this->PicEase5->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"PicEase5.Image")));
+			this->PicEase5->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"PicEase5.Image")));
-			this->PicEase5->Location = System::Drawing::Point(99, 16);
+			this->PicEase5->Location = System::Drawing::Point(132, 19);
+			this->PicEase5->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->PicEase5->Name = L"PicEase5";
-			this->PicEase5->Size = System::Drawing::Size(24, 25);
+			this->PicEase5->Size = System::Drawing::Size(32, 32);
 			this->PicEase5->SizeMode = System::Windows::Forms::PictureBoxSizeMode::StretchImage;
 			this->PicEase5->TabIndex = 17;
 			this->PicEase5->TabStop = false;
 			this->PicEase5->Click += gcnew System::EventHandler(this, &PackageForm::PicEase5_Click);
 			//
 			// PicEase4
 			//
 			this->PicEase4->Dock = System::Windows::Forms::DockStyle::Left;
-			this->PicEase4->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"PicEase4.Image")));
+			this->PicEase4->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"PicEase4.Image")));
-			this->PicEase4->Location = System::Drawing::Point(75, 16);
+			this->PicEase4->Location = System::Drawing::Point(100, 19);
+			this->PicEase4->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->PicEase4->Name = L"PicEase4";
-			this->PicEase4->Size = System::Drawing::Size(24, 25);
+			this->PicEase4->Size = System::Drawing::Size(32, 32);
 			this->PicEase4->SizeMode = System::Windows::Forms::PictureBoxSizeMode::StretchImage;
 			this->PicEase4->TabIndex = 16;
 			this->PicEase4->TabStop = false;
 			this->PicEase4->Click += gcnew System::EventHandler(this, &PackageForm::PicEase4_Click);
 			//
 			// PicEase3
 			//
 			this->PicEase3->Dock = System::Windows::Forms::DockStyle::Left;
-			this->PicEase3->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"PicEase3.Image")));
+			this->PicEase3->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"PicEase3.Image")));
-			this->PicEase3->Location = System::Drawing::Point(51, 16);
+			this->PicEase3->Location = System::Drawing::Point(68, 19);
+			this->PicEase3->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->PicEase3->Name = L"PicEase3";
-			this->PicEase3->Size = System::Drawing::Size(24, 25);
+			this->PicEase3->Size = System::Drawing::Size(32, 32);
 			this->PicEase3->SizeMode = System::Windows::Forms::PictureBoxSizeMode::StretchImage;
 			this->PicEase3->TabIndex = 15;
 			this->PicEase3->TabStop = false;
 			this->PicEase3->Click += gcnew System::EventHandler(this, &PackageForm::PicEase3_Click);
 			//
 			// PicEase2
 			//
 			this->PicEase2->Dock = System::Windows::Forms::DockStyle::Left;
-			this->PicEase2->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"PicEase2.Image")));
+			this->PicEase2->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"PicEase2.Image")));
-			this->PicEase2->Location = System::Drawing::Point(27, 16);
+			this->PicEase2->Location = System::Drawing::Point(36, 19);
+			this->PicEase2->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->PicEase2->Name = L"PicEase2";
-			this->PicEase2->Size = System::Drawing::Size(24, 25);
+			this->PicEase2->Size = System::Drawing::Size(32, 32);
 			this->PicEase2->SizeMode = System::Windows::Forms::PictureBoxSizeMode::StretchImage;
 			this->PicEase2->TabIndex = 14;
 			this->PicEase2->TabStop = false;
 			this->PicEase2->Click += gcnew System::EventHandler(this, &PackageForm::PicEase2_Click);
 			//
 			// PicEase1
 			//
 			this->PicEase1->Dock = System::Windows::Forms::DockStyle::Left;
-			this->PicEase1->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"PicEase1.Image")));
+			this->PicEase1->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"PicEase1.Image")));
-			this->PicEase1->Location = System::Drawing::Point(3, 16);
+			this->PicEase1->Location = System::Drawing::Point(4, 19);
+			this->PicEase1->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->PicEase1->Name = L"PicEase1";
-			this->PicEase1->Size = System::Drawing::Size(24, 25);
+			this->PicEase1->Size = System::Drawing::Size(32, 32);
 			this->PicEase1->SizeMode = System::Windows::Forms::PictureBoxSizeMode::StretchImage;
 			this->PicEase1->TabIndex = 13;
 			this->PicEase1->TabStop = false;
 			this->PicEase1->Click += gcnew System::EventHandler(this, &PackageForm::PicEase1_Click);
 			//
 			//
 			this->groupBox5->Controls->Add(this->ButIconDel);
 			this->groupBox5->Controls->Add(this->DisplayIcon);
 			this->groupBox5->Controls->Add(this->button4);
 			this->groupBox5->Dock = System::Windows::Forms::DockStyle::Left;
-			this->groupBox5->Location = System::Drawing::Point(153, 3);
+			this->groupBox5->Location = System::Drawing::Point(204, 4);
+			this->groupBox5->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->groupBox5->Name = L"groupBox5";
+			this->groupBox5->Padding = System::Windows::Forms::Padding(4, 4, 4, 4);
-			this->groupBox5->Size = System::Drawing::Size(57, 210);
+			this->groupBox5->Size = System::Drawing::Size(76, 240);
 			this->groupBox5->TabIndex = 2;
 			this->groupBox5->TabStop = false;
 			this->groupBox5->Text = L"Icon";
 			//
 			// ButIconDel
 			//
 			this->ButIconDel->Dock = System::Windows::Forms::DockStyle::Top;
-			this->ButIconDel->Location = System::Drawing::Point(3, 85);
+			this->ButIconDel->Location = System::Drawing::Point(4, 104);
+			this->ButIconDel->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->ButIconDel->Name = L"ButIconDel";
-			this->ButIconDel->Size = System::Drawing::Size(51, 23);
+			this->ButIconDel->Size = System::Drawing::Size(68, 28);
 			this->ButIconDel->TabIndex = 1;
 			this->ButIconDel->Text = L"Del";
 			this->ButIconDel->UseVisualStyleBackColor = true;
 			this->ButIconDel->Click += gcnew System::EventHandler(this, &PackageForm::ButIconDel_Click);
 			//
 			// DisplayIcon
 			//
 			this->DisplayIcon->Dock = System::Windows::Forms::DockStyle::Top;
-			this->DisplayIcon->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"DisplayIcon.Image")));
+			this->DisplayIcon->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"DisplayIcon.Image")));
-			this->DisplayIcon->Location = System::Drawing::Point(3, 39);
+			this->DisplayIcon->Location = System::Drawing::Point(4, 47);
+			this->DisplayIcon->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->DisplayIcon->Name = L"DisplayIcon";
-			this->DisplayIcon->Size = System::Drawing::Size(51, 46);
+			this->DisplayIcon->Size = System::Drawing::Size(68, 57);
 			this->DisplayIcon->SizeMode = System::Windows::Forms::PictureBoxSizeMode::StretchImage;
 			this->DisplayIcon->TabIndex = 0;
 			this->DisplayIcon->TabStop = false;
 			//
 			// button4
 			//
 			this->button4->Dock = System::Windows::Forms::DockStyle::Top;
-			this->button4->Location = System::Drawing::Point(3, 16);
+			this->button4->Location = System::Drawing::Point(4, 19);
+			this->button4->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->button4->Name = L"button4";
-			this->button4->Size = System::Drawing::Size(51, 23);
+			this->button4->Size = System::Drawing::Size(68, 28);
 			this->button4->TabIndex = 2;
 			this->button4->Text = L"Set";
 			this->button4->UseVisualStyleBackColor = true;
 			this->button4->Click += gcnew System::EventHandler(this, &PackageForm::button4_Click);
 			//
 			// panel15
 			//
 			this->panel15->Controls->Add(this->DisplayPicture);
 			this->panel15->Controls->Add(this->panel16);
 			this->panel15->Dock = System::Windows::Forms::DockStyle::Left;
-			this->panel15->Location = System::Drawing::Point(3, 3);
+			this->panel15->Location = System::Drawing::Point(4, 4);
+			this->panel15->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->panel15->Name = L"panel15";
-			this->panel15->Size = System::Drawing::Size(150, 210);
+			this->panel15->Size = System::Drawing::Size(200, 240);
 			this->panel15->TabIndex = 1;
 			//
 			// DisplayPicture
 			//
 			this->DisplayPicture->Dock = System::Windows::Forms::DockStyle::Fill;
-			this->DisplayPicture->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"DisplayPicture.Image")));
+			this->DisplayPicture->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"DisplayPicture.Image")));
 			this->DisplayPicture->Location = System::Drawing::Point(0, 0);
+			this->DisplayPicture->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->DisplayPicture->Name = L"DisplayPicture";
-			this->DisplayPicture->Size = System::Drawing::Size(150, 181);
+			this->DisplayPicture->Size = System::Drawing::Size(200, 204);
 			this->DisplayPicture->SizeMode = System::Windows::Forms::PictureBoxSizeMode::StretchImage;
 			this->DisplayPicture->TabIndex = 0;
 			this->DisplayPicture->TabStop = false;
 			//
 			// panel16
 			this->panel16->Controls->Add(this->ButPicAdd);
 			this->panel16->Controls->Add(this->ButPicDel);
 			this->panel16->Controls->Add(this->ButPicNext);
 			this->panel16->Controls->Add(this->ButPicBack);
 			this->panel16->Dock = System::Windows::Forms::DockStyle::Bottom;
-			this->panel16->Location = System::Drawing::Point(0, 181);
+			this->panel16->Location = System::Drawing::Point(0, 204);
+			this->panel16->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->panel16->Name = L"panel16";
-			this->panel16->Size = System::Drawing::Size(150, 29);
+			this->panel16->Size = System::Drawing::Size(200, 36);
 			this->panel16->TabIndex = 2;
 			//
 			// ButPicAdd
 			//
 			this->ButPicAdd->Dock = System::Windows::Forms::DockStyle::Fill;
-			this->ButPicAdd->Location = System::Drawing::Point(32, 0);
+			this->ButPicAdd->Location = System::Drawing::Point(43, 0);
+			this->ButPicAdd->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->ButPicAdd->Name = L"ButPicAdd";
-			this->ButPicAdd->Size = System::Drawing::Size(49, 29);
+			this->ButPicAdd->Size = System::Drawing::Size(65, 36);
 			this->ButPicAdd->TabIndex = 4;
 			this->ButPicAdd->Text = L"Add";
 			this->ButPicAdd->UseVisualStyleBackColor = true;
 			this->ButPicAdd->Click += gcnew System::EventHandler(this, &PackageForm::ButPicAdd_Click);
 			//
 			// ButPicDel
 			//
 			this->ButPicDel->Dock = System::Windows::Forms::DockStyle::Right;
 			this->ButPicDel->Enabled = false;
-			this->ButPicDel->Location = System::Drawing::Point(81, 0);
+			this->ButPicDel->Location = System::Drawing::Point(108, 0);
+			this->ButPicDel->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->ButPicDel->Name = L"ButPicDel";
-			this->ButPicDel->Size = System::Drawing::Size(40, 29);
+			this->ButPicDel->Size = System::Drawing::Size(53, 36);
 			this->ButPicDel->TabIndex = 3;
 			this->ButPicDel->Text = L"Del";
 			this->ButPicDel->UseVisualStyleBackColor = true;
 			this->ButPicDel->Click += gcnew System::EventHandler(this, &PackageForm::ButPicDel_Click);
 			//
 			// ButPicNext
 			//
 			this->ButPicNext->Dock = System::Windows::Forms::DockStyle::Right;
 			this->ButPicNext->Enabled = false;
-			this->ButPicNext->Location = System::Drawing::Point(121, 0);
+			this->ButPicNext->Location = System::Drawing::Point(161, 0);
+			this->ButPicNext->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->ButPicNext->Name = L"ButPicNext";
-			this->ButPicNext->Size = System::Drawing::Size(29, 29);
+			this->ButPicNext->Size = System::Drawing::Size(39, 36);
 			this->ButPicNext->TabIndex = 2;
 			this->ButPicNext->Text = L"->";
 			this->ButPicNext->UseVisualStyleBackColor = true;
 			this->ButPicNext->Click += gcnew System::EventHandler(this, &PackageForm::ButPicNext_Click);
 			//
 			// ButPicBack
 			//
 			this->ButPicBack->Dock = System::Windows::Forms::DockStyle::Left;
 			this->ButPicBack->Enabled = false;
 			this->ButPicBack->Location = System::Drawing::Point(0, 0);
+			this->ButPicBack->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->ButPicBack->Name = L"ButPicBack";
-			this->ButPicBack->Size = System::Drawing::Size(32, 29);
+			this->ButPicBack->Size = System::Drawing::Size(43, 36);
 			this->ButPicBack->TabIndex = 1;
 			this->ButPicBack->Text = L"<-";
 			this->ButPicBack->UseVisualStyleBackColor = true;
 			this->ButPicBack->Click += gcnew System::EventHandler(this, &PackageForm::ButPicBack_Click);
 			//
 			// tabPage2
 			//
 			this->tabPage2->Controls->Add(this->ListNames);
 			this->tabPage2->Controls->Add(this->groupBox4);
-			this->tabPage2->Location = System::Drawing::Point(4, 22);
+			this->tabPage2->Location = System::Drawing::Point(4, 46);
+			this->tabPage2->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->tabPage2->Name = L"tabPage2";
-			this->tabPage2->Padding = System::Windows::Forms::Padding(3);
+			this->tabPage2->Padding = System::Windows::Forms::Padding(4, 4, 4, 4);
-			this->tabPage2->Size = System::Drawing::Size(748, 216);
+			this->tabPage2->Size = System::Drawing::Size(1000, 248);
 			this->tabPage2->TabIndex = 3;
 			this->tabPage2->Text = L"Advanced";
 			this->tabPage2->UseVisualStyleBackColor = true;
 			//
 			// ListNames
 			//
-			this->ListNames->Columns->AddRange(gcnew cli::array< System::Windows::Forms::ColumnHeader^  >(2) {this->columnHeader7, this->columnHeader8});
+			this->ListNames->Columns->AddRange(gcnew cli::array< System::Windows::Forms::ColumnHeader^  >(2) { this->columnHeader7, this->columnHeader8 });
 			this->ListNames->ContextMenuStrip = this->ContextLangName;
 			this->ListNames->Dock = System::Windows::Forms::DockStyle::Fill;
 			this->ListNames->FullRowSelect = true;
+			this->ListNames->HideSelection = false;
-			this->ListNames->Location = System::Drawing::Point(3, 121);
+			this->ListNames->Location = System::Drawing::Point(4, 149);
+			this->ListNames->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->ListNames->Name = L"ListNames";
-			this->ListNames->Size = System::Drawing::Size(742, 92);
+			this->ListNames->Size = System::Drawing::Size(992, 95);
 			this->ListNames->TabIndex = 1;
 			this->ListNames->UseCompatibleStateImageBehavior = false;
 			this->ListNames->View = System::Windows::Forms::View::Details;
 			this->ListNames->MouseDoubleClick += gcnew System::Windows::Forms::MouseEventHandler(this, &PackageForm::ListNames_MouseDoubleClick);
 			//
 			this->columnHeader8->Text = L"Package Name";
 			this->columnHeader8->Width = 300;
 			//
 			// ContextLangName
 			//
+			this->ContextLangName->ImageScalingSize = System::Drawing::Size(20, 20);
-			this->ContextLangName->Items->AddRange(gcnew cli::array< System::Windows::Forms::ToolStripItem^  >(6) {this->addToolStripMenuItem,
+			this->ContextLangName->Items->AddRange(gcnew cli::array< System::Windows::Forms::ToolStripItem^  >(6) {
+				this->addToolStripMenuItem,
-				this->toolStripSeparator2, this->ContextEditName, this->ContextRemoveName, this->ContextNameSep, this->clearAllToolStripMenuItem1});
+					this->toolStripSeparator2, this->ContextEditName, this->ContextRemoveName, this->ContextNameSep, this->clearAllToolStripMenuItem1
+			});
 			this->ContextLangName->Name = L"ContextLangName";
-			this->ContextLangName->Size = System::Drawing::Size(195, 168);
+			this->ContextLangName->Size = System::Drawing::Size(225, 168);
 			this->ContextLangName->Opening += gcnew System::ComponentModel::CancelEventHandler(this, &PackageForm::ContextLangName_Opening);
 			//
 			// addToolStripMenuItem
 			//
-			this->addToolStripMenuItem->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"addToolStripMenuItem.Image")));
+			this->addToolStripMenuItem->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"addToolStripMenuItem.Image")));
 			this->addToolStripMenuItem->ImageScaling = System::Windows::Forms::ToolStripItemImageScaling::None;
 			this->addToolStripMenuItem->Name = L"addToolStripMenuItem";
-			this->addToolStripMenuItem->Size = System::Drawing::Size(194, 38);
+			this->addToolStripMenuItem->Size = System::Drawing::Size(224, 38);
 			this->addToolStripMenuItem->Text = L"Add Package Name";
 			this->addToolStripMenuItem->Click += gcnew System::EventHandler(this, &PackageForm::addToolStripMenuItem_Click);
 			//
 			// toolStripSeparator2
 			//
 			this->toolStripSeparator2->Name = L"toolStripSeparator2";
-			this->toolStripSeparator2->Size = System::Drawing::Size(191, 6);
+			this->toolStripSeparator2->Size = System::Drawing::Size(221, 6);
 			//
 			// ContextEditName
 			//
-			this->ContextEditName->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"ContextEditName.Image")));
+			this->ContextEditName->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"ContextEditName.Image")));
 			this->ContextEditName->ImageScaling = System::Windows::Forms::ToolStripItemImageScaling::None;
 			this->ContextEditName->Name = L"ContextEditName";
-			this->ContextEditName->Size = System::Drawing::Size(194, 38);
+			this->ContextEditName->Size = System::Drawing::Size(224, 38);
 			this->ContextEditName->Text = L"Edit Name";
 			this->ContextEditName->Click += gcnew System::EventHandler(this, &PackageForm::ContextEditName_Click);
 			//
 			// ContextRemoveName
 			//
-			this->ContextRemoveName->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"ContextRemoveName.Image")));
+			this->ContextRemoveName->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"ContextRemoveName.Image")));
 			this->ContextRemoveName->ImageScaling = System::Windows::Forms::ToolStripItemImageScaling::None;
 			this->ContextRemoveName->Name = L"ContextRemoveName";
-			this->ContextRemoveName->Size = System::Drawing::Size(194, 38);
+			this->ContextRemoveName->Size = System::Drawing::Size(224, 38);
 			this->ContextRemoveName->Text = L"Remove Selected";
 			this->ContextRemoveName->Click += gcnew System::EventHandler(this, &PackageForm::ContextRemoveName_Click);
 			//
 			// ContextNameSep
 			//
 			this->ContextNameSep->Name = L"ContextNameSep";
-			this->ContextNameSep->Size = System::Drawing::Size(191, 6);
+			this->ContextNameSep->Size = System::Drawing::Size(221, 6);
 			//
 			// clearAllToolStripMenuItem1
 			//
-			this->clearAllToolStripMenuItem1->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"clearAllToolStripMenuItem1.Image")));
+			this->clearAllToolStripMenuItem1->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"clearAllToolStripMenuItem1.Image")));
 			this->clearAllToolStripMenuItem1->ImageScaling = System::Windows::Forms::ToolStripItemImageScaling::None;
 			this->clearAllToolStripMenuItem1->Name = L"clearAllToolStripMenuItem1";
-			this->clearAllToolStripMenuItem1->Size = System::Drawing::Size(194, 38);
+			this->clearAllToolStripMenuItem1->Size = System::Drawing::Size(224, 38);
 			this->clearAllToolStripMenuItem1->Text = L"Clear All";
 			this->clearAllToolStripMenuItem1->Click += gcnew System::EventHandler(this, &PackageForm::clearAllToolStripMenuItem1_Click);
 			//
 			// groupBox4
 			//
 			this->groupBox4->Controls->Add(this->ListMirrors);
 			this->groupBox4->Controls->Add(this->panel14);
 			this->groupBox4->Dock = System::Windows::Forms::DockStyle::Top;
-			this->groupBox4->Location = System::Drawing::Point(3, 3);
+			this->groupBox4->Location = System::Drawing::Point(4, 4);
+			this->groupBox4->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->groupBox4->Name = L"groupBox4";
+			this->groupBox4->Padding = System::Windows::Forms::Padding(4, 4, 4, 4);
-			this->groupBox4->Size = System::Drawing::Size(742, 118);
+			this->groupBox4->Size = System::Drawing::Size(992, 145);
 			this->groupBox4->TabIndex = 0;
 			this->groupBox4->TabStop = false;
 			this->groupBox4->Text = L"Automatic Update";
 			//
 			// ListMirrors
 			//
-			this->ListMirrors->Columns->AddRange(gcnew cli::array< System::Windows::Forms::ColumnHeader^  >(1) {this->columnHeader6});
+			this->ListMirrors->Columns->AddRange(gcnew cli::array< System::Windows::Forms::ColumnHeader^  >(1) { this->columnHeader6 });
 			this->ListMirrors->ContextMenuStrip = this->ContextMirror;
 			this->ListMirrors->Dock = System::Windows::Forms::DockStyle::Fill;
 			this->ListMirrors->FullRowSelect = true;
 			this->ListMirrors->HeaderStyle = System::Windows::Forms::ColumnHeaderStyle::Nonclickable;
+			this->ListMirrors->HideSelection = false;
 			this->ListMirrors->LabelWrap = false;
-			this->ListMirrors->Location = System::Drawing::Point(3, 40);
+			this->ListMirrors->Location = System::Drawing::Point(4, 49);
+			this->ListMirrors->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->ListMirrors->MultiSelect = false;
 			this->ListMirrors->Name = L"ListMirrors";
 			this->ListMirrors->ShowGroups = false;
-			this->ListMirrors->Size = System::Drawing::Size(736, 75);
+			this->ListMirrors->Size = System::Drawing::Size(984, 92);
 			this->ListMirrors->Sorting = System::Windows::Forms::SortOrder::Ascending;
 			this->ListMirrors->TabIndex = 1;
 			this->ListMirrors->UseCompatibleStateImageBehavior = false;
 			this->ListMirrors->View = System::Windows::Forms::View::Details;
 			this->ListMirrors->MouseDoubleClick += gcnew System::Windows::Forms::MouseEventHandler(this, &PackageForm::ListMirrors_MouseDoubleClick);
 			this->columnHeader6->Text = L"Mirror Address";
 			this->columnHeader6->Width = 121;
 			//
 			// ContextMirror
 			//
+			this->ContextMirror->ImageScalingSize = System::Drawing::Size(20, 20);
-			this->ContextMirror->Items->AddRange(gcnew cli::array< System::Windows::Forms::ToolStripItem^  >(4) {this->addMirrorToolStripMenuItem,
+			this->ContextMirror->Items->AddRange(gcnew cli::array< System::Windows::Forms::ToolStripItem^  >(4) {
+				this->addMirrorToolStripMenuItem,
-				this->toolStripSeparator1, this->ContextRemoveMirror, this->clearAllToolStripMenuItem});
+					this->toolStripSeparator1, this->ContextRemoveMirror, this->clearAllToolStripMenuItem
+			});
 			this->ContextMirror->Name = L"ContextMirror";
-			this->ContextMirror->Size = System::Drawing::Size(194, 124);
+			this->ContextMirror->Size = System::Drawing::Size(225, 124);
 			this->ContextMirror->Opening += gcnew System::ComponentModel::CancelEventHandler(this, &PackageForm::ContextMirror_Opening);
 			//
 			// addMirrorToolStripMenuItem
 			//
-			this->addMirrorToolStripMenuItem->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"addMirrorToolStripMenuItem.Image")));
+			this->addMirrorToolStripMenuItem->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"addMirrorToolStripMenuItem.Image")));
 			this->addMirrorToolStripMenuItem->ImageScaling = System::Windows::Forms::ToolStripItemImageScaling::None;
 			this->addMirrorToolStripMenuItem->Name = L"addMirrorToolStripMenuItem";
-			this->addMirrorToolStripMenuItem->Size = System::Drawing::Size(193, 38);
+			this->addMirrorToolStripMenuItem->Size = System::Drawing::Size(224, 38);
 			this->addMirrorToolStripMenuItem->Text = L"Add Mirror Address";
 			this->addMirrorToolStripMenuItem->Click += gcnew System::EventHandler(this, &PackageForm::addMirrorToolStripMenuItem_Click);
 			//
 			// toolStripSeparator1
 			//
 			this->toolStripSeparator1->Name = L"toolStripSeparator1";
-			this->toolStripSeparator1->Size = System::Drawing::Size(190, 6);
+			this->toolStripSeparator1->Size = System::Drawing::Size(221, 6);
 			//
 			// ContextRemoveMirror
 			//
-			this->ContextRemoveMirror->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"ContextRemoveMirror.Image")));
+			this->ContextRemoveMirror->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"ContextRemoveMirror.Image")));
 			this->ContextRemoveMirror->ImageScaling = System::Windows::Forms::ToolStripItemImageScaling::None;
 			this->ContextRemoveMirror->Name = L"ContextRemoveMirror";
-			this->ContextRemoveMirror->Size = System::Drawing::Size(193, 38);
+			this->ContextRemoveMirror->Size = System::Drawing::Size(224, 38);
 			this->ContextRemoveMirror->Text = L"Remove Selected";
 			this->ContextRemoveMirror->Click += gcnew System::EventHandler(this, &PackageForm::ContextRemoveMirror_Click);
 			//
 			// clearAllToolStripMenuItem
 			//
-			this->clearAllToolStripMenuItem->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"clearAllToolStripMenuItem.Image")));
+			this->clearAllToolStripMenuItem->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"clearAllToolStripMenuItem.Image")));
 			this->clearAllToolStripMenuItem->ImageScaling = System::Windows::Forms::ToolStripItemImageScaling::None;
 			this->clearAllToolStripMenuItem->Name = L"clearAllToolStripMenuItem";
-			this->clearAllToolStripMenuItem->Size = System::Drawing::Size(193, 38);
+			this->clearAllToolStripMenuItem->Size = System::Drawing::Size(224, 38);
 			this->clearAllToolStripMenuItem->Text = L"Clear All";
 			this->clearAllToolStripMenuItem->Click += gcnew System::EventHandler(this, &PackageForm::clearAllToolStripMenuItem_Click);
 			//
 			// panel14
 			//
 			this->panel14->Controls->Add(this->TextWebAddress);
 			this->panel14->Controls->Add(this->label14);
 			this->panel14->Dock = System::Windows::Forms::DockStyle::Top;
-			this->panel14->Location = System::Drawing::Point(3, 16);
+			this->panel14->Location = System::Drawing::Point(4, 19);
+			this->panel14->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->panel14->Name = L"panel14";
-			this->panel14->Size = System::Drawing::Size(736, 24);
+			this->panel14->Size = System::Drawing::Size(984, 30);
 			this->panel14->TabIndex = 2;
 			//
 			// TextWebAddress
 			//
 			this->TextWebAddress->DetectUrls = false;
 			this->TextWebAddress->Dock = System::Windows::Forms::DockStyle::Fill;
-			this->TextWebAddress->Location = System::Drawing::Point(142, 0);
+			this->TextWebAddress->Location = System::Drawing::Point(189, 0);
+			this->TextWebAddress->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->TextWebAddress->Name = L"TextWebAddress";
-			this->TextWebAddress->Size = System::Drawing::Size(594, 24);
+			this->TextWebAddress->Size = System::Drawing::Size(795, 30);
 			this->TextWebAddress->TabIndex = 1;
 			this->TextWebAddress->Text = L"";
 			this->TextWebAddress->TextChanged += gcnew System::EventHandler(this, &PackageForm::TextWebAddress_TextChanged_1);
 			//
 			// label14
 			//
 			this->label14->Dock = System::Windows::Forms::DockStyle::Left;
 			this->label14->Font = (gcnew System::Drawing::Font(L"Microsoft Sans Serif", 9.75F, System::Drawing::FontStyle::Bold, System::Drawing::GraphicsUnit::Point,
 				static_cast<System::Byte>(0)));
 			this->label14->Location = System::Drawing::Point(0, 0);
+			this->label14->Margin = System::Windows::Forms::Padding(4, 0, 4, 0);
 			this->label14->Name = L"label14";
-			this->label14->Size = System::Drawing::Size(142, 24);
+			this->label14->Size = System::Drawing::Size(189, 30);
 			this->label14->TabIndex = 0;
 			this->label14->Text = L"Primary Address";
 			//
 			// tabPage4
 			//
 			this->tabPage4->Controls->Add(this->ListDep);
-			this->tabPage4->Location = System::Drawing::Point(4, 22);
+			this->tabPage4->Location = System::Drawing::Point(4, 46);
+			this->tabPage4->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->tabPage4->Name = L"tabPage4";
-			this->tabPage4->Padding = System::Windows::Forms::Padding(15);
+			this->tabPage4->Padding = System::Windows::Forms::Padding(20, 18, 20, 18);
-			this->tabPage4->Size = System::Drawing::Size(748, 216);
+			this->tabPage4->Size = System::Drawing::Size(1000, 248);
 			this->tabPage4->TabIndex = 9;
 			this->tabPage4->Text = L"Dependacies";
 			this->tabPage4->UseVisualStyleBackColor = true;
 			//
 			// ListDep
 			//
-			this->ListDep->Columns->AddRange(gcnew cli::array< System::Windows::Forms::ColumnHeader^  >(3) {this->columnHeader22, this->columnHeader23,
+			this->ListDep->Columns->AddRange(gcnew cli::array< System::Windows::Forms::ColumnHeader^  >(3) {
+				this->columnHeader22, this->columnHeader23,
-				this->columnHeader24});
+					this->columnHeader24
+			});
 			this->ListDep->ContextMenuStrip = this->ContextDep;
 			this->ListDep->Dock = System::Windows::Forms::DockStyle::Fill;
 			this->ListDep->FullRowSelect = true;
+			this->ListDep->HideSelection = false;
-			this->ListDep->Location = System::Drawing::Point(15, 15);
+			this->ListDep->Location = System::Drawing::Point(20, 18);
+			this->ListDep->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->ListDep->MultiSelect = false;
 			this->ListDep->Name = L"ListDep";
-			this->ListDep->Size = System::Drawing::Size(718, 186);
+			this->ListDep->Size = System::Drawing::Size(960, 212);
 			this->ListDep->TabIndex = 0;
 			this->ListDep->UseCompatibleStateImageBehavior = false;
 			this->ListDep->View = System::Windows::Forms::View::Details;
 			this->ListDep->MouseDoubleClick += gcnew System::Windows::Forms::MouseEventHandler(this, &PackageForm::ListDep_MouseDoubleClick);
 			//
 			//
 			this->columnHeader24->Text = L"Minimum Version";
 			//
 			// ContextDep
 			//
+			this->ContextDep->ImageScalingSize = System::Drawing::Size(20, 20);
-			this->ContextDep->Items->AddRange(gcnew cli::array< System::Windows::Forms::ToolStripItem^  >(6) {this->addToolStripMenuItem1,
+			this->ContextDep->Items->AddRange(gcnew cli::array< System::Windows::Forms::ToolStripItem^  >(6) {
+				this->addToolStripMenuItem1,
-				this->ContextDepSep1, this->editSelectedToolStripMenuItem, this->ContextDepRemove, this->ContextDepSep2, this->ContextDepClear});
+					this->ContextDepSep1, this->editSelectedToolStripMenuItem, this->ContextDepRemove, this->ContextDepSep2, this->ContextDepClear
+			});
 			this->ContextDep->Name = L"ContextDep";
-			this->ContextDep->Size = System::Drawing::Size(181, 168);
+			this->ContextDep->Size = System::Drawing::Size(210, 168);
 			this->ContextDep->Opening += gcnew System::ComponentModel::CancelEventHandler(this, &PackageForm::ContextDep_Opening);
 			//
 			// addToolStripMenuItem1
 			//
-			this->addToolStripMenuItem1->DropDownItems->AddRange(gcnew cli::array< System::Windows::Forms::ToolStripItem^  >(2) {this->manualToolStripMenuItem,
+			this->addToolStripMenuItem1->DropDownItems->AddRange(gcnew cli::array< System::Windows::Forms::ToolStripItem^  >(2) {
+				this->manualToolStripMenuItem,
-				this->fromPackageToolStripMenuItem});
+					this->fromPackageToolStripMenuItem
+			});
-			this->addToolStripMenuItem1->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"addToolStripMenuItem1.Image")));
+			this->addToolStripMenuItem1->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"addToolStripMenuItem1.Image")));
 			this->addToolStripMenuItem1->ImageScaling = System::Windows::Forms::ToolStripItemImageScaling::None;
 			this->addToolStripMenuItem1->Name = L"addToolStripMenuItem1";
-			this->addToolStripMenuItem1->Size = System::Drawing::Size(180, 38);
+			this->addToolStripMenuItem1->Size = System::Drawing::Size(209, 38);
 			this->addToolStripMenuItem1->Text = L"Add";
 			//
 			// manualToolStripMenuItem
 			//
-			this->manualToolStripMenuItem->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"manualToolStripMenuItem.Image")));
+			this->manualToolStripMenuItem->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"manualToolStripMenuItem.Image")));
 			this->manualToolStripMenuItem->ImageScaling = System::Windows::Forms::ToolStripItemImageScaling::None;
 			this->manualToolStripMenuItem->Name = L"manualToolStripMenuItem";
-			this->manualToolStripMenuItem->Size = System::Drawing::Size(165, 38);
+			this->manualToolStripMenuItem->Size = System::Drawing::Size(188, 38);
 			this->manualToolStripMenuItem->Text = L"Manual";
 			this->manualToolStripMenuItem->Click += gcnew System::EventHandler(this, &PackageForm::manualToolStripMenuItem_Click);
 			//
 			// fromPackageToolStripMenuItem
 			//
-			this->fromPackageToolStripMenuItem->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"fromPackageToolStripMenuItem.Image")));
+			this->fromPackageToolStripMenuItem->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"fromPackageToolStripMenuItem.Image")));
 			this->fromPackageToolStripMenuItem->ImageScaling = System::Windows::Forms::ToolStripItemImageScaling::None;
 			this->fromPackageToolStripMenuItem->Name = L"fromPackageToolStripMenuItem";
-			this->fromPackageToolStripMenuItem->Size = System::Drawing::Size(165, 38);
+			this->fromPackageToolStripMenuItem->Size = System::Drawing::Size(188, 38);
 			this->fromPackageToolStripMenuItem->Text = L"From Package";
 			this->fromPackageToolStripMenuItem->Click += gcnew System::EventHandler(this, &PackageForm::fromPackageToolStripMenuItem_Click);
 			//
 			// ContextDepSep1
 			//
 			this->ContextDepSep1->Name = L"ContextDepSep1";
-			this->ContextDepSep1->Size = System::Drawing::Size(177, 6);
+			this->ContextDepSep1->Size = System::Drawing::Size(206, 6);
 			//
 			// editSelectedToolStripMenuItem
 			//
-			this->editSelectedToolStripMenuItem->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"editSelectedToolStripMenuItem.Image")));
+			this->editSelectedToolStripMenuItem->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"editSelectedToolStripMenuItem.Image")));
 			this->editSelectedToolStripMenuItem->ImageScaling = System::Windows::Forms::ToolStripItemImageScaling::None;
 			this->editSelectedToolStripMenuItem->Name = L"editSelectedToolStripMenuItem";
-			this->editSelectedToolStripMenuItem->Size = System::Drawing::Size(180, 38);
+			this->editSelectedToolStripMenuItem->Size = System::Drawing::Size(209, 38);
 			this->editSelectedToolStripMenuItem->Text = L"Edit Selected";
 			this->editSelectedToolStripMenuItem->Click += gcnew System::EventHandler(this, &PackageForm::editSelectedToolStripMenuItem_Click);
 			//
 			// ContextDepRemove
 			//
-			this->ContextDepRemove->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"ContextDepRemove.Image")));
+			this->ContextDepRemove->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"ContextDepRemove.Image")));
 			this->ContextDepRemove->ImageScaling = System::Windows::Forms::ToolStripItemImageScaling::None;
 			this->ContextDepRemove->Name = L"ContextDepRemove";
-			this->ContextDepRemove->Size = System::Drawing::Size(180, 38);
+			this->ContextDepRemove->Size = System::Drawing::Size(209, 38);
 			this->ContextDepRemove->Text = L"Remove Selected";
 			this->ContextDepRemove->Click += gcnew System::EventHandler(this, &PackageForm::ContextDepRemove_Click);
 			//
 			// ContextDepSep2
 			//
 			this->ContextDepSep2->Name = L"ContextDepSep2";
-			this->ContextDepSep2->Size = System::Drawing::Size(177, 6);
+			this->ContextDepSep2->Size = System::Drawing::Size(206, 6);
 			//
 			// ContextDepClear
 			//
-			this->ContextDepClear->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"ContextDepClear.Image")));
+			this->ContextDepClear->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"ContextDepClear.Image")));
 			this->ContextDepClear->ImageScaling = System::Windows::Forms::ToolStripItemImageScaling::None;
 			this->ContextDepClear->Name = L"ContextDepClear";
-			this->ContextDepClear->Size = System::Drawing::Size(180, 38);
+			this->ContextDepClear->Size = System::Drawing::Size(209, 38);
 			this->ContextDepClear->Text = L"Clear All";
 			this->ContextDepClear->Click += gcnew System::EventHandler(this, &PackageForm::ContextDepClear_Click);
 			//
 			// PageWares
 			//
 			this->PageWares->Controls->Add(this->splitContainer1);
-			this->PageWares->Location = System::Drawing::Point(4, 22);
+			this->PageWares->Location = System::Drawing::Point(4, 46);
+			this->PageWares->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->PageWares->Name = L"PageWares";
-			this->PageWares->Padding = System::Windows::Forms::Padding(3);
+			this->PageWares->Padding = System::Windows::Forms::Padding(4, 4, 4, 4);
-			this->PageWares->Size = System::Drawing::Size(748, 216);
+			this->PageWares->Size = System::Drawing::Size(1000, 248);
 			this->PageWares->TabIndex = 5;
 			this->PageWares->Text = L"Custom Wares";
 			this->PageWares->UseVisualStyleBackColor = true;
 			//
 			// splitContainer1
 			//
 			this->splitContainer1->Dock = System::Windows::Forms::DockStyle::Fill;
-			this->splitContainer1->Location = System::Drawing::Point(3, 3);
+			this->splitContainer1->Location = System::Drawing::Point(4, 4);
+			this->splitContainer1->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->splitContainer1->Name = L"splitContainer1";
 			this->splitContainer1->Orientation = System::Windows::Forms::Orientation::Horizontal;
 			//
 			// splitContainer1.Panel1
 			//
 			this->splitContainer1->Panel1->Controls->Add(this->ListWares);
 			//
 			// splitContainer1.Panel2
 			//
 			this->splitContainer1->Panel2->Controls->Add(this->ListWareText);
-			this->splitContainer1->Size = System::Drawing::Size(742, 210);
+			this->splitContainer1->Size = System::Drawing::Size(992, 240);
-			this->splitContainer1->SplitterDistance = 109;
+			this->splitContainer1->SplitterDistance = 124;
+			this->splitContainer1->SplitterWidth = 5;
 			this->splitContainer1->TabIndex = 0;
 			//
 			// ListWares
 			//
-			this->ListWares->Columns->AddRange(gcnew cli::array< System::Windows::Forms::ColumnHeader^  >(7) {this->columnHeader9, this->columnHeader10,
+			this->ListWares->Columns->AddRange(gcnew cli::array< System::Windows::Forms::ColumnHeader^  >(7) {
+				this->columnHeader9, this->columnHeader10,
-				this->columnHeader11, this->columnHeader12, this->columnHeader13, this->columnHeader14, this->columnHeader18});
+					this->columnHeader11, this->columnHeader12, this->columnHeader13, this->columnHeader14, this->columnHeader18
+			});
 			this->ListWares->ContextMenuStrip = this->ContextWare;
 			this->ListWares->Dock = System::Windows::Forms::DockStyle::Fill;
 			this->ListWares->FullRowSelect = true;
 			this->ListWares->HideSelection = false;
 			this->ListWares->Location = System::Drawing::Point(0, 0);
+			this->ListWares->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->ListWares->MultiSelect = false;
 			this->ListWares->Name = L"ListWares";
-			this->ListWares->Size = System::Drawing::Size(742, 109);
+			this->ListWares->Size = System::Drawing::Size(992, 124);
 			this->ListWares->TabIndex = 0;
 			this->ListWares->UseCompatibleStateImageBehavior = false;
 			this->ListWares->View = System::Windows::Forms::View::Details;
-			this->ListWares->MouseDoubleClick += gcnew System::Windows::Forms::MouseEventHandler(this, &PackageForm::ListWares_MouseDoubleClick);
 			this->ListWares->SelectedIndexChanged += gcnew System::EventHandler(this, &PackageForm::ListWares_SelectedIndexChanged);
+			this->ListWares->MouseDoubleClick += gcnew System::Windows::Forms::MouseEventHandler(this, &PackageForm::ListWares_MouseDoubleClick);
 			//
 			// columnHeader9
 			//
 			this->columnHeader9->Text = L"Ware ID";
 			//
 			//
 			this->columnHeader18->Text = L"Text ID";
 			//
 			// ContextWare
 			//
+			this->ContextWare->ImageScalingSize = System::Drawing::Size(20, 20);
-			this->ContextWare->Items->AddRange(gcnew cli::array< System::Windows::Forms::ToolStripItem^  >(6) {this->addWareToolStripMenuItem,
+			this->ContextWare->Items->AddRange(gcnew cli::array< System::Windows::Forms::ToolStripItem^  >(6) {
+				this->addWareToolStripMenuItem,
-				this->ContextWareSep1, this->ContextWareEdit, this->ContextWareRemove, this->ContextWareSep2, this->ContextWareClear});
+					this->ContextWareSep1, this->ContextWareEdit, this->ContextWareRemove, this->ContextWareSep2, this->ContextWareClear
+			});
 			this->ContextWare->Name = L"ContextWare";
-			this->ContextWare->Size = System::Drawing::Size(164, 168);
+			this->ContextWare->Size = System::Drawing::Size(187, 168);
 			this->ContextWare->Opening += gcnew System::ComponentModel::CancelEventHandler(this, &PackageForm::ContextWare_Opening);
 			//
 			// addWareToolStripMenuItem
 			//
-			this->addWareToolStripMenuItem->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"addWareToolStripMenuItem.Image")));
+			this->addWareToolStripMenuItem->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"addWareToolStripMenuItem.Image")));
 			this->addWareToolStripMenuItem->ImageScaling = System::Windows::Forms::ToolStripItemImageScaling::None;
 			this->addWareToolStripMenuItem->Name = L"addWareToolStripMenuItem";
-			this->addWareToolStripMenuItem->Size = System::Drawing::Size(163, 38);
+			this->addWareToolStripMenuItem->Size = System::Drawing::Size(186, 38);
 			this->addWareToolStripMenuItem->Text = L"Add Ware";
 			this->addWareToolStripMenuItem->Click += gcnew System::EventHandler(this, &PackageForm::addWareToolStripMenuItem_Click);
 			//
 			// ContextWareSep1
 			//
 			this->ContextWareSep1->Name = L"ContextWareSep1";
-			this->ContextWareSep1->Size = System::Drawing::Size(160, 6);
+			this->ContextWareSep1->Size = System::Drawing::Size(183, 6);
 			//
 			// ContextWareEdit
 			//
-			this->ContextWareEdit->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"ContextWareEdit.Image")));
+			this->ContextWareEdit->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"ContextWareEdit.Image")));
 			this->ContextWareEdit->ImageScaling = System::Windows::Forms::ToolStripItemImageScaling::None;
 			this->ContextWareEdit->Name = L"ContextWareEdit";
-			this->ContextWareEdit->Size = System::Drawing::Size(163, 38);
+			this->ContextWareEdit->Size = System::Drawing::Size(186, 38);
 			this->ContextWareEdit->Text = L"Edit Ware";
 			this->ContextWareEdit->Click += gcnew System::EventHandler(this, &PackageForm::ContextWareEdit_Click);
 			//
 			// ContextWareRemove
 			//
-			this->ContextWareRemove->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"ContextWareRemove.Image")));
+			this->ContextWareRemove->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"ContextWareRemove.Image")));
 			this->ContextWareRemove->ImageScaling = System::Windows::Forms::ToolStripItemImageScaling::None;
 			this->ContextWareRemove->Name = L"ContextWareRemove";
-			this->ContextWareRemove->Size = System::Drawing::Size(163, 38);
+			this->ContextWareRemove->Size = System::Drawing::Size(186, 38);
 			this->ContextWareRemove->Text = L"Remove Ware";
 			this->ContextWareRemove->Click += gcnew System::EventHandler(this, &PackageForm::ContextWareRemove_Click);
 			//
 			// ContextWareSep2
 			//
 			this->ContextWareSep2->Name = L"ContextWareSep2";
-			this->ContextWareSep2->Size = System::Drawing::Size(160, 6);
+			this->ContextWareSep2->Size = System::Drawing::Size(183, 6);
 			//
 			// ContextWareClear
 			//
-			this->ContextWareClear->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"ContextWareClear.Image")));
+			this->ContextWareClear->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"ContextWareClear.Image")));
 			this->ContextWareClear->ImageScaling = System::Windows::Forms::ToolStripItemImageScaling::None;
 			this->ContextWareClear->Name = L"ContextWareClear";
-			this->ContextWareClear->Size = System::Drawing::Size(163, 38);
+			this->ContextWareClear->Size = System::Drawing::Size(186, 38);
 			this->ContextWareClear->Text = L"Clear All";
 			this->ContextWareClear->Click += gcnew System::EventHandler(this, &PackageForm::ContextWareClear_Click);
 			//
 			// ListWareText
 			//
-			this->ListWareText->Columns->AddRange(gcnew cli::array< System::Windows::Forms::ColumnHeader^  >(3) {this->columnHeader15,
+			this->ListWareText->Columns->AddRange(gcnew cli::array< System::Windows::Forms::ColumnHeader^  >(3) {
+				this->columnHeader15,
-				this->columnHeader16, this->columnHeader17});
+					this->columnHeader16, this->columnHeader17
+			});
 			this->ListWareText->ContextMenuStrip = this->ContextWareText;
 			this->ListWareText->Dock = System::Windows::Forms::DockStyle::Fill;
 			this->ListWareText->FullRowSelect = true;
+			this->ListWareText->HideSelection = false;
 			this->ListWareText->Location = System::Drawing::Point(0, 0);
+			this->ListWareText->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->ListWareText->MultiSelect = false;
 			this->ListWareText->Name = L"ListWareText";
-			this->ListWareText->Size = System::Drawing::Size(742, 97);
+			this->ListWareText->Size = System::Drawing::Size(992, 111);
 			this->ListWareText->TabIndex = 0;
 			this->ListWareText->UseCompatibleStateImageBehavior = false;
 			this->ListWareText->View = System::Windows::Forms::View::Details;
 			this->ListWareText->MouseDoubleClick += gcnew System::Windows::Forms::MouseEventHandler(this, &PackageForm::ListWareText_MouseDoubleClick);
 			//
 			this->columnHeader17->Text = L"Ware Description";
 			this->columnHeader17->Width = 115;
 			//
 			// ContextWareText
 			//
+			this->ContextWareText->ImageScalingSize = System::Drawing::Size(20, 20);
-			this->ContextWareText->Items->AddRange(gcnew cli::array< System::Windows::Forms::ToolStripItem^  >(6) {this->addTextToolStripMenuItem,
+			this->ContextWareText->Items->AddRange(gcnew cli::array< System::Windows::Forms::ToolStripItem^  >(6) {
+				this->addTextToolStripMenuItem,
-				this->ContextWTSep1, this->ContextWTRemove, this->ContextWTEdit, this->ContextWTSep2, this->ContextWTClear});
+					this->ContextWTSep1, this->ContextWTRemove, this->ContextWTEdit, this->ContextWTSep2, this->ContextWTClear
+			});
 			this->ContextWareText->Name = L"ContextWareText";
-			this->ContextWareText->Size = System::Drawing::Size(159, 168);
+			this->ContextWareText->Size = System::Drawing::Size(180, 168);
 			this->ContextWareText->Opening += gcnew System::ComponentModel::CancelEventHandler(this, &PackageForm::ContextWareText_Opening);
 			//
 			// addTextToolStripMenuItem
 			//
-			this->addTextToolStripMenuItem->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"addTextToolStripMenuItem.Image")));
+			this->addTextToolStripMenuItem->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"addTextToolStripMenuItem.Image")));
 			this->addTextToolStripMenuItem->ImageScaling = System::Windows::Forms::ToolStripItemImageScaling::None;
 			this->addTextToolStripMenuItem->Name = L"addTextToolStripMenuItem";
-			this->addTextToolStripMenuItem->Size = System::Drawing::Size(158, 38);
+			this->addTextToolStripMenuItem->Size = System::Drawing::Size(179, 38);
 			this->addTextToolStripMenuItem->Text = L"Add Text";
 			this->addTextToolStripMenuItem->Click += gcnew System::EventHandler(this, &PackageForm::addTextToolStripMenuItem_Click);
 			//
 			// ContextWTSep1
 			//
 			this->ContextWTSep1->Name = L"ContextWTSep1";
-			this->ContextWTSep1->Size = System::Drawing::Size(155, 6);
+			this->ContextWTSep1->Size = System::Drawing::Size(176, 6);
 			//
 			// ContextWTRemove
 			//
-			this->ContextWTRemove->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"ContextWTRemove.Image")));
+			this->ContextWTRemove->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"ContextWTRemove.Image")));
 			this->ContextWTRemove->ImageScaling = System::Windows::Forms::ToolStripItemImageScaling::None;
 			this->ContextWTRemove->Name = L"ContextWTRemove";
-			this->ContextWTRemove->Size = System::Drawing::Size(158, 38);
+			this->ContextWTRemove->Size = System::Drawing::Size(179, 38);
 			this->ContextWTRemove->Text = L"Remove Text";
 			this->ContextWTRemove->Click += gcnew System::EventHandler(this, &PackageForm::ContextWTRemove_Click);
 			//
 			// ContextWTEdit
 			//
-			this->ContextWTEdit->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"ContextWTEdit.Image")));
+			this->ContextWTEdit->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"ContextWTEdit.Image")));
 			this->ContextWTEdit->ImageScaling = System::Windows::Forms::ToolStripItemImageScaling::None;
 			this->ContextWTEdit->Name = L"ContextWTEdit";
-			this->ContextWTEdit->Size = System::Drawing::Size(158, 38);
+			this->ContextWTEdit->Size = System::Drawing::Size(179, 38);
 			this->ContextWTEdit->Text = L"Edit Text";
 			this->ContextWTEdit->Click += gcnew System::EventHandler(this, &PackageForm::ContextWTEdit_Click);
 			//
 			// ContextWTSep2
 			//
 			this->ContextWTSep2->Name = L"ContextWTSep2";
-			this->ContextWTSep2->Size = System::Drawing::Size(155, 6);
+			this->ContextWTSep2->Size = System::Drawing::Size(176, 6);
 			//
 			// ContextWTClear
 			//
-			this->ContextWTClear->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"ContextWTClear.Image")));
+			this->ContextWTClear->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"ContextWTClear.Image")));
 			this->ContextWTClear->ImageScaling = System::Windows::Forms::ToolStripItemImageScaling::None;
 			this->ContextWTClear->Name = L"ContextWTClear";
-			this->ContextWTClear->Size = System::Drawing::Size(158, 38);
+			this->ContextWTClear->Size = System::Drawing::Size(179, 38);
 			this->ContextWTClear->Text = L"Clear All";
 			this->ContextWTClear->Click += gcnew System::EventHandler(this, &PackageForm::ContextWTClear_Click);
 			//
 			// PageShip
 			//
 			this->PageShip->Controls->Add(this->ListShipText);
 			this->PageShip->Controls->Add(this->PanelTextID);
 			this->PageShip->Controls->Add(this->flowLayoutPanel2);
-			this->PageShip->Location = System::Drawing::Point(4, 22);
+			this->PageShip->Location = System::Drawing::Point(4, 46);
+			this->PageShip->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->PageShip->Name = L"PageShip";
-			this->PageShip->Padding = System::Windows::Forms::Padding(8);
+			this->PageShip->Padding = System::Windows::Forms::Padding(11, 10, 11, 10);
-			this->PageShip->Size = System::Drawing::Size(748, 216);
+			this->PageShip->Size = System::Drawing::Size(1000, 248);
 			this->PageShip->TabIndex = 6;
 			this->PageShip->Text = L"Ship Settings";
 			this->PageShip->UseVisualStyleBackColor = true;
 			//
 			// ListShipText
 			//
-			this->ListShipText->Columns->AddRange(gcnew cli::array< System::Windows::Forms::ColumnHeader^  >(3) {this->columnHeader19,
+			this->ListShipText->Columns->AddRange(gcnew cli::array< System::Windows::Forms::ColumnHeader^  >(3) {
+				this->columnHeader19,
-				this->columnHeader20, this->columnHeader21});
+					this->columnHeader20, this->columnHeader21
+			});
 			this->ListShipText->ContextMenuStrip = this->ContextShipText;
 			this->ListShipText->Dock = System::Windows::Forms::DockStyle::Fill;
 			this->ListShipText->FullRowSelect = true;
 			this->ListShipText->HeaderStyle = System::Windows::Forms::ColumnHeaderStyle::Nonclickable;
+			this->ListShipText->HideSelection = false;
-			this->ListShipText->Location = System::Drawing::Point(8, 110);
+			this->ListShipText->Location = System::Drawing::Point(11, 137);
+			this->ListShipText->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->ListShipText->Name = L"ListShipText";
-			this->ListShipText->Size = System::Drawing::Size(732, 98);
+			this->ListShipText->Size = System::Drawing::Size(978, 101);
 			this->ListShipText->TabIndex = 8;
 			this->ListShipText->UseCompatibleStateImageBehavior = false;
 			this->ListShipText->View = System::Windows::Forms::View::Details;
 			this->ListShipText->MouseDoubleClick += gcnew System::Windows::Forms::MouseEventHandler(this, &PackageForm::ListShipText_MouseDoubleClick);
 			//
 			//
 			this->columnHeader21->Text = L"Ship Description";
 			//
 			// ContextShipText
 			//
+			this->ContextShipText->ImageScalingSize = System::Drawing::Size(20, 20);
-			this->ContextShipText->Items->AddRange(gcnew cli::array< System::Windows::Forms::ToolStripItem^  >(7) {this->importTextToolStripMenuItem,
+			this->ContextShipText->Items->AddRange(gcnew cli::array< System::Windows::Forms::ToolStripItem^  >(7) {
+				this->importTextToolStripMenuItem,
-				this->addLanguageToolStripMenuItem, this->ContextShipTextSep1, this->ContextShipTextEdit, this->ContextShipTextRemove, this->ContextShipTextSep2,
+					this->addLanguageToolStripMenuItem, this->ContextShipTextSep1, this->ContextShipTextEdit, this->ContextShipTextRemove, this->ContextShipTextSep2,
-				this->ContextShipTextClear});
+					this->ContextShipTextClear
+			});
 			this->ContextShipText->Name = L"ContextShipText";
-			this->ContextShipText->Size = System::Drawing::Size(168, 206);
+			this->ContextShipText->Size = System::Drawing::Size(192, 206);
 			this->ContextShipText->Opening += gcnew System::ComponentModel::CancelEventHandler(this, &PackageForm::ContextShipText_Opening);
 			//
 			// importTextToolStripMenuItem
 			//
-			this->importTextToolStripMenuItem->DropDownItems->AddRange(gcnew cli::array< System::Windows::Forms::ToolStripItem^  >(3) {this->fromFileToolStripMenuItem,
+			this->importTextToolStripMenuItem->DropDownItems->AddRange(gcnew cli::array< System::Windows::Forms::ToolStripItem^  >(3) {
+				this->fromFileToolStripMenuItem,
-				this->fromDirectoryToolStripMenuItem, this->fromModToolStripMenuItem});
+					this->fromDirectoryToolStripMenuItem, this->fromModToolStripMenuItem
+			});
-			this->importTextToolStripMenuItem->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"importTextToolStripMenuItem.Image")));
+			this->importTextToolStripMenuItem->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"importTextToolStripMenuItem.Image")));
 			this->importTextToolStripMenuItem->ImageScaling = System::Windows::Forms::ToolStripItemImageScaling::None;
 			this->importTextToolStripMenuItem->Name = L"importTextToolStripMenuItem";
-			this->importTextToolStripMenuItem->Size = System::Drawing::Size(167, 38);
+			this->importTextToolStripMenuItem->Size = System::Drawing::Size(191, 38);
 			this->importTextToolStripMenuItem->Text = L"Import Text";
 			//
 			// fromFileToolStripMenuItem
 			//
-			this->fromFileToolStripMenuItem->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"fromFileToolStripMenuItem.Image")));
+			this->fromFileToolStripMenuItem->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"fromFileToolStripMenuItem.Image")));
 			this->fromFileToolStripMenuItem->ImageScaling = System::Windows::Forms::ToolStripItemImageScaling::None;
 			this->fromFileToolStripMenuItem->Name = L"fromFileToolStripMenuItem";
-			this->fromFileToolStripMenuItem->Size = System::Drawing::Size(169, 38);
+			this->fromFileToolStripMenuItem->Size = System::Drawing::Size(195, 38);
 			this->fromFileToolStripMenuItem->Text = L"From File";
 			this->fromFileToolStripMenuItem->Click += gcnew System::EventHandler(this, &PackageForm::fromFileToolStripMenuItem_Click);
 			//
 			// fromDirectoryToolStripMenuItem
 			//
-			this->fromDirectoryToolStripMenuItem->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"fromDirectoryToolStripMenuItem.Image")));
+			this->fromDirectoryToolStripMenuItem->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"fromDirectoryToolStripMenuItem.Image")));
 			this->fromDirectoryToolStripMenuItem->ImageScaling = System::Windows::Forms::ToolStripItemImageScaling::None;
 			this->fromDirectoryToolStripMenuItem->Name = L"fromDirectoryToolStripMenuItem";
-			this->fromDirectoryToolStripMenuItem->Size = System::Drawing::Size(169, 38);
+			this->fromDirectoryToolStripMenuItem->Size = System::Drawing::Size(195, 38);
 			this->fromDirectoryToolStripMenuItem->Text = L"From Directory";
 			this->fromDirectoryToolStripMenuItem->Click += gcnew System::EventHandler(this, &PackageForm::fromDirectoryToolStripMenuItem_Click);
 			//
 			// fromModToolStripMenuItem
 			//
-			this->fromModToolStripMenuItem->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"fromModToolStripMenuItem.Image")));
+			this->fromModToolStripMenuItem->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"fromModToolStripMenuItem.Image")));
 			this->fromModToolStripMenuItem->ImageScaling = System::Windows::Forms::ToolStripItemImageScaling::None;
 			this->fromModToolStripMenuItem->Name = L"fromModToolStripMenuItem";
-			this->fromModToolStripMenuItem->Size = System::Drawing::Size(169, 38);
+			this->fromModToolStripMenuItem->Size = System::Drawing::Size(195, 38);
 			this->fromModToolStripMenuItem->Text = L"From Mod";
 			this->fromModToolStripMenuItem->Click += gcnew System::EventHandler(this, &PackageForm::fromModToolStripMenuItem_Click);
 			//
 			// addLanguageToolStripMenuItem
 			//
-			this->addLanguageToolStripMenuItem->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"addLanguageToolStripMenuItem.Image")));
+			this->addLanguageToolStripMenuItem->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"addLanguageToolStripMenuItem.Image")));
 			this->addLanguageToolStripMenuItem->ImageScaling = System::Windows::Forms::ToolStripItemImageScaling::None;
 			this->addLanguageToolStripMenuItem->Name = L"addLanguageToolStripMenuItem";
-			this->addLanguageToolStripMenuItem->Size = System::Drawing::Size(167, 38);
+			this->addLanguageToolStripMenuItem->Size = System::Drawing::Size(191, 38);
 			this->addLanguageToolStripMenuItem->Text = L"Add Language";
 			this->addLanguageToolStripMenuItem->Click += gcnew System::EventHandler(this, &PackageForm::addLanguageToolStripMenuItem_Click);
 			//
 			// ContextShipTextSep1
 			//
 			this->ContextShipTextSep1->Name = L"ContextShipTextSep1";
-			this->ContextShipTextSep1->Size = System::Drawing::Size(164, 6);
+			this->ContextShipTextSep1->Size = System::Drawing::Size(188, 6);
 			//
 			// ContextShipTextEdit
 			//
-			this->ContextShipTextEdit->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"ContextShipTextEdit.Image")));
+			this->ContextShipTextEdit->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"ContextShipTextEdit.Image")));
 			this->ContextShipTextEdit->ImageScaling = System::Windows::Forms::ToolStripItemImageScaling::None;
 			this->ContextShipTextEdit->Name = L"ContextShipTextEdit";
-			this->ContextShipTextEdit->Size = System::Drawing::Size(167, 38);
+			this->ContextShipTextEdit->Size = System::Drawing::Size(191, 38);
 			this->ContextShipTextEdit->Text = L"Edit";
 			this->ContextShipTextEdit->Click += gcnew System::EventHandler(this, &PackageForm::ContextShipTextEdit_Click);
 			//
 			// ContextShipTextRemove
 			//
-			this->ContextShipTextRemove->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"ContextShipTextRemove.Image")));
+			this->ContextShipTextRemove->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"ContextShipTextRemove.Image")));
 			this->ContextShipTextRemove->ImageScaling = System::Windows::Forms::ToolStripItemImageScaling::None;
 			this->ContextShipTextRemove->Name = L"ContextShipTextRemove";
-			this->ContextShipTextRemove->Size = System::Drawing::Size(167, 38);
+			this->ContextShipTextRemove->Size = System::Drawing::Size(191, 38);
 			this->ContextShipTextRemove->Text = L"Remove";
 			this->ContextShipTextRemove->Click += gcnew System::EventHandler(this, &PackageForm::ContextShipTextRemove_Click);
 			//
 			// ContextShipTextSep2
 			//
 			this->ContextShipTextSep2->Name = L"ContextShipTextSep2";
-			this->ContextShipTextSep2->Size = System::Drawing::Size(164, 6);
+			this->ContextShipTextSep2->Size = System::Drawing::Size(188, 6);
 			//
 			// ContextShipTextClear
 			//
-			this->ContextShipTextClear->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"ContextShipTextClear.Image")));
+			this->ContextShipTextClear->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"ContextShipTextClear.Image")));
 			this->ContextShipTextClear->ImageScaling = System::Windows::Forms::ToolStripItemImageScaling::None;
 			this->ContextShipTextClear->Name = L"ContextShipTextClear";
-			this->ContextShipTextClear->Size = System::Drawing::Size(167, 38);
+			this->ContextShipTextClear->Size = System::Drawing::Size(191, 38);
 			this->ContextShipTextClear->Text = L"Clear All";
 			this->ContextShipTextClear->Click += gcnew System::EventHandler(this, &PackageForm::ContextShipTextClear_Click);
 			//
 			// PanelTextID
 			//
 			this->PanelTextID->Controls->Add(this->NumTextID);
 			this->PanelTextID->Controls->Add(this->CheckExistingText);
 			this->PanelTextID->Dock = System::Windows::Forms::DockStyle::Top;
-			this->PanelTextID->Location = System::Drawing::Point(8, 90);
+			this->PanelTextID->Location = System::Drawing::Point(11, 112);
+			this->PanelTextID->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->PanelTextID->Name = L"PanelTextID";
-			this->PanelTextID->Size = System::Drawing::Size(732, 20);
+			this->PanelTextID->Size = System::Drawing::Size(978, 25);
 			this->PanelTextID->TabIndex = 9;
 			//
 			// NumTextID
 			//
 			this->NumTextID->Dock = System::Windows::Forms::DockStyle::Left;
-			this->NumTextID->Location = System::Drawing::Point(122, 0);
+			this->NumTextID->Location = System::Drawing::Point(155, 0);
+			this->NumTextID->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
-			this->NumTextID->Maximum = System::Decimal(gcnew cli::array< System::Int32 >(4) {90000000, 0, 0, 0});
+			this->NumTextID->Maximum = System::Decimal(gcnew cli::array< System::Int32 >(4) { 90000000, 0, 0, 0 });
-			this->NumTextID->Minimum = System::Decimal(gcnew cli::array< System::Int32 >(4) {1, 0, 0, 0});
+			this->NumTextID->Minimum = System::Decimal(gcnew cli::array< System::Int32 >(4) { 1, 0, 0, 0 });
 			this->NumTextID->Name = L"NumTextID";
-			this->NumTextID->Size = System::Drawing::Size(103, 20);
+			this->NumTextID->Size = System::Drawing::Size(137, 22);
 			this->NumTextID->TabIndex = 1;
-			this->NumTextID->Value = System::Decimal(gcnew cli::array< System::Int32 >(4) {1, 0, 0, 0});
+			this->NumTextID->Value = System::Decimal(gcnew cli::array< System::Int32 >(4) { 1, 0, 0, 0 });
 			this->NumTextID->ValueChanged += gcnew System::EventHandler(this, &PackageForm::NumTextID_ValueChanged);
 			this->NumTextID->Leave += gcnew System::EventHandler(this, &PackageForm::NumTextID_Leave);
 			//
 			// CheckExistingText
 			//
 			this->CheckExistingText->AutoSize = true;
 			this->CheckExistingText->Dock = System::Windows::Forms::DockStyle::Left;
 			this->CheckExistingText->Location = System::Drawing::Point(0, 0);
+			this->CheckExistingText->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->CheckExistingText->Name = L"CheckExistingText";
-			this->CheckExistingText->Size = System::Drawing::Size(122, 20);
+			this->CheckExistingText->Size = System::Drawing::Size(155, 25);
 			this->CheckExistingText->TabIndex = 3;
 			this->CheckExistingText->Text = L"Use Existing Text ID";
 			this->CheckExistingText->UseVisualStyleBackColor = true;
 			this->CheckExistingText->CheckedChanged += gcnew System::EventHandler(this, &PackageForm::CheckExistingText_CheckedChanged);
 			//
 			this->flowLayoutPanel2->Controls->Add(this->CheckSYXenon);
 			this->flowLayoutPanel2->Controls->Add(this->CheckSYTerran);
 			this->flowLayoutPanel2->Controls->Add(this->CheckSYATF);
 			this->flowLayoutPanel2->Controls->Add(this->CheckSYYaki);
 			this->flowLayoutPanel2->Dock = System::Windows::Forms::DockStyle::Top;
-			this->flowLayoutPanel2->Location = System::Drawing::Point(8, 8);
+			this->flowLayoutPanel2->Location = System::Drawing::Point(11, 10);
+			this->flowLayoutPanel2->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->flowLayoutPanel2->Name = L"flowLayoutPanel2";
-			this->flowLayoutPanel2->Size = System::Drawing::Size(732, 82);
+			this->flowLayoutPanel2->Size = System::Drawing::Size(978, 102);
 			this->flowLayoutPanel2->TabIndex = 7;
 			//
 			// label16
 			//
 			this->label16->Font = (gcnew System::Drawing::Font(L"Microsoft Sans Serif", 8.25F, System::Drawing::FontStyle::Bold, System::Drawing::GraphicsUnit::Point,
 				static_cast<System::Byte>(0)));
-			this->label16->Location = System::Drawing::Point(3, 0);
+			this->label16->Location = System::Drawing::Point(4, 0);
+			this->label16->Margin = System::Windows::Forms::Padding(4, 0, 4, 0);
 			this->label16->Name = L"label16";
-			this->label16->Size = System::Drawing::Size(90, 38);
+			this->label16->Size = System::Drawing::Size(120, 47);
 			this->label16->TabIndex = 11;
 			this->label16->Text = L"Add To Shipyards:";
 			this->label16->TextAlign = System::Drawing::ContentAlignment::MiddleLeft;
 			//
 			// CheckSYArgon
 			//
 			this->CheckSYArgon->Font = (gcnew System::Drawing::Font(L"Microsoft Sans Serif", 8.25F, System::Drawing::FontStyle::Regular, System::Drawing::GraphicsUnit::Point,
 				static_cast<System::Byte>(0)));
-			this->CheckSYArgon->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"CheckSYArgon.Image")));
+			this->CheckSYArgon->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"CheckSYArgon.Image")));
 			this->CheckSYArgon->ImageAlign = System::Drawing::ContentAlignment::MiddleLeft;
-			this->CheckSYArgon->Location = System::Drawing::Point(99, 3);
+			this->CheckSYArgon->Location = System::Drawing::Point(132, 4);
+			this->CheckSYArgon->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->CheckSYArgon->Name = L"CheckSYArgon";
-			this->CheckSYArgon->Size = System::Drawing::Size(90, 35);
+			this->CheckSYArgon->Size = System::Drawing::Size(120, 43);
 			this->CheckSYArgon->TabIndex = 0;
 			this->CheckSYArgon->Text = L"Argon";
 			this->CheckSYArgon->TextImageRelation = System::Windows::Forms::TextImageRelation::ImageBeforeText;
 			this->CheckSYArgon->UseVisualStyleBackColor = true;
 			this->CheckSYArgon->CheckedChanged += gcnew System::EventHandler(this, &PackageForm::CheckSYArgon_CheckedChanged);
 			//
 			// CheckSYBoron
 			//
-			this->CheckSYBoron->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"CheckSYBoron.Image")));
+			this->CheckSYBoron->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"CheckSYBoron.Image")));
 			this->CheckSYBoron->ImageAlign = System::Drawing::ContentAlignment::MiddleLeft;
-			this->CheckSYBoron->Location = System::Drawing::Point(195, 3);
+			this->CheckSYBoron->Location = System::Drawing::Point(260, 4);
+			this->CheckSYBoron->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->CheckSYBoron->Name = L"CheckSYBoron";
-			this->CheckSYBoron->Size = System::Drawing::Size(90, 35);
+			this->CheckSYBoron->Size = System::Drawing::Size(120, 43);
 			this->CheckSYBoron->TabIndex = 1;
 			this->CheckSYBoron->Text = L"Boron";
 			this->CheckSYBoron->TextImageRelation = System::Windows::Forms::TextImageRelation::ImageBeforeText;
 			this->CheckSYBoron->UseVisualStyleBackColor = true;
 			this->CheckSYBoron->CheckedChanged += gcnew System::EventHandler(this, &PackageForm::CheckSYBoron_CheckedChanged);
 			//
 			// CheckSYParanid
 			//
-			this->CheckSYParanid->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"CheckSYParanid.Image")));
+			this->CheckSYParanid->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"CheckSYParanid.Image")));
 			this->CheckSYParanid->ImageAlign = System::Drawing::ContentAlignment::MiddleLeft;
-			this->CheckSYParanid->Location = System::Drawing::Point(291, 3);
+			this->CheckSYParanid->Location = System::Drawing::Point(388, 4);
+			this->CheckSYParanid->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->CheckSYParanid->Name = L"CheckSYParanid";
-			this->CheckSYParanid->Size = System::Drawing::Size(90, 35);
+			this->CheckSYParanid->Size = System::Drawing::Size(120, 43);
 			this->CheckSYParanid->TabIndex = 2;
 			this->CheckSYParanid->Text = L"Paranid";
 			this->CheckSYParanid->TextImageRelation = System::Windows::Forms::TextImageRelation::ImageBeforeText;
 			this->CheckSYParanid->UseVisualStyleBackColor = true;
 			this->CheckSYParanid->CheckedChanged += gcnew System::EventHandler(this, &PackageForm::CheckSYParanid_CheckedChanged);
 			//
 			// CheckSYTeladi
 			//
-			this->CheckSYTeladi->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"CheckSYTeladi.Image")));
+			this->CheckSYTeladi->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"CheckSYTeladi.Image")));
 			this->CheckSYTeladi->ImageAlign = System::Drawing::ContentAlignment::MiddleLeft;
-			this->CheckSYTeladi->Location = System::Drawing::Point(387, 3);
+			this->CheckSYTeladi->Location = System::Drawing::Point(516, 4);
+			this->CheckSYTeladi->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->CheckSYTeladi->Name = L"CheckSYTeladi";
-			this->CheckSYTeladi->Size = System::Drawing::Size(90, 35);
+			this->CheckSYTeladi->Size = System::Drawing::Size(120, 43);
 			this->CheckSYTeladi->TabIndex = 3;
 			this->CheckSYTeladi->Text = L"Teladi";
 			this->CheckSYTeladi->TextImageRelation = System::Windows::Forms::TextImageRelation::ImageBeforeText;
 			this->CheckSYTeladi->UseVisualStyleBackColor = true;
 			this->CheckSYTeladi->CheckedChanged += gcnew System::EventHandler(this, &PackageForm::CheckSYTeladi_CheckedChanged);
 			//
 			// CheckSYSplit
 			//
-			this->CheckSYSplit->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"CheckSYSplit.Image")));
+			this->CheckSYSplit->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"CheckSYSplit.Image")));
 			this->CheckSYSplit->ImageAlign = System::Drawing::ContentAlignment::MiddleLeft;
-			this->CheckSYSplit->Location = System::Drawing::Point(483, 3);
+			this->CheckSYSplit->Location = System::Drawing::Point(644, 4);
+			this->CheckSYSplit->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->CheckSYSplit->Name = L"CheckSYSplit";
-			this->CheckSYSplit->Size = System::Drawing::Size(90, 35);
+			this->CheckSYSplit->Size = System::Drawing::Size(120, 43);
 			this->CheckSYSplit->TabIndex = 4;
 			this->CheckSYSplit->Text = L"Split";
 			this->CheckSYSplit->TextImageRelation = System::Windows::Forms::TextImageRelation::ImageBeforeText;
 			this->CheckSYSplit->UseVisualStyleBackColor = true;
 			this->CheckSYSplit->CheckedChanged += gcnew System::EventHandler(this, &PackageForm::CheckSYSplit_CheckedChanged);
 			//
 			// CheckSYPirate
 			//
-			this->CheckSYPirate->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"CheckSYPirate.Image")));
+			this->CheckSYPirate->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"CheckSYPirate.Image")));
 			this->CheckSYPirate->ImageAlign = System::Drawing::ContentAlignment::MiddleLeft;
-			this->CheckSYPirate->Location = System::Drawing::Point(579, 3);
+			this->CheckSYPirate->Location = System::Drawing::Point(772, 4);
+			this->CheckSYPirate->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->CheckSYPirate->Name = L"CheckSYPirate";
-			this->CheckSYPirate->Size = System::Drawing::Size(90, 35);
+			this->CheckSYPirate->Size = System::Drawing::Size(120, 43);
 			this->CheckSYPirate->TabIndex = 5;
 			this->CheckSYPirate->Text = L"Pirate";
 			this->CheckSYPirate->TextImageRelation = System::Windows::Forms::TextImageRelation::ImageBeforeText;
 			this->CheckSYPirate->UseVisualStyleBackColor = true;
 			this->CheckSYPirate->CheckedChanged += gcnew System::EventHandler(this, &PackageForm::CheckSYPirate_CheckedChanged);
 			//
 			// CheckSYFriend
 			//
-			this->CheckSYFriend->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"CheckSYFriend.Image")));
+			this->CheckSYFriend->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"CheckSYFriend.Image")));
 			this->CheckSYFriend->ImageAlign = System::Drawing::ContentAlignment::MiddleLeft;
-			this->CheckSYFriend->Location = System::Drawing::Point(3, 44);
+			this->CheckSYFriend->Location = System::Drawing::Point(4, 55);
+			this->CheckSYFriend->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->CheckSYFriend->Name = L"CheckSYFriend";
-			this->CheckSYFriend->Size = System::Drawing::Size(90, 35);
+			this->CheckSYFriend->Size = System::Drawing::Size(120, 43);
 			this->CheckSYFriend->TabIndex = 6;
 			this->CheckSYFriend->Text = L"Friendly Race";
 			this->CheckSYFriend->TextImageRelation = System::Windows::Forms::TextImageRelation::ImageBeforeText;
 			this->CheckSYFriend->UseVisualStyleBackColor = true;
 			this->CheckSYFriend->CheckedChanged += gcnew System::EventHandler(this, &PackageForm::CheckSYFriend_CheckedChanged);
 			//
 			// CheckSYXenon
 			//
-			this->CheckSYXenon->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"CheckSYXenon.Image")));
+			this->CheckSYXenon->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"CheckSYXenon.Image")));
 			this->CheckSYXenon->ImageAlign = System::Drawing::ContentAlignment::MiddleLeft;
-			this->CheckSYXenon->Location = System::Drawing::Point(99, 44);
+			this->CheckSYXenon->Location = System::Drawing::Point(132, 55);
+			this->CheckSYXenon->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->CheckSYXenon->Name = L"CheckSYXenon";
-			this->CheckSYXenon->Size = System::Drawing::Size(90, 35);
+			this->CheckSYXenon->Size = System::Drawing::Size(120, 43);
 			this->CheckSYXenon->TabIndex = 7;
 			this->CheckSYXenon->Text = L"Xenon";
 			this->CheckSYXenon->TextImageRelation = System::Windows::Forms::TextImageRelation::ImageBeforeText;
 			this->CheckSYXenon->UseVisualStyleBackColor = true;
 			this->CheckSYXenon->CheckedChanged += gcnew System::EventHandler(this, &PackageForm::CheckSYXenon_CheckedChanged);
 			//
 			// CheckSYTerran
 			//
-			this->CheckSYTerran->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"CheckSYTerran.Image")));
+			this->CheckSYTerran->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"CheckSYTerran.Image")));
 			this->CheckSYTerran->ImageAlign = System::Drawing::ContentAlignment::MiddleLeft;
-			this->CheckSYTerran->Location = System::Drawing::Point(195, 44);
+			this->CheckSYTerran->Location = System::Drawing::Point(260, 55);
+			this->CheckSYTerran->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->CheckSYTerran->Name = L"CheckSYTerran";
-			this->CheckSYTerran->Size = System::Drawing::Size(90, 35);
+			this->CheckSYTerran->Size = System::Drawing::Size(120, 43);
 			this->CheckSYTerran->TabIndex = 8;
 			this->CheckSYTerran->Text = L"Terran";
 			this->CheckSYTerran->TextImageRelation = System::Windows::Forms::TextImageRelation::ImageBeforeText;
 			this->CheckSYTerran->UseVisualStyleBackColor = true;
 			this->CheckSYTerran->CheckedChanged += gcnew System::EventHandler(this, &PackageForm::CheckSYTerran_CheckedChanged);
 			//
 			// CheckSYATF
 			//
-			this->CheckSYATF->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"CheckSYATF.Image")));
+			this->CheckSYATF->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"CheckSYATF.Image")));
 			this->CheckSYATF->ImageAlign = System::Drawing::ContentAlignment::MiddleLeft;
-			this->CheckSYATF->Location = System::Drawing::Point(291, 44);
+			this->CheckSYATF->Location = System::Drawing::Point(388, 55);
+			this->CheckSYATF->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->CheckSYATF->Name = L"CheckSYATF";
-			this->CheckSYATF->Size = System::Drawing::Size(90, 35);
+			this->CheckSYATF->Size = System::Drawing::Size(120, 43);
 			this->CheckSYATF->TabIndex = 9;
 			this->CheckSYATF->Text = L"ATF";
 			this->CheckSYATF->TextImageRelation = System::Windows::Forms::TextImageRelation::ImageBeforeText;
 			this->CheckSYATF->UseVisualStyleBackColor = true;
 			this->CheckSYATF->CheckedChanged += gcnew System::EventHandler(this, &PackageForm::CheckSYATF_CheckedChanged);
 			//
 			// CheckSYYaki
 			//
-			this->CheckSYYaki->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"CheckSYYaki.Image")));
+			this->CheckSYYaki->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"CheckSYYaki.Image")));
 			this->CheckSYYaki->ImageAlign = System::Drawing::ContentAlignment::MiddleLeft;
-			this->CheckSYYaki->Location = System::Drawing::Point(387, 44);
+			this->CheckSYYaki->Location = System::Drawing::Point(516, 55);
+			this->CheckSYYaki->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->CheckSYYaki->Name = L"CheckSYYaki";
-			this->CheckSYYaki->Size = System::Drawing::Size(90, 35);
+			this->CheckSYYaki->Size = System::Drawing::Size(120, 43);
 			this->CheckSYYaki->TabIndex = 10;
 			this->CheckSYYaki->Text = L"Yaki";
 			this->CheckSYYaki->TextImageRelation = System::Windows::Forms::TextImageRelation::ImageBeforeText;
 			this->CheckSYYaki->UseVisualStyleBackColor = true;
 			this->CheckSYYaki->CheckedChanged += gcnew System::EventHandler(this, &PackageForm::CheckSYYaki_CheckedChanged);
 			//
 			// PageRaw
 			//
 			this->PageRaw->Controls->Add(this->panel23);
 			this->PageRaw->Controls->Add(this->flowLayoutPanel3);
-			this->PageRaw->Location = System::Drawing::Point(4, 22);
+			this->PageRaw->Location = System::Drawing::Point(4, 46);
+			this->PageRaw->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->PageRaw->Name = L"PageRaw";
-			this->PageRaw->Padding = System::Windows::Forms::Padding(3);
+			this->PageRaw->Padding = System::Windows::Forms::Padding(4, 4, 4, 4);
-			this->PageRaw->Size = System::Drawing::Size(748, 216);
+			this->PageRaw->Size = System::Drawing::Size(1000, 248);
 			this->PageRaw->TabIndex = 7;
 			this->PageRaw->Text = L"Ship Data";
 			this->PageRaw->UseVisualStyleBackColor = true;
 			//
 			// panel23
 			//
 			this->panel23->Controls->Add(this->TextShipData);
 			this->panel23->Controls->Add(this->panel24);
 			this->panel23->Dock = System::Windows::Forms::DockStyle::Fill;
-			this->panel23->Location = System::Drawing::Point(3, 42);
+			this->panel23->Location = System::Drawing::Point(4, 52);
+			this->panel23->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->panel23->Name = L"panel23";
-			this->panel23->Padding = System::Windows::Forms::Padding(10);
+			this->panel23->Padding = System::Windows::Forms::Padding(13, 12, 13, 12);
-			this->panel23->Size = System::Drawing::Size(742, 171);
+			this->panel23->Size = System::Drawing::Size(992, 192);
 			this->panel23->TabIndex = 3;
 			//
 			// TextShipData
 			//
 			this->TextShipData->BackColor = System::Drawing::SystemColors::Control;
 			this->TextShipData->Dock = System::Windows::Forms::DockStyle::Fill;
-			this->TextShipData->Location = System::Drawing::Point(10, 34);
+			this->TextShipData->Location = System::Drawing::Point(13, 42);
+			this->TextShipData->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->TextShipData->Name = L"TextShipData";
 			this->TextShipData->ReadOnly = true;
-			this->TextShipData->Size = System::Drawing::Size(722, 127);
+			this->TextShipData->Size = System::Drawing::Size(966, 138);
 			this->TextShipData->TabIndex = 0;
 			this->TextShipData->Text = L"";
 			this->TextShipData->TextChanged += gcnew System::EventHandler(this, &PackageForm::TextShipData_TextChanged);
 			//
 			// panel24
 			//
 			this->panel24->Controls->Add(this->label17);
 			this->panel24->Controls->Add(this->checkBox1);
 			this->panel24->Dock = System::Windows::Forms::DockStyle::Top;
-			this->panel24->Location = System::Drawing::Point(10, 10);
+			this->panel24->Location = System::Drawing::Point(13, 12);
+			this->panel24->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->panel24->Name = L"panel24";
-			this->panel24->Size = System::Drawing::Size(722, 24);
+			this->panel24->Size = System::Drawing::Size(966, 30);
 			this->panel24->TabIndex = 2;
 			//
 			// label17
 			//
 			this->label17->Dock = System::Windows::Forms::DockStyle::Fill;
-			this->label17->Location = System::Drawing::Point(107, 0);
+			this->label17->Location = System::Drawing::Point(129, 0);
+			this->label17->Margin = System::Windows::Forms::Padding(4, 0, 4, 0);
 			this->label17->Name = L"label17";
-			this->label17->Size = System::Drawing::Size(615, 24);
+			this->label17->Size = System::Drawing::Size(837, 30);
 			this->label17->TabIndex = 2;
 			this->label17->Text = L"(Warning: Making changes could break the ship if you dont know what your doing)";
 			this->label17->TextAlign = System::Drawing::ContentAlignment::MiddleLeft;
 			//
 			// checkBox1
 			//
 			this->checkBox1->AutoSize = true;
 			this->checkBox1->Dock = System::Windows::Forms::DockStyle::Left;
 			this->checkBox1->Font = (gcnew System::Drawing::Font(L"Microsoft Sans Serif", 12, System::Drawing::FontStyle::Bold, System::Drawing::GraphicsUnit::Point,
 				static_cast<System::Byte>(0)));
 			this->checkBox1->Location = System::Drawing::Point(0, 0);
+			this->checkBox1->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->checkBox1->Name = L"checkBox1";
-			this->checkBox1->Size = System::Drawing::Size(107, 24);
+			this->checkBox1->Size = System::Drawing::Size(129, 30);
 			this->checkBox1->TabIndex = 1;
 			this->checkBox1->Text = L"Allow Edit";
 			this->checkBox1->UseVisualStyleBackColor = true;
 			this->checkBox1->CheckedChanged += gcnew System::EventHandler(this, &PackageForm::checkBox1_CheckedChanged);
 			//
 			// flowLayoutPanel3
 			//
 			this->flowLayoutPanel3->Controls->Add(this->button3);
 			this->flowLayoutPanel3->Controls->Add(this->button5);
 			this->flowLayoutPanel3->Dock = System::Windows::Forms::DockStyle::Top;
-			this->flowLayoutPanel3->Location = System::Drawing::Point(3, 3);
+			this->flowLayoutPanel3->Location = System::Drawing::Point(4, 4);
+			this->flowLayoutPanel3->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->flowLayoutPanel3->Name = L"flowLayoutPanel3";
-			this->flowLayoutPanel3->Size = System::Drawing::Size(742, 39);
+			this->flowLayoutPanel3->Size = System::Drawing::Size(992, 48);
 			this->flowLayoutPanel3->TabIndex = 4;
 			//
 			// button3
 			//
 			this->button3->AutoSize = true;
 			this->button3->AutoSizeMode = System::Windows::Forms::AutoSizeMode::GrowAndShrink;
-			this->button3->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"button3.Image")));
+			this->button3->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"button3.Image")));
 			this->button3->ImageAlign = System::Drawing::ContentAlignment::MiddleLeft;
-			this->button3->Location = System::Drawing::Point(3, 3);
+			this->button3->Location = System::Drawing::Point(4, 4);
+			this->button3->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->button3->Name = L"button3";
-			this->button3->Size = System::Drawing::Size(113, 28);
+			this->button3->Size = System::Drawing::Size(138, 28);
 			this->button3->TabIndex = 2;
 			this->button3->Text = L"Load Ship Data";
 			this->button3->TextImageRelation = System::Windows::Forms::TextImageRelation::ImageBeforeText;
 			this->button3->UseVisualStyleBackColor = true;
 			this->button3->Click += gcnew System::EventHandler(this, &PackageForm::button3_Click);
 			//
 			// button5
 			//
 			this->button5->AutoSize = true;
 			this->button5->AutoSizeMode = System::Windows::Forms::AutoSizeMode::GrowAndShrink;
-			this->button5->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"button5.Image")));
+			this->button5->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"button5.Image")));
-			this->button5->Location = System::Drawing::Point(122, 3);
+			this->button5->Location = System::Drawing::Point(150, 4);
+			this->button5->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->button5->Name = L"button5";
-			this->button5->Size = System::Drawing::Size(111, 28);
+			this->button5->Size = System::Drawing::Size(137, 28);
 			this->button5->TabIndex = 3;
 			this->button5->Text = L"Customise Ship";
 			this->button5->TextImageRelation = System::Windows::Forms::TextImageRelation::ImageBeforeText;
 			this->button5->UseVisualStyleBackColor = true;
 			this->button5->Click += gcnew System::EventHandler(this, &PackageForm::button5_Click);
 			//
 			// PageShipComp
 			//
 			this->PageShipComp->Controls->Add(this->panel26);
 			this->PageShipComp->Controls->Add(this->panel25);
-			this->PageShipComp->Location = System::Drawing::Point(4, 22);
+			this->PageShipComp->Location = System::Drawing::Point(4, 46);
+			this->PageShipComp->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->PageShipComp->Name = L"PageShipComp";
-			this->PageShipComp->Padding = System::Windows::Forms::Padding(3);
+			this->PageShipComp->Padding = System::Windows::Forms::Padding(4, 4, 4, 4);
-			this->PageShipComp->Size = System::Drawing::Size(748, 216);
+			this->PageShipComp->Size = System::Drawing::Size(1000, 248);
 			this->PageShipComp->TabIndex = 8;
 			this->PageShipComp->Text = L"Ship Parts";
 			this->PageShipComp->UseVisualStyleBackColor = true;
 			//
 			// panel26
 			//
 			this->panel26->Controls->Add(this->ListShipPart);
 			this->panel26->Dock = System::Windows::Forms::DockStyle::Fill;
-			this->panel26->Location = System::Drawing::Point(3, 35);
+			this->panel26->Location = System::Drawing::Point(4, 43);
+			this->panel26->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->panel26->Name = L"panel26";
-			this->panel26->Padding = System::Windows::Forms::Padding(10);
+			this->panel26->Padding = System::Windows::Forms::Padding(13, 12, 13, 12);
-			this->panel26->Size = System::Drawing::Size(742, 178);
+			this->panel26->Size = System::Drawing::Size(992, 201);
 			this->panel26->TabIndex = 4;
 			//
 			// ListShipPart
 			//
-			this->ListShipPart->Columns->AddRange(gcnew cli::array< System::Windows::Forms::ColumnHeader^  >(3) {this->ColumnPart1, this->ColumnPart2,
+			this->ListShipPart->Columns->AddRange(gcnew cli::array< System::Windows::Forms::ColumnHeader^  >(3) {
+				this->ColumnPart1, this->ColumnPart2,
-				this->ColumnPart3});
+					this->ColumnPart3
+			});
 			this->ListShipPart->ContextMenuStrip = this->ContextShipPart;
 			this->ListShipPart->Dock = System::Windows::Forms::DockStyle::Fill;
 			this->ListShipPart->FullRowSelect = true;
+			this->ListShipPart->HideSelection = false;
-			this->ListShipPart->Location = System::Drawing::Point(10, 10);
+			this->ListShipPart->Location = System::Drawing::Point(13, 12);
+			this->ListShipPart->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->ListShipPart->Name = L"ListShipPart";
-			this->ListShipPart->Size = System::Drawing::Size(722, 158);
+			this->ListShipPart->Size = System::Drawing::Size(966, 177);
 			this->ListShipPart->TabIndex = 3;
 			this->ListShipPart->UseCompatibleStateImageBehavior = false;
 			this->ListShipPart->View = System::Windows::Forms::View::Details;
 			this->ListShipPart->MouseDoubleClick += gcnew System::Windows::Forms::MouseEventHandler(this, &PackageForm::ListShipPart_MouseDoubleClick);
 			//
 			// ContextShipPart
 			//
+			this->ContextShipPart->ImageScalingSize = System::Drawing::Size(20, 20);
-			this->ContextShipPart->Items->AddRange(gcnew cli::array< System::Windows::Forms::ToolStripItem^  >(7) {this->importToolStripMenuItem,
+			this->ContextShipPart->Items->AddRange(gcnew cli::array< System::Windows::Forms::ToolStripItem^  >(7) {
+				this->importToolStripMenuItem,
-				this->ContextShipPartAdd, this->ContextShipPartSep1, this->ContextShipPartRemove, this->ContextShipPartEdit, this->ContextShipPartSep2,
+					this->ContextShipPartAdd, this->ContextShipPartSep1, this->ContextShipPartRemove, this->ContextShipPartEdit, this->ContextShipPartSep2,
-				this->ContextShipPartClear});
+					this->ContextShipPartClear
+			});
 			this->ContextShipPart->Name = L"ContextShipPart";
-			this->ContextShipPart->Size = System::Drawing::Size(181, 206);
+			this->ContextShipPart->Size = System::Drawing::Size(210, 206);
 			this->ContextShipPart->Opening += gcnew System::ComponentModel::CancelEventHandler(this, &PackageForm::ContextShipPart_Opening);
 			//
 			// importToolStripMenuItem
 			//
-			this->importToolStripMenuItem->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"importToolStripMenuItem.Image")));
+			this->importToolStripMenuItem->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"importToolStripMenuItem.Image")));
 			this->importToolStripMenuItem->ImageScaling = System::Windows::Forms::ToolStripItemImageScaling::None;
 			this->importToolStripMenuItem->Name = L"importToolStripMenuItem";
-			this->importToolStripMenuItem->Size = System::Drawing::Size(180, 38);
+			this->importToolStripMenuItem->Size = System::Drawing::Size(209, 38);
 			this->importToolStripMenuItem->Text = L"Import";
 			this->importToolStripMenuItem->Click += gcnew System::EventHandler(this, &PackageForm::importToolStripMenuItem_Click);
 			//
 			// ContextShipPartAdd
 			//
-			this->ContextShipPartAdd->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"ContextShipPartAdd.Image")));
+			this->ContextShipPartAdd->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"ContextShipPartAdd.Image")));
 			this->ContextShipPartAdd->ImageScaling = System::Windows::Forms::ToolStripItemImageScaling::None;
 			this->ContextShipPartAdd->Name = L"ContextShipPartAdd";
-			this->ContextShipPartAdd->Size = System::Drawing::Size(180, 38);
+			this->ContextShipPartAdd->Size = System::Drawing::Size(209, 38);
 			this->ContextShipPartAdd->Text = L"Add";
 			this->ContextShipPartAdd->Click += gcnew System::EventHandler(this, &PackageForm::ContextShipPartAdd_Click);
 			//
 			// ContextShipPartSep1
 			//
 			this->ContextShipPartSep1->Name = L"ContextShipPartSep1";
-			this->ContextShipPartSep1->Size = System::Drawing::Size(177, 6);
+			this->ContextShipPartSep1->Size = System::Drawing::Size(206, 6);
 			//
 			// ContextShipPartRemove
 			//
-			this->ContextShipPartRemove->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"ContextShipPartRemove.Image")));
+			this->ContextShipPartRemove->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"ContextShipPartRemove.Image")));
 			this->ContextShipPartRemove->ImageScaling = System::Windows::Forms::ToolStripItemImageScaling::None;
 			this->ContextShipPartRemove->Name = L"ContextShipPartRemove";
-			this->ContextShipPartRemove->Size = System::Drawing::Size(180, 38);
+			this->ContextShipPartRemove->Size = System::Drawing::Size(209, 38);
 			this->ContextShipPartRemove->Text = L"Remove Selected";
 			this->ContextShipPartRemove->Click += gcnew System::EventHandler(this, &PackageForm::ContextShipPartRemove_Click);
 			//
 			// ContextShipPartEdit
 			//
-			this->ContextShipPartEdit->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"ContextShipPartEdit.Image")));
+			this->ContextShipPartEdit->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"ContextShipPartEdit.Image")));
 			this->ContextShipPartEdit->ImageScaling = System::Windows::Forms::ToolStripItemImageScaling::None;
 			this->ContextShipPartEdit->Name = L"ContextShipPartEdit";
-			this->ContextShipPartEdit->Size = System::Drawing::Size(180, 38);
+			this->ContextShipPartEdit->Size = System::Drawing::Size(209, 38);
 			this->ContextShipPartEdit->Text = L"Edit Selected";
 			this->ContextShipPartEdit->Click += gcnew System::EventHandler(this, &PackageForm::ContextShipPartEdit_Click);
 			//
 			// ContextShipPartSep2
 			//
 			this->ContextShipPartSep2->Name = L"ContextShipPartSep2";
-			this->ContextShipPartSep2->Size = System::Drawing::Size(177, 6);
+			this->ContextShipPartSep2->Size = System::Drawing::Size(206, 6);
 			//
 			// ContextShipPartClear
 			//
-			this->ContextShipPartClear->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"ContextShipPartClear.Image")));
+			this->ContextShipPartClear->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"ContextShipPartClear.Image")));
 			this->ContextShipPartClear->ImageScaling = System::Windows::Forms::ToolStripItemImageScaling::None;
 			this->ContextShipPartClear->Name = L"ContextShipPartClear";
-			this->ContextShipPartClear->Size = System::Drawing::Size(180, 38);
+			this->ContextShipPartClear->Size = System::Drawing::Size(209, 38);
 			this->ContextShipPartClear->Text = L"Clear All";
 			this->ContextShipPartClear->Click += gcnew System::EventHandler(this, &PackageForm::ContextShipPartClear_Click);
 			//
 			// panel25
 			//
 			this->panel25->Controls->Add(this->ComboShipPart);
 			this->panel25->Controls->Add(this->label18);
 			this->panel25->Dock = System::Windows::Forms::DockStyle::Top;
-			this->panel25->Location = System::Drawing::Point(3, 3);
+			this->panel25->Location = System::Drawing::Point(4, 4);
+			this->panel25->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->panel25->Name = L"panel25";
-			this->panel25->Padding = System::Windows::Forms::Padding(5);
+			this->panel25->Padding = System::Windows::Forms::Padding(7, 6, 7, 6);
-			this->panel25->Size = System::Drawing::Size(742, 32);
+			this->panel25->Size = System::Drawing::Size(992, 39);
 			this->panel25->TabIndex = 2;
 			//
 			// ComboShipPart
 			//
 			this->ComboShipPart->Dock = System::Windows::Forms::DockStyle::Fill;
 			this->ComboShipPart->DropDownStyle = System::Windows::Forms::ComboBoxStyle::DropDownList;
 			this->ComboShipPart->FormattingEnabled = true;
-			this->ComboShipPart->Items->AddRange(gcnew cli::array< System::Object^  >(6) {L"Componants", L"Dummies", L"Cockpits", L"CutData",
+			this->ComboShipPart->Items->AddRange(gcnew cli::array< System::Object^  >(6) {
+				L"Componants", L"Dummies", L"Cockpits", L"CutData",
-				L"Bodies", L"Animations";});
+					L"Bodies", L"Animations"
+			});
-			this->ComboShipPart->Location = System::Drawing::Point(105, 5);
+			this->ComboShipPart->Location = System::Drawing::Point(140, 6);
+			this->ComboShipPart->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->ComboShipPart->Name = L"ComboShipPart";
-			this->ComboShipPart->Size = System::Drawing::Size(632, 21);
+			this->ComboShipPart->Size = System::Drawing::Size(845, 24);
 			this->ComboShipPart->TabIndex = 0;
 			this->ComboShipPart->SelectedIndexChanged += gcnew System::EventHandler(this, &PackageForm::ComboShipPart_SelectedIndexChanged);
 			//
 			// label18
 			//
 			this->label18->Dock = System::Windows::Forms::DockStyle::Left;
 			this->label18->Font = (gcnew System::Drawing::Font(L"Microsoft Sans Serif", 9.75F, System::Drawing::FontStyle::Bold, System::Drawing::GraphicsUnit::Point,
 				static_cast<System::Byte>(0)));
-			this->label18->Location = System::Drawing::Point(5, 5);
+			this->label18->Location = System::Drawing::Point(7, 6);
+			this->label18->Margin = System::Windows::Forms::Padding(4, 0, 4, 0);
 			this->label18->Name = L"label18";
-			this->label18->Size = System::Drawing::Size(100, 22);
+			this->label18->Size = System::Drawing::Size(133, 27);
 			this->label18->TabIndex = 1;
 			this->label18->Text = L"Part Type";
 			this->label18->TextAlign = System::Drawing::ContentAlignment::MiddleLeft;
 			//
 			// CheckShipID
 			//
 			this->CheckShipID->AutoSize = true;
 			this->CheckShipID->Dock = System::Windows::Forms::DockStyle::Left;
-			this->CheckShipID->Location = System::Drawing::Point(157, 0);
+			this->CheckShipID->Location = System::Drawing::Point(209, 0);
+			this->CheckShipID->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->CheckShipID->Name = L"CheckShipID";
-			this->CheckShipID->Size = System::Drawing::Size(129, 20);
+			this->CheckShipID->Size = System::Drawing::Size(166, 25);
 			this->CheckShipID->TabIndex = 2;
 			this->CheckShipID->Text = L"Replace Existing Ship";
 			this->CheckShipID->UseVisualStyleBackColor = true;
 			this->CheckShipID->CheckedChanged += gcnew System::EventHandler(this, &PackageForm::CheckShipID_CheckedChanged);
 			//
 			// panel1
 			//
 			this->panel1->Controls->Add(this->TextName);
 			this->panel1->Controls->Add(this->label1);
 			this->panel1->Dock = System::Windows::Forms::DockStyle::Top;
-			this->panel1->Location = System::Drawing::Point(5, 36);
+			this->panel1->Location = System::Drawing::Point(7, 37);
+			this->panel1->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->panel1->Name = L"panel1";
-			this->panel1->Size = System::Drawing::Size(756, 17);
+			this->panel1->Size = System::Drawing::Size(1007, 21);
 			this->panel1->TabIndex = 2;
 			//
 			// TextName
 			//
 			this->TextName->Dock = System::Windows::Forms::DockStyle::Fill;
-			this->TextName->Location = System::Drawing::Point(157, 0);
+			this->TextName->Location = System::Drawing::Point(209, 0);
+			this->TextName->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->TextName->Name = L"TextName";
-			this->TextName->Size = System::Drawing::Size(599, 20);
+			this->TextName->Size = System::Drawing::Size(798, 22);
 			this->TextName->TabIndex = 1;
 			this->TextName->TextChanged += gcnew System::EventHandler(this, &PackageForm::TextName_TextChanged);
 			//
 			// label1
 			//
 			this->label1->Dock = System::Windows::Forms::DockStyle::Left;
 			this->label1->Font = (gcnew System::Drawing::Font(L"Microsoft Sans Serif", 9.75F, System::Drawing::FontStyle::Bold, System::Drawing::GraphicsUnit::Point,
 				static_cast<System::Byte>(0)));
 			this->label1->Location = System::Drawing::Point(0, 0);
+			this->label1->Margin = System::Windows::Forms::Padding(4, 0, 4, 0);
 			this->label1->Name = L"label1";
-			this->label1->Size = System::Drawing::Size(157, 17);
+			this->label1->Size = System::Drawing::Size(209, 21);
 			this->label1->TabIndex = 0;
 			this->label1->Text = L"Package Name";
 			this->label1->TextAlign = System::Drawing::ContentAlignment::MiddleLeft;
 			//
 			// panel2
 			//
 			this->panel2->Controls->Add(this->TextAuthor);
 			this->panel2->Controls->Add(this->label2);
 			this->panel2->Dock = System::Windows::Forms::DockStyle::Top;
-			this->panel2->Location = System::Drawing::Point(5, 53);
+			this->panel2->Location = System::Drawing::Point(7, 58);
+			this->panel2->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->panel2->Name = L"panel2";
-			this->panel2->Size = System::Drawing::Size(756, 20);
+			this->panel2->Size = System::Drawing::Size(1007, 25);
 			this->panel2->TabIndex = 3;
 			//
 			// TextAuthor
 			//
 			this->TextAuthor->Dock = System::Windows::Forms::DockStyle::Fill;
-			this->TextAuthor->Location = System::Drawing::Point(157, 0);
+			this->TextAuthor->Location = System::Drawing::Point(209, 0);
+			this->TextAuthor->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->TextAuthor->Name = L"TextAuthor";
-			this->TextAuthor->Size = System::Drawing::Size(599, 20);
+			this->TextAuthor->Size = System::Drawing::Size(798, 22);
 			this->TextAuthor->TabIndex = 1;
 			this->TextAuthor->TextChanged += gcnew System::EventHandler(this, &PackageForm::TextAuthor_TextChanged);
 			//
 			// label2
 			//
 			this->label2->Dock = System::Windows::Forms::DockStyle::Left;
 			this->label2->Font = (gcnew System::Drawing::Font(L"Microsoft Sans Serif", 9.75F, System::Drawing::FontStyle::Bold, System::Drawing::GraphicsUnit::Point,
 				static_cast<System::Byte>(0)));
 			this->label2->Location = System::Drawing::Point(0, 0);
+			this->label2->Margin = System::Windows::Forms::Padding(4, 0, 4, 0);
 			this->label2->Name = L"label2";
-			this->label2->Size = System::Drawing::Size(157, 20);
+			this->label2->Size = System::Drawing::Size(209, 25);
 			this->label2->TabIndex = 0;
 			this->label2->Text = L"Author";
 			this->label2->TextAlign = System::Drawing::ContentAlignment::MiddleLeft;
 			//
 			// panel3
 			//
 			this->panel3->Controls->Add(this->TextVersion);
 			this->panel3->Controls->Add(this->label3);
 			this->panel3->Dock = System::Windows::Forms::DockStyle::Top;
-			this->panel3->Location = System::Drawing::Point(5, 73);
+			this->panel3->Location = System::Drawing::Point(7, 83);
+			this->panel3->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->panel3->Name = L"panel3";
-			this->panel3->Size = System::Drawing::Size(756, 20);
+			this->panel3->Size = System::Drawing::Size(1007, 25);
 			this->panel3->TabIndex = 4;
 			//
 			// TextVersion
 			//
 			this->TextVersion->Dock = System::Windows::Forms::DockStyle::Fill;
-			this->TextVersion->Location = System::Drawing::Point(157, 0);
+			this->TextVersion->Location = System::Drawing::Point(209, 0);
+			this->TextVersion->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->TextVersion->Name = L"TextVersion";
-			this->TextVersion->Size = System::Drawing::Size(599, 20);
+			this->TextVersion->Size = System::Drawing::Size(798, 22);
 			this->TextVersion->TabIndex = 1;
 			this->TextVersion->TextChanged += gcnew System::EventHandler(this, &PackageForm::TextVersion_TextChanged);
 			//
 			// label3
 			//
 			this->label3->Dock = System::Windows::Forms::DockStyle::Left;
 			this->label3->Font = (gcnew System::Drawing::Font(L"Microsoft Sans Serif", 9.75F, System::Drawing::FontStyle::Bold, System::Drawing::GraphicsUnit::Point,
 				static_cast<System::Byte>(0)));
 			this->label3->Location = System::Drawing::Point(0, 0);
+			this->label3->Margin = System::Windows::Forms::Padding(4, 0, 4, 0);
 			this->label3->Name = L"label3";
-			this->label3->Size = System::Drawing::Size(157, 20);
+			this->label3->Size = System::Drawing::Size(209, 25);
 			this->label3->TabIndex = 0;
 			this->label3->Text = L"Version";
 			this->label3->TextAlign = System::Drawing::ContentAlignment::MiddleLeft;
 			//
 			// panel4
 			//
 			this->panel4->Controls->Add(this->CreationDate);
 			this->panel4->Controls->Add(this->label4);
 			this->panel4->Dock = System::Windows::Forms::DockStyle::Top;
-			this->panel4->Location = System::Drawing::Point(5, 93);
+			this->panel4->Location = System::Drawing::Point(7, 108);
+			this->panel4->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->panel4->Name = L"panel4";
-			this->panel4->Size = System::Drawing::Size(756, 20);
+			this->panel4->Size = System::Drawing::Size(1007, 25);
 			this->panel4->TabIndex = 5;
 			//
 			// CreationDate
 			//
 			this->CreationDate->Checked = false;
 			this->CreationDate->Dock = System::Windows::Forms::DockStyle::Fill;
-			this->CreationDate->Location = System::Drawing::Point(157, 0);
+			this->CreationDate->Location = System::Drawing::Point(209, 0);
+			this->CreationDate->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->CreationDate->Name = L"CreationDate";
 			this->CreationDate->RightToLeft = System::Windows::Forms::RightToLeft::No;
-			this->CreationDate->Size = System::Drawing::Size(599, 20);
+			this->CreationDate->Size = System::Drawing::Size(798, 22);
 			this->CreationDate->TabIndex = 2;
 			this->CreationDate->Value = System::DateTime(2009, 12, 8, 19, 52, 0, 0);
 			this->CreationDate->ValueChanged += gcnew System::EventHandler(this, &PackageForm::CreationDate_ValueChanged);
 			//
 			// label4
 			//
 			this->label4->Dock = System::Windows::Forms::DockStyle::Left;
 			this->label4->Font = (gcnew System::Drawing::Font(L"Microsoft Sans Serif", 9.75F, System::Drawing::FontStyle::Bold, System::Drawing::GraphicsUnit::Point,
 				static_cast<System::Byte>(0)));
 			this->label4->Location = System::Drawing::Point(0, 0);
+			this->label4->Margin = System::Windows::Forms::Padding(4, 0, 4, 0);
 			this->label4->Name = L"label4";
-			this->label4->Size = System::Drawing::Size(157, 20);
+			this->label4->Size = System::Drawing::Size(209, 25);
 			this->label4->TabIndex = 0;
 			this->label4->Text = L"Creation Date";
 			this->label4->TextAlign = System::Drawing::ContentAlignment::MiddleLeft;
 			//
 			// label6
 			//
 			this->label6->Dock = System::Windows::Forms::DockStyle::Left;
 			this->label6->Font = (gcnew System::Drawing::Font(L"Microsoft Sans Serif", 9.75F, System::Drawing::FontStyle::Bold, System::Drawing::GraphicsUnit::Point,
 				static_cast<System::Byte>(0)));
 			this->label6->Location = System::Drawing::Point(0, 0);
+			this->label6->Margin = System::Windows::Forms::Padding(4, 0, 4, 0);
 			this->label6->Name = L"label6";
-			this->label6->Size = System::Drawing::Size(157, 20);
+			this->label6->Size = System::Drawing::Size(209, 25);
 			this->label6->TabIndex = 1;
 			this->label6->Text = L"Ship ID";
 			this->label6->TextAlign = System::Drawing::ContentAlignment::MiddleLeft;
 			//
 			// PanelShip
 			//
 			this->PanelShip->Controls->Add(this->TextShipID);
 			this->PanelShip->Controls->Add(this->CheckShipID);
 			this->PanelShip->Controls->Add(this->label6);
 			this->PanelShip->Dock = System::Windows::Forms::DockStyle::Top;
-			this->PanelShip->Location = System::Drawing::Point(5, 113);
+			this->PanelShip->Location = System::Drawing::Point(7, 133);
+			this->PanelShip->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->PanelShip->Name = L"PanelShip";
-			this->PanelShip->Size = System::Drawing::Size(756, 20);
+			this->PanelShip->Size = System::Drawing::Size(1007, 25);
 			this->PanelShip->TabIndex = 6;
 			//
 			// TextShipID
 			//
 			this->TextShipID->Dock = System::Windows::Forms::DockStyle::Fill;
-			this->TextShipID->Location = System::Drawing::Point(286, 0);
+			this->TextShipID->Location = System::Drawing::Point(375, 0);
+			this->TextShipID->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->TextShipID->Name = L"TextShipID";
-			this->TextShipID->Size = System::Drawing::Size(470, 20);
+			this->TextShipID->Size = System::Drawing::Size(632, 22);
 			this->TextShipID->TabIndex = 2;
 			this->TextShipID->TextChanged += gcnew System::EventHandler(this, &PackageForm::TextShipID_TextChanged);
 			//
 			// toolStrip1
 			//
 			this->toolStrip1->GripStyle = System::Windows::Forms::ToolStripGripStyle::Hidden;
 			this->toolStrip1->ImageScalingSize = System::Drawing::Size(24, 24);
-			this->toolStrip1->Items->AddRange(gcnew cli::array< System::Windows::Forms::ToolStripItem^  >(8) {this->toolStripButton2,
+			this->toolStrip1->Items->AddRange(gcnew cli::array< System::Windows::Forms::ToolStripItem^  >(8) {
+				this->toolStripButton2,
-				this->toolStripButton3, this->toolStripButton5, this->toolStripSeparator3, this->toolStripButton1, this->toolStripButton4, this->toolStripSeparator4,
+					this->toolStripButton3, this->toolStripButton5, this->toolStripSeparator3, this->toolStripButton1, this->toolStripButton4, this->toolStripSeparator4,
-				this->ToolCustomise});
+					this->ToolCustomise
+			});
-			this->toolStrip1->Location = System::Drawing::Point(5, 5);
+			this->toolStrip1->Location = System::Drawing::Point(7, 6);
 			this->toolStrip1->Name = L"toolStrip1";
-			this->toolStrip1->Size = System::Drawing::Size(756, 31);
+			this->toolStrip1->Size = System::Drawing::Size(1007, 31);
 			this->toolStrip1->Stretch = true;
 			this->toolStrip1->TabIndex = 7;
 			this->toolStrip1->Text = L"toolStrip1";
 			//
 			// toolStripButton2
 			//
-			this->toolStripButton2->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"toolStripButton2.Image")));
+			this->toolStripButton2->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"toolStripButton2.Image")));
 			this->toolStripButton2->ImageTransparentColor = System::Drawing::Color::Magenta;
 			this->toolStripButton2->Name = L"toolStripButton2";
-			this->toolStripButton2->Size = System::Drawing::Size(59, 28);
+			this->toolStripButton2->Size = System::Drawing::Size(68, 28);
 			this->toolStripButton2->Text = L"Save";
 			this->toolStripButton2->Click += gcnew System::EventHandler(this, &PackageForm::toolStripButton2_Click);
 			//
 			// toolStripButton3
 			//
-			this->toolStripButton3->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"toolStripButton3.Image")));
+			this->toolStripButton3->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"toolStripButton3.Image")));
 			this->toolStripButton3->ImageTransparentColor = System::Drawing::Color::Magenta;
 			this->toolStripButton3->Name = L"toolStripButton3";
-			this->toolStripButton3->Size = System::Drawing::Size(75, 28);
+			this->toolStripButton3->Size = System::Drawing::Size(88, 28);
 			this->toolStripButton3->Text = L"Save As";
 			this->toolStripButton3->Click += gcnew System::EventHandler(this, &PackageForm::toolStripButton3_Click);
 			//
 			// toolStripButton5
 			//
-			this->toolStripButton5->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"toolStripButton5.Image")));
+			this->toolStripButton5->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"toolStripButton5.Image")));
 			this->toolStripButton5->ImageTransparentColor = System::Drawing::Color::Magenta;
 			this->toolStripButton5->Name = L"toolStripButton5";
-			this->toolStripButton5->Size = System::Drawing::Size(68, 28);
+			this->toolStripButton5->Size = System::Drawing::Size(80, 28);
 			this->toolStripButton5->Text = L"Export";
 			this->toolStripButton5->ToolTipText = L"Exports the package to an archive";
 			this->toolStripButton5->Click += gcnew System::EventHandler(this, &PackageForm::toolStripButton5_Click);
 			//
 			// toolStripSeparator3
 			this->toolStripSeparator3->Size = System::Drawing::Size(6, 31);
 			//
 			// toolStripButton1
 			//
 			this->toolStripButton1->DisplayStyle = System::Windows::Forms::ToolStripItemDisplayStyle::Image;
-			this->toolStripButton1->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"toolStripButton1.Image")));
+			this->toolStripButton1->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"toolStripButton1.Image")));
 			this->toolStripButton1->ImageTransparentColor = System::Drawing::Color::Magenta;
 			this->toolStripButton1->Name = L"toolStripButton1";
 			this->toolStripButton1->Size = System::Drawing::Size(28, 28);
 			this->toolStripButton1->Text = L"Generate Script";
 			this->toolStripButton1->ToolTipText = L"Generate packager script";
 			this->toolStripButton1->Click += gcnew System::EventHandler(this, &PackageForm::toolStripButton1_Click);
 			//
 			// toolStripButton4
 			//
 			this->toolStripButton4->DisplayStyle = System::Windows::Forms::ToolStripItemDisplayStyle::Image;
-			this->toolStripButton4->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"toolStripButton4.Image")));
+			this->toolStripButton4->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"toolStripButton4.Image")));
 			this->toolStripButton4->ImageTransparentColor = System::Drawing::Color::Magenta;
 			this->toolStripButton4->Name = L"toolStripButton4";
 			this->toolStripButton4->Size = System::Drawing::Size(28, 28);
 			this->toolStripButton4->Text = L"toolStripButton4";
 			this->toolStripButton4->ToolTipText = L"Generate package update file to allow auto updates";
 			this->toolStripSeparator4->Size = System::Drawing::Size(6, 31);
 			//
 			// ToolCustomise
 			//
 			this->ToolCustomise->DisplayStyle = System::Windows::Forms::ToolStripItemDisplayStyle::Image;
-			this->ToolCustomise->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"ToolCustomise.Image")));
+			this->ToolCustomise->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"ToolCustomise.Image")));
 			this->ToolCustomise->ImageTransparentColor = System::Drawing::Color::Magenta;
 			this->ToolCustomise->Name = L"ToolCustomise";
 			this->ToolCustomise->Size = System::Drawing::Size(28, 28);
 			this->ToolCustomise->Text = L"toolStripButton5";
 			this->ToolCustomise->ToolTipText = L"Customise Ship, allows you to edit the ships data to adjust its stats";
 			this->toolTip2->Popup += gcnew System::Windows::Forms::PopupEventHandler(this, &PackageForm::toolTip2_Popup);
 			//
 			// PackageForm
 			//
 			this->AllowDrop = true;
-			this->AutoScaleDimensions = System::Drawing::SizeF(6, 13);
+			this->AutoScaleDimensions = System::Drawing::SizeF(8, 16);
 			this->AutoScaleMode = System::Windows::Forms::AutoScaleMode::Font;
-			this->ClientSize = System::Drawing::Size(766, 710);
+			this->ClientSize = System::Drawing::Size(1021, 874);
 			this->Controls->Add(this->groupBox1);
 			this->Controls->Add(this->tabControl1);
 			this->Controls->Add(this->PanelShip);
 			this->Controls->Add(this->panel4);
 			this->Controls->Add(this->panel3);
 			this->Controls->Add(this->panel2);
 			this->Controls->Add(this->panel1);
 			this->Controls->Add(this->toolStrip1);
-			this->Icon = (cli::safe_cast<System::Drawing::Icon^  >(resources->GetObject(L"$this.Icon")));
+			this->Icon = (cli::safe_cast<System::Drawing::Icon^>(resources->GetObject(L"$this.Icon")));
+			this->Margin = System::Windows::Forms::Padding(4, 4, 4, 4);
 			this->Name = L"PackageForm";
-			this->Padding = System::Windows::Forms::Padding(5);
+			this->Padding = System::Windows::Forms::Padding(7, 6, 7, 6);
 			this->ShowIcon = false;
 			this->ShowInTaskbar = false;
 			this->StartPosition = System::Windows::Forms::FormStartPosition::CenterParent;
 			this->Text = L"Package";
 			this->Load += gcnew System::EventHandler(this, &PackageForm::PackageForm_Load);
-			(cli::safe_cast<System::ComponentModel::ISupportInitialize^  >(this->PicChange5))->EndInit();
+			(cli::safe_cast<System::ComponentModel::ISupportInitialize^>(this->PicChange5))->EndInit();
-			(cli::safe_cast<System::ComponentModel::ISupportInitialize^  >(this->PicChange1))->EndInit();
+			(cli::safe_cast<System::ComponentModel::ISupportInitialize^>(this->PicChange1))->EndInit();
-			(cli::safe_cast<System::ComponentModel::ISupportInitialize^  >(this->PicRec5))->EndInit();
+			(cli::safe_cast<System::ComponentModel::ISupportInitialize^>(this->PicRec5))->EndInit();
 			this->groupBox1->ResumeLayout(false);
 			this->ContextFiles->ResumeLayout(false);
 			this->panel6->ResumeLayout(false);
 			this->panel5->ResumeLayout(false);
 			this->tabControl1->ResumeLayout(false);
 			this->panel18->ResumeLayout(false);
 			this->panel18->PerformLayout();
 			this->groupBox6->ResumeLayout(false);
 			this->panel17->ResumeLayout(false);
 			this->GroupChange->ResumeLayout(false);
-			(cli::safe_cast<System::ComponentModel::ISupportInitialize^  >(this->PicChange4))->EndInit();
+			(cli::safe_cast<System::ComponentModel::ISupportInitialize^>(this->PicChange4))->EndInit();
-			(cli::safe_cast<System::ComponentModel::ISupportInitialize^  >(this->PicChange3))->EndInit();
+			(cli::safe_cast<System::ComponentModel::ISupportInitialize^>(this->PicChange3))->EndInit();
-			(cli::safe_cast<System::ComponentModel::ISupportInitialize^  >(this->PicChange2))->EndInit();
+			(cli::safe_cast<System::ComponentModel::ISupportInitialize^>(this->PicChange2))->EndInit();
 			this->GroupRec->ResumeLayout(false);
-			(cli::safe_cast<System::ComponentModel::ISupportInitialize^  >(this->PicRec4))->EndInit();
+			(cli::safe_cast<System::ComponentModel::ISupportInitialize^>(this->PicRec4))->EndInit();
-			(cli::safe_cast<System::ComponentModel::ISupportInitialize^  >(this->PicRec3))->EndInit();
+			(cli::safe_cast<System::ComponentModel::ISupportInitialize^>(this->PicRec3))->EndInit();
-			(cli::safe_cast<System::ComponentModel::ISupportInitialize^  >(this->PicRec2))->EndInit();
+			(cli::safe_cast<System::ComponentModel::ISupportInitialize^>(this->PicRec2))->EndInit();
-			(cli::safe_cast<System::ComponentModel::ISupportInitialize^  >(this->PicRec1))->EndInit();
+			(cli::safe_cast<System::ComponentModel::ISupportInitialize^>(this->PicRec1))->EndInit();
 			this->GroupEase->ResumeLayout(false);
-			(cli::safe_cast<System::ComponentModel::ISupportInitialize^  >(this->PicEase5))->EndInit();
+			(cli::safe_cast<System::ComponentModel::ISupportInitialize^>(this->PicEase5))->EndInit();
-			(cli::safe_cast<System::ComponentModel::ISupportInitialize^  >(this->PicEase4))->EndInit();
+			(cli::safe_cast<System::ComponentModel::ISupportInitialize^>(this->PicEase4))->EndInit();
-			(cli::safe_cast<System::ComponentModel::ISupportInitialize^  >(this->PicEase3))->EndInit();
+			(cli::safe_cast<System::ComponentModel::ISupportInitialize^>(this->PicEase3))->EndInit();
-			(cli::safe_cast<System::ComponentModel::ISupportInitialize^  >(this->PicEase2))->EndInit();
+			(cli::safe_cast<System::ComponentModel::ISupportInitialize^>(this->PicEase2))->EndInit();
-			(cli::safe_cast<System::ComponentModel::ISupportInitialize^  >(this->PicEase1))->EndInit();
+			(cli::safe_cast<System::ComponentModel::ISupportInitialize^>(this->PicEase1))->EndInit();
 			this->groupBox5->ResumeLayout(false);
-			(cli::safe_cast<System::ComponentModel::ISupportInitialize^  >(this->DisplayIcon))->EndInit();
+			(cli::safe_cast<System::ComponentModel::ISupportInitialize^>(this->DisplayIcon))->EndInit();
 			this->panel15->ResumeLayout(false);
-			(cli::safe_cast<System::ComponentModel::ISupportInitialize^  >(this->DisplayPicture))->EndInit();
+			(cli::safe_cast<System::ComponentModel::ISupportInitialize^>(this->DisplayPicture))->EndInit();
 			this->panel16->ResumeLayout(false);
 			this->tabPage2->ResumeLayout(false);
 			this->ContextLangName->ResumeLayout(false);
 			this->groupBox4->ResumeLayout(false);
 			this->ContextMirror->ResumeLayout(false);
 			this->tabPage4->ResumeLayout(false);
 			this->ContextDep->ResumeLayout(false);
 			this->PageWares->ResumeLayout(false);
 			this->splitContainer1->Panel1->ResumeLayout(false);
 			this->splitContainer1->Panel2->ResumeLayout(false);
+			(cli::safe_cast<System::ComponentModel::ISupportInitialize^>(this->splitContainer1))->EndInit();
 			this->splitContainer1->ResumeLayout(false);
 			this->ContextWare->ResumeLayout(false);
 			this->ContextWareText->ResumeLayout(false);
 			this->PageShip->ResumeLayout(false);
 			this->PageShip->PerformLayout();
 			this->ContextShipText->ResumeLayout(false);
 			this->PanelTextID->ResumeLayout(false);
 			this->PanelTextID->PerformLayout();
-			(cli::safe_cast<System::ComponentModel::ISupportInitialize^  >(this->NumTextID))->EndInit();
+			(cli::safe_cast<System::ComponentModel::ISupportInitialize^>(this->NumTextID))->EndInit();
 			this->flowLayoutPanel2->ResumeLayout(false);
 			this->PageRaw->ResumeLayout(false);
 			this->panel23->ResumeLayout(false);
 			this->panel24->ResumeLayout(false);
 			this->panel24->PerformLayout();
 private: System::Void toolStripButton1_Click(System::Object^  sender, System::EventArgs^  e) {
 			 bool wildcard = false;
 			 if ( MessageBox::Show(this, "Do you want to generate the script using wildcards for files?", "Generate Script - Wildcards", MessageBoxButtons::YesNo, MessageBoxIcon::Question) == System::Windows::Forms::DialogResult::Yes )
 				 wildcard = true;
-			CyStringList list;
+			Utils::CStringList list;
-			if ( !m_pPackage->GeneratePackagerScript(wildcard, &list) )
+			if ( !m_pPackage->GeneratePackagerScript(wildcard, &list, 0) )
 				MessageBox::Show(this, "Unable to generated packager script", "Error", MessageBoxButtons::OK, MessageBoxIcon::Error);
 			else
+			{
 				SaveFileDialog ^ofd = gcnew SaveFileDialog();
 				ofd->Filter = "Package Script (*.sps)|*.sps";
 				ofd->AddExtension = true;
 				ofd->FilterIndex = 1;
 				ofd->RestoreDirectory = true;
 				if ( ofd->ShowDialog() == System::Windows::Forms::DialogResult::OK )
+				{
-					if ( CFileIO(CyStringFromSystemString(ofd->FileName)).WriteFile(&list) )
+					if ( CFileIO(_S(ofd->FileName)).writeFile(&list) )
 						MessageBox::Show(this, "Package script has been saved\n" + ofd->FileName, "Script Saved", MessageBoxButtons::OK, MessageBoxIcon::Information);
+				}
+			}
+		}
 private: System::Void ContextShipPart_Opening(System::Object^  sender, System::ComponentModel::CancelEventArgs^  e) {

Subversion Repositories spk

(root)//Creator/src/Forms/PackageForm.h – Rev 125 → 126