diff --git a/Data-1.13/Ja2_Options.INI b/Data-1.13/Ja2_Options.INI
index d2fa5f946..054d20c6d 100644
--- a/Data-1.13/Ja2_Options.INI
+++ b/Data-1.13/Ja2_Options.INI
@@ -94,42 +94,9 @@ MAX_ATTRIBUTE_POINT = 85
 IMPATTRIBUTEPOINTS =  50
 MAX_ZERO_BONUS =      15
 START_ATTRIBUTE =     55
-
-;******************************************************************************************************************************
-; USE_RANDOM_PERSONALITY set to TRUE will randomly generate an Attitude and a Personality for each of 
-; your IMP Mercs. 
-;
-; CUSTOM_PERSONALITY and CUSTOM_ATTITUDE allow you to specify what personality you want for your IMP
-; Merc.
-; Here are the valid settings for personalities and Attitudes:
-;
-; PERSONALITIES:
-;
-; Normal = 0
-; Heat Intolerant = 1
-; Nervous = 2
-; Claustrophobic = 3
-; NonSwimmer = 4
-; Fear of Insects = 5
-; Forgetful = 6
-; Psycho = 7
-;
-; ATTITUDES:
-;	
-; NORMAL = 0
-; FRIENDLY = 1
-; LONER = 2
-; OPTIMIST = 3
-; PESSIMIST = 4
-; AGGRESSIVE = 5
-; ARROGANT = 6
-; BIG_SHOT = 7
-; ASSHOLE = 8
-; COWARD = 9
-;******************************************************************************************************************************
-
-CUSTOM_PERSONALITY =	0
-CUSTOM_ATTITUDE =	0
+IMP_STARTING_LEVEL_COST_MULTIPLIER = 5
+IMP_BONUS_POINTS_FOR_DISABILITY = 20
+IMP_BONUS_POINTS_PER_SKILL_NOT_TAKEN = 25
 
 ;******************************************************************************************************************************
 ; MERC_AVAILABLE_DAY_ONE set to TRUE sends the initial MERC e-mail at the beginning of the game and thus
@@ -274,13 +241,11 @@ VISUAL_DISTANCE_DECREASE_PER_RAIN_INTENSITY = 30
 ALLOW_LIMITED_VISION = TRUE
 
 ;******************************************************************************************************************************
-; In this section you can enable enemy tooltips. To display the tooltip move the mouse over the enemy and press ALT.
+; In this section you can set details about enemy tooltips. 
+; Tooltips can be enabled/disabled in the Option Screen.
+; To display the tooltip move the mouse over the enemy and press ALT.
 ;******************************************************************************************************************************
 
-; Show information about selected person
-; Range: TRUE/FALSE
-ALLOW_SOLDIER_TOOL_TIPS = TRUE
-
 ; ULTRA DYNAMIC TOOLTIPS
 ; Range and Detail overwrite dynamic range and detail level respectively.
 ALLOW_UDT_RANGE = TRUE
@@ -491,9 +456,6 @@ GAME_PROGRESS_MINIMUM = 0
 ; The increment is just added to the normally computed game progress but of course cannot make it higher than 100%
 GAME_PROGRESS_INCREMENT = 0
 
-; The starting level of IMP mercs, 1 through 7, default is 1
-IMP_STARTING_LEVEL = 1
-
 ; If TRUE Shift-N will switch to best night vision goggles at night and best sunglasses during the day
 ; If FALSE whatever the merc is wearing will be switched with the best of the other kind (the "classic" behavior)
 SMART_GOGGLE_SWITCH = TRUE
diff --git a/Data/Ja2_Options.INI b/Data/Ja2_Options.INI
index 4475d19b5..4a5569797 100644
--- a/Data/Ja2_Options.INI
+++ b/Data/Ja2_Options.INI
@@ -94,42 +94,9 @@ MAX_ATTRIBUTE_POINT = 85
 IMPATTRIBUTEPOINTS =  30
 MAX_ZERO_BONUS =      15
 START_ATTRIBUTE =     55
-
-;******************************************************************************************************************************
-; USE_RANDOM_PERSONALITY set to TRUE will randomly generate an Attitude and a Personality for each of 
-; your IMP Mercs. 
-;
-; CUSTOM_PERSONALITY and CUSTOM_ATTITUDE allow you to specify what personality you want for your IMP
-; Merc.
-; Here are the valid settings for personalities and Attitudes:
-;
-; PERSONALITIES:
-;
-; Normal = 0
-; Heat Intolerant = 1
-; Nervous = 2
-; Claustrophobic = 3
-; NonSwimmer = 4
-; Fear of Insects = 5
-; Forgetful = 6
-; Psycho = 7
-;
-; ATTITUDES:
-;	
-; NORMAL = 0
-; FRIENDLY = 1
-; LONER = 2
-; OPTIMIST = 3
-; PESSIMIST = 4
-; AGGRESSIVE = 5
-; ARROGANT = 6
-; BIG_SHOT = 7
-; ASSHOLE = 8
-; COWARD = 9
-;******************************************************************************************************************************
-
-CUSTOM_PERSONALITY = 0
-CUSTOM_ATTITUDE =    0
+IMP_STARTING_LEVEL_COST_MULTIPLIER = 5
+IMP_BONUS_POINTS_FOR_DISABILITY = 20
+IMP_BONUS_POINTS_PER_SKILL_NOT_TAKEN = 25
 
 ;******************************************************************************************************************************
 ; MERC_AVAILABLE_DAY_ONE set to TRUE sends the initial MERC e-mail at the beginning of the game and thus
@@ -274,13 +241,11 @@ VISUAL_DISTANCE_DECREASE_PER_RAIN_INTENSITY = 20
 ALLOW_LIMITED_VISION = FALSE
 
 ;******************************************************************************************************************************
-; In this section you can enable enemy tooltips. To display the tooltip move the mouse over the enemy and press ALT.
+; In this section you can set details about enemy tooltips. 
+; Tooltips can be enabled/disabled in the Option Screen.
+; To display the tooltip move the mouse over the enemy and press ALT.
 ;******************************************************************************************************************************
 
-; Show information about selected person
-; Range: TRUE/FALSE
-ALLOW_SOLDIER_TOOL_TIPS = FALSE
-
 ; ULTRA DYNAMIC TOOLTIPS
 ; Range and Detail overwrite dynamic range and detail level respectively.
 ALLOW_UDT_RANGE = FALSE
@@ -489,9 +454,6 @@ GAME_PROGRESS_MINIMUM = 0
 ; The increment is just added to the normally computed game progress but of course cannot make it higher than 100%
 GAME_PROGRESS_INCREMENT = 0
 
-; The starting level of IMP mercs, 1 through 7, default is 1
-IMP_STARTING_LEVEL = 1
-
 ; If TRUE Shift-N will switch to best night vision goggles at night and best sunglasses during the day
 ; If FALSE whatever the merc is wearing will be switched with the best of the other kind (the "classic" behavior)
 SMART_GOGGLE_SWITCH = FALSE
diff --git a/Data/Laptop/COLORCHOICEFRAME.STI b/Data/Laptop/COLORCHOICEFRAME.STI
new file mode 100644
index 000000000..ad14714e7
Binary files /dev/null and b/Data/Laptop/COLORCHOICEFRAME.STI differ
diff --git a/Data/Laptop/IMPARROWSSANDRO.STI b/Data/Laptop/IMPARROWSSANDRO.STI
new file mode 100644
index 000000000..6183c88e1
Binary files /dev/null and b/Data/Laptop/IMPARROWSSANDRO.STI differ
diff --git a/Data/Laptop/IMPBigMercImages.sti b/Data/Laptop/IMPBigMercImages.sti
new file mode 100644
index 000000000..142f4291c
Binary files /dev/null and b/Data/Laptop/IMPBigMercImages.sti differ
diff --git a/Data/Laptop/IMPFemaleMercImages.sti b/Data/Laptop/IMPFemaleMercImages.sti
new file mode 100644
index 000000000..d922913fc
Binary files /dev/null and b/Data/Laptop/IMPFemaleMercImages.sti differ
diff --git a/Data/Laptop/IMPSmallMercImages.sti b/Data/Laptop/IMPSmallMercImages.sti
new file mode 100644
index 000000000..aa0e77e8f
Binary files /dev/null and b/Data/Laptop/IMPSmallMercImages.sti differ
diff --git a/Data/Laptop/STARTINGLEVELBAR.STI b/Data/Laptop/STARTINGLEVELBAR.STI
new file mode 100644
index 000000000..c3cd8b3df
Binary files /dev/null and b/Data/Laptop/STARTINGLEVELBAR.STI differ
diff --git a/INIEditorJA2Options.xml b/INIEditorJA2Options.xml
index 5e24fef9e..091cff07f 100644
Binary files a/INIEditorJA2Options.xml and b/INIEditorJA2Options.xml differ
diff --git a/ja2.exe b/ja2.exe
index 1531d94bf..374e2940f 100644
Binary files a/ja2.exe and b/ja2.exe differ