--- a/UI/UICharacter.cpp	Mon Dec 02 15:13:49 2013 +0200
+++ b/UI/UICharacter.cpp	Tue Dec 03 20:18:17 2013 +0200
@@ -89,101 +89,101 @@
 
 void set_default_ui_skin()
 {
-  ui_mainmenu_copyright_color = TargetColor(255, 255, 255);
+  ui_mainmenu_copyright_color = Color16(255, 255, 255);
 
-  ui_character_tooltip_header_default_color = TargetColor(255, 255, 155);
-  ui_character_default_text_color = TargetColor(255, 255, 255);
-  ui_character_header_text_color = TargetColor(255, 255, 155);
-  ui_character_bonus_text_color = TargetColor(0, 255, 0);
-  ui_character_bonus_text_color_neg = TargetColor(255, 0, 0);
+  ui_character_tooltip_header_default_color = Color16(255, 255, 155);
+  ui_character_default_text_color = Color16(255, 255, 255);
+  ui_character_header_text_color = Color16(255, 255, 155);
+  ui_character_bonus_text_color = Color16(0, 255, 0);
+  ui_character_bonus_text_color_neg = Color16(255, 0, 0);
 
-  ui_character_skill_upgradeable_color = TargetColor(0, 175, 255);
-  ui_character_skill_default_color = TargetColor(255, 0, 0);
-  ui_character_skill_highlight_color = TargetColor(255, 0, 0);  
+  ui_character_skill_upgradeable_color = Color16(0, 175, 255);
+  ui_character_skill_default_color = Color16(255, 0, 0);
+  ui_character_skill_highlight_color = Color16(255, 0, 0);  
   
-  ui_character_stat_default_color = TargetColor(255, 255, 255);
-  ui_character_stat_buffed_color = TargetColor(0,   255,   0);
-  ui_character_stat_debuffed_color = TargetColor(255,  35,   0);
+  ui_character_stat_default_color = Color16(255, 255, 255);
+  ui_character_stat_buffed_color = Color16(0,   255,   0);
+  ui_character_stat_debuffed_color = Color16(255,  35,   0);
   
-  ui_character_skillinfo_can_learn = TargetColor(255, 255, 255);
-  ui_character_skillinfo_can_learn_gm = TargetColor(255, 255, 0);
-  ui_character_skillinfo_cant_learn = TargetColor(255, 0, 0);
+  ui_character_skillinfo_can_learn = Color16(255, 255, 255);
+  ui_character_skillinfo_can_learn_gm = Color16(255, 255, 0);
+  ui_character_skillinfo_cant_learn = Color16(255, 0, 0);
   
-  ui_character_condition_normal_color = TargetColor(255, 255, 255);
-  ui_character_condition_light_color = TargetColor(0, 255, 0);
-  ui_character_condition_moderate_color = TargetColor(225, 205, 35);
-  ui_character_condition_severe_color = TargetColor(255, 35, 0);
+  ui_character_condition_normal_color = Color16(255, 255, 255);
+  ui_character_condition_light_color = Color16(0, 255, 0);
+  ui_character_condition_moderate_color = Color16(225, 205, 35);
+  ui_character_condition_severe_color = Color16(255, 35, 0);
 
-  ui_character_award_color[0] = TargetColor(248, 108, 160);
-  ui_character_award_color[1] = TargetColor(112, 220, 248);
-  ui_character_award_color[2] = TargetColor(192, 192, 240);
-  ui_character_award_color[3] = TargetColor( 64, 244,  96);
-  ui_character_award_color[4] = TargetColor(232, 244,  96);
-  ui_character_award_color[5] = TargetColor(240, 252, 192);
+  ui_character_award_color[0] = Color16(248, 108, 160);
+  ui_character_award_color[1] = Color16(112, 220, 248);
+  ui_character_award_color[2] = Color16(192, 192, 240);
+  ui_character_award_color[3] = Color16( 64, 244,  96);
+  ui_character_award_color[4] = Color16(232, 244,  96);
+  ui_character_award_color[5] = Color16(240, 252, 192);
   
-  ui_game_minimap_outline_color = TargetColor(0, 0, 255);
-  ui_game_minimap_actor_friendly_color = TargetColor(0, 255, 0);
-  ui_game_minimap_actor_hostile_color = TargetColor(255, 0, 0);
-  ui_game_minimap_actor_corpse_color = TargetColor(255, 255, 0);
-  ui_game_minimap_decoration_color_1 = TargetColor(255, 255, 255);
-  ui_game_minimap_projectile_color = TargetColor(255, 0, 0);
-  ui_game_minimap_treasure_color = TargetColor(0, 0, 255);
+  ui_game_minimap_outline_color = Color16(0, 0, 255);
+  ui_game_minimap_actor_friendly_color = Color16(0, 255, 0);
+  ui_game_minimap_actor_hostile_color = Color16(255, 0, 0);
+  ui_game_minimap_actor_corpse_color = Color16(255, 255, 0);
+  ui_game_minimap_decoration_color_1 = Color16(255, 255, 255);
+  ui_game_minimap_projectile_color = Color16(255, 0, 0);
+  ui_game_minimap_treasure_color = Color16(0, 0, 255);
 
-  ui_game_character_record_playerbuff_colors[0] = TargetColor(150, 212, 255);
-  ui_game_character_record_playerbuff_colors[1] = TargetColor(225, 225, 225);
-  ui_game_character_record_playerbuff_colors[2] = TargetColor(255, 128, 0);
-  ui_game_character_record_playerbuff_colors[3] = TargetColor(128, 128, 128);
-  ui_game_character_record_playerbuff_colors[4] = TargetColor(225, 225, 225);
-  ui_game_character_record_playerbuff_colors[5] = TargetColor(255, 85, 0);
-  ui_game_character_record_playerbuff_colors[6] = TargetColor(255, 128, 0);
-  ui_game_character_record_playerbuff_colors[7] = TargetColor(255, 85, 0);
-  ui_game_character_record_playerbuff_colors[8] = TargetColor(225, 225, 225);
-  ui_game_character_record_playerbuff_colors[9] = TargetColor(235, 15, 255);
-  ui_game_character_record_playerbuff_colors[10] = TargetColor(192, 192, 240);
-  ui_game_character_record_playerbuff_colors[11] = TargetColor(225, 225, 225);
-  ui_game_character_record_playerbuff_colors[12] = TargetColor(255, 128, 0);
-  ui_game_character_record_playerbuff_colors[13] = TargetColor(150, 212, 255);
-  ui_game_character_record_playerbuff_colors[14] = TargetColor(128, 128, 128);
-  ui_game_character_record_playerbuff_colors[15] = TargetColor(255, 255, 155);
-  ui_game_character_record_playerbuff_colors[16] = TargetColor(255, 255, 155);
-  ui_game_character_record_playerbuff_colors[17] = TargetColor(255, 255, 155);
-  ui_game_character_record_playerbuff_colors[18] = TargetColor(255, 255, 155);
-  ui_game_character_record_playerbuff_colors[19] = TargetColor(255, 255, 155);
-  ui_game_character_record_playerbuff_colors[20] = TargetColor(255, 255, 155);
-  ui_game_character_record_playerbuff_colors[21] = TargetColor(255, 255, 155);
-  ui_game_character_record_playerbuff_colors[22] = TargetColor(0, 128, 255);
-  ui_game_character_record_playerbuff_colors[23] = TargetColor(0, 128, 255);
+  ui_game_character_record_playerbuff_colors[0] = Color16(150, 212, 255);
+  ui_game_character_record_playerbuff_colors[1] = Color16(225, 225, 225);
+  ui_game_character_record_playerbuff_colors[2] = Color16(255, 128, 0);
+  ui_game_character_record_playerbuff_colors[3] = Color16(128, 128, 128);
+  ui_game_character_record_playerbuff_colors[4] = Color16(225, 225, 225);
+  ui_game_character_record_playerbuff_colors[5] = Color16(255, 85, 0);
+  ui_game_character_record_playerbuff_colors[6] = Color16(255, 128, 0);
+  ui_game_character_record_playerbuff_colors[7] = Color16(255, 85, 0);
+  ui_game_character_record_playerbuff_colors[8] = Color16(225, 225, 225);
+  ui_game_character_record_playerbuff_colors[9] = Color16(235, 15, 255);
+  ui_game_character_record_playerbuff_colors[10] = Color16(192, 192, 240);
+  ui_game_character_record_playerbuff_colors[11] = Color16(225, 225, 225);
+  ui_game_character_record_playerbuff_colors[12] = Color16(255, 128, 0);
+  ui_game_character_record_playerbuff_colors[13] = Color16(150, 212, 255);
+  ui_game_character_record_playerbuff_colors[14] = Color16(128, 128, 128);
+  ui_game_character_record_playerbuff_colors[15] = Color16(255, 255, 155);
+  ui_game_character_record_playerbuff_colors[16] = Color16(255, 255, 155);
+  ui_game_character_record_playerbuff_colors[17] = Color16(255, 255, 155);
+  ui_game_character_record_playerbuff_colors[18] = Color16(255, 255, 155);
+  ui_game_character_record_playerbuff_colors[19] = Color16(255, 255, 155);
+  ui_game_character_record_playerbuff_colors[20] = Color16(255, 255, 155);
+  ui_game_character_record_playerbuff_colors[21] = Color16(255, 255, 155);
+  ui_game_character_record_playerbuff_colors[22] = Color16(0, 128, 255);
+  ui_game_character_record_playerbuff_colors[23] = Color16(0, 128, 255);
 
-  ui_gamemenu_video_gamma_title_color = TargetColor(255, 255, 155);
-  ui_gamemenu_keys_action_name_color = TargetColor(255, 255, 255);
-  ui_gamemenu_keys_key_selection_blink_color_1 = TargetColor(50, 0, 0);
-  ui_gamemenu_keys_key_selection_blink_color_2 = TargetColor(225, 205, 35);
-  ui_gamemenu_keys_key_default_color = TargetColor(255, 255, 255);
+  ui_gamemenu_video_gamma_title_color = Color16(255, 255, 155);
+  ui_gamemenu_keys_action_name_color = Color16(255, 255, 255);
+  ui_gamemenu_keys_key_selection_blink_color_1 = Color16(50, 0, 0);
+  ui_gamemenu_keys_key_selection_blink_color_2 = Color16(225, 205, 35);
+  ui_gamemenu_keys_key_default_color = Color16(255, 255, 255);
 
-  ui_book_quests_title_color = TargetColor(255, 255, 255);
-  ui_book_quests_text_color = TargetColor(255, 255, 255);
-  ui_book_autonotes_title_color = TargetColor(255, 255, 255);
-  ui_book_autonotes_text_color = TargetColor(255, 255, 255);
-  ui_book_map_title_color = TargetColor(255, 255, 255);
-  ui_book_map_coordinates_color = TargetColor(255, 255, 255);
+  ui_book_quests_title_color = Color16(255, 255, 255);
+  ui_book_quests_text_color = Color16(255, 255, 255);
+  ui_book_autonotes_title_color = Color16(255, 255, 255);
+  ui_book_autonotes_text_color = Color16(255, 255, 255);
+  ui_book_map_title_color = Color16(255, 255, 255);
+  ui_book_map_coordinates_color = Color16(255, 255, 255);
 
-  ui_book_calendar_title_color = TargetColor(255, 255, 255);
-  ui_book_calendar_time_color = TargetColor(75, 75, 75);
-  ui_book_calendar_day_color = TargetColor(75, 75, 75);
-  ui_book_calendar_month_color = TargetColor(75, 75, 75);
-  ui_book_calendar_year_color = TargetColor(75, 75, 75);
-  ui_book_calendar_moon_color = TargetColor(75, 75, 75);
-  ui_book_calendar_location_color = TargetColor(75, 75, 75);
+  ui_book_calendar_title_color = Color16(255, 255, 255);
+  ui_book_calendar_time_color = Color16(75, 75, 75);
+  ui_book_calendar_day_color = Color16(75, 75, 75);
+  ui_book_calendar_month_color = Color16(75, 75, 75);
+  ui_book_calendar_year_color = Color16(75, 75, 75);
+  ui_book_calendar_moon_color = Color16(75, 75, 75);
+  ui_book_calendar_location_color = Color16(75, 75, 75);
 
-  ui_book_journal_title_color = TargetColor(255, 255, 255);
-  ui_book_journal_text_color = TargetColor(255, 255, 255);
-  ui_book_journal_text_shadow = TargetColor(0, 0, 0);
+  ui_book_journal_title_color = Color16(255, 255, 255);
+  ui_book_journal_text_color = Color16(255, 255, 255);
+  ui_book_journal_text_shadow = Color16(0, 0, 0);
 
-  ui_game_dialogue_npc_name_color = TargetColor(21, 153, 233);
-  ui_game_dialogue_option_highlight_color = TargetColor(225, 205, 35);
-  ui_game_dialogue_option_normal_color = TargetColor(255, 255, 255);
+  ui_game_dialogue_npc_name_color = Color16(21, 153, 233);
+  ui_game_dialogue_option_highlight_color = Color16(225, 205, 35);
+  ui_game_dialogue_option_normal_color = Color16(255, 255, 255);
 
-  ui_house_player_cant_interact_color = TargetColor(255, 255, 155);
+  ui_house_player_cant_interact_color = Color16(255, 255, 155);
 }
 
 std::array<unsigned int, 16> papredoll_dbrds;