diff --git a/SwgClient_r.exe b/SwgClient_r.exe
index f1c01f9e..91c8d944 100644
Binary files a/SwgClient_r.exe and b/SwgClient_r.exe differ
diff --git a/ui/ui_ground_hud_buttonbar_skinned.inc b/ui/ui_ground_hud_buttonbar_skinned.inc
new file mode 100644
index 00000000..0dfd4154
--- /dev/null
+++ b/ui/ui_ground_hud_buttonbar_skinned.inc
@@ -0,0 +1,820 @@
+
+
+
+
+
+
+
+
+
+
+
+ @button_bar_gcw
+
+
+
+ @button_bar_planet_map
+
+
+
+ @button_bar_quest_journal
+
+
+
+ @button_bar_roadmap
+
+
+
+ @button_bar_expertise
+
+
+
+ @button_bar_appearance
+
+
+
+ @button_bar_inventory
+
+
+
+ @button_bar_datapad
+
+
+
+ @button_bar_character
+
+
+
+ @button_bar_questbuilder
+
+
+
+ @button_bar_mail
+
+
+
+ @button_bar_options
+
+
+
+ @button_bar_community
+
+
+
+ @button_bar_commands
+
+
+
+ @button_bar_my_collections
+
+
+
+ @button_bar_menu
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ui/ui_hud_space.inc b/ui/ui_hud_space.inc
new file mode 100644
index 00000000..304d1a9f
--- /dev/null
+++ b/ui/ui_hud_space.inc
@@ -0,0 +1,6348 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ @show_notifications
+
+
+
+
+ Move your character using the \\#pcontrast1 W,A,S,D\\#. keys, and holding down the right mouse button.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ @button_bar_ship_details
+
+
+
+ @button_bar_gcw
+
+
+
+ @button_bar_zone_map
+
+
+
+ @button_bar_roadmap
+
+
+
+ @button_bar_quest_journal
+
+
+
+ @button_bar_expertise
+
+
+
+ @button_bar_appearance
+
+
+
+ @button_bar_inventory
+
+
+
+ @button_bar_datapad
+
+
+
+ @button_bar_character
+
+
+
+ @button_bar_questbuilder
+
+
+
+ @button_bar_skills
+
+
+
+ @button_bar_mail
+
+
+
+ @button_bar_options
+
+
+
+ @button_bar_community
+
+
+
+ @button_bar_commands
+
+
+
+ @button_bar_my_collections
+
+
+
+ @button_bar_home_port
+
+
+
+ @button_bar_menu
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 10000/10000
+
+
+
+
+ m4:
+ xxx
+
+
+ m3:
+ xxx
+
+
+ m2:
+ xxx
+
+
+ m1:
+ xxx
+
+
+ cm1:
+ xxx
+
+
+ cm2:
+ xxx
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ @ui_spacehud:incoming_missile
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ xxx component name
+
+
+
+ xxx%
+ xxx status info
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ xxx target name with long text
+ xxx ship type with long text
+ xxx ship difficulty with long text
+
+
+ xxx component name 100%
+
+
+ @ui_spacehud:shield
+ xxx %
+
+
+ @ui_spacehud:armor
+ xxx %
+
+
+ @ui_spacehud:system
+ xxx %
+
+
+ @ui_spacehud:chassis
+ xxx %
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ui_hud_space_ship_reticle.inc
+ ui_hud_space_radar.inc
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ui_hud_space_incap.inc
+
+
+ System Messages Go here from the server. \\#ff0000 Hit!! \\#ffffff
+
+ System Messages Go here from the server. \\#ff0000 Hit!! \\#ffffff
+ System Messages Go here from the server. \\#ff0000 Hit!! \\#ffffff
+ System Messages Go here from the server. \\#ff0000 Hit!! \\#ffffff
+ System Messages Go here from the server. \\#ff0000 Hit!! \\#ffffff
+ System Messages Go here from the server. \\#ff0000 Hit!! \\#ffffff
+
+
+
+
+
+ System Messages Go here from the server. \\#ff0000 Hit!! \\#ffffff
+
+ System Messages Go here from the server. \\#ff0000 Hit!! \\#ffffff
+ System Messages Go here from the server. \\#ff0000 Hit!! \\#ffffff
+ System Messages Go here from the server. \\#ff0000 Hit!! \\#ffffff
+ System Messages Go here from the server. \\#ff0000 Hit!! \\#ffffff
+ System Messages Go here from the server. \\#ff0000 Hit!! \\#ffffff
+
+
+
+
+ ui_hud_space_chat_window.inc
+ ui_hud_space_toolbar.inc
+ ui_hud_space_toolbar.inc
+ ui_hud_space_combat_queue.inc
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ui_hud_space_quest_helper.inc
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ xxxm
+
+
+ 8000
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ %
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 100
+
+
+
+
+
+
+ (AFK)
+ Master Jedi
+ Target Name
+ 696m
+ Rebel Peon
+ \
+ setjmp((void*)(rand() * rand()));
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ xxx 77%
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ xxx name
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ xxx name
+
+
+
+
+
+
+
+
+
+
+
+
+
+ xxx name
+
+
+
+
+
+
+
+
+
+
+
+
+
+ xxx name
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ui/ui_options.inc b/ui/ui_options.inc
new file mode 100644
index 00000000..bfc09c2b
--- /dev/null
+++ b/ui/ui_options.inc
@@ -0,0 +1,11320 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ @ui_opt:page_graphics
+
+
+
+
+ @ui_opt:gfx_particle_limit
+
+
+
+
+ @ui_opt:gfx_brightness
+
+
+ @ui_opt:gfx_contrast
+
+
+
+
+ @ui_opt:gfx_gamma
+
+
+
+ @ui_opt:animation_priorities
+ Enable Antialiasing
+ Enable Post Processing Effects
+
+ @ui_opt:gfx_enable_bloom
+ Enable Heat Shimmer
+
+ @ui_opt:gfx_enable_glare
+ @ui_opt:gfx_disable_fog
+
+
+ @ui_opt:gfx_camera_far_plane
+
+
+
+
+ @ui_opt:gfx_camera_fov
+
+
+
+
+ @ui_opt:gfx_fade_objects
+ @ui_opt:gfx_crossfade_detaillevels
+ @ui_opt:gfx_batch_renderer
+ @ui_opt:gfx_character_lod_manager
+ @ui_opt:gfx_simple_camera_collision
+ @ui_opt:offset_camera
+
+
+
+ @ui_opt:gfx_camera_height
+
+
+
+ @ui_opt:gfx_world_detail_bias
+
+
+
+
+ @ui_opt:gfx_static_lod_bias
+
+
+
+
+ @ui_opt:gfx_character_lod_bias
+
+
+
+
+ @ui_opt:gfx_particle_lod_bias
+
+
+
+
+ @ui_opt:gfx_nebula_density
+
+
+
+
+ @ui_opt:gfx_render_shadows
+
+
+
+ @ui_opt:gfx_character_shadows
+ @ui_opt:gfx_character_shadows_none
+ @ui_opt:gfx_character_shadows_simple
+ @ui_opt:gfx_character_shadows_volumetric
+
+
+ @ui_opt:gfx_noncharacter_shadows
+ @ui_opt:gfx_noncharacter_shadows_none
+ @ui_opt:gfx_noncharacter_shadows_volumetric
+
+
+
+ @ui_opt:gfx_shadow_detail
+
+
+
+
+
+
+ @ui_opt:gfx_screenshot_type
+ @ui_opt:gfx_screenshot_type_bmp
+ @ui_opt:gfx_screenshot_type_tga
+
+ @ui_opt:gfx_screenshot_type_jpg
+
+ @ui_opt:gfx_screenshot_type_quality
+
+ @ui_opt:gfx_screenshot_type_jpg_min
+ @ui_opt:gfx_screenshot_type_jpg_max
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ @ui_opt:page_terrain
+
+
+ @ui_opt:terrain_threshold
+
+
+
+
+ @ui_opt:terrain_threshold_high
+
+
+
+ @ui_opt:radial_flora_far
+ @ui_opt:radial_flora_non_collidable
+
+ @ui_opt:radial_flora_non_collidable_distance
+
+
+
+ @ui_opt:radial_flora_near
+
+ @ui_opt:radial_flora_near_distance
+
+
+
+ Specular Terrain Lighting
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ @ui_opt:page_sound
+ @ui_opt_sound:enable
+
+
+
+
+
+
+
+
+ @ui_opt_sound:max_sounds
+
+
+
+ @ui_opt_sound:volume_master
+
+
+
+
+ @ui_opt_sound:volume_ambient
+
+
+
+
+ @ui_opt_sound:volume_effects
+
+
+
+
+ @ui_opt_sound:volume_background_music
+
+
+
+
+ @ui_opt_sound:volume_user_interface
+
+
+
+
+ @ui_opt_sound:volume_player_music
+
+
+
+
+ @ui_opt_sound:listener_follows_player
+
+
+ @ui_opt_sound:volume_combat_music
+
+
+
+
+ environment_reverb
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ @ui_opt:page_voice
+ @ui_opt:voice_enable
+
+
+ @ui_opt:voice_use_push_to_talk
+ @ui_opt:voice_pttbinding
+
+ INS, F11
+
+
+
+
+
+ @ui_opt:voice_speaker_volume
+
+
+
+
+ @ui_opt:voice_mic_volume
+
+
+
+
+ @ui_opt:voice_audio_fade
+
+
+
+
+ @ui_opt:voice_echo
+
+
+
+
+
+
+
+ @ui_opt:voice_device
+
+
+
+
+
+
+
+ @ui_opt:voice_input_device
+
+
+
+
+
+
+
+ @ui_opt:voice_output_device
+
+
+
+ @ui_opt:voice_checkmic
+
+ The results of the Windows audio settings check will be placed in this box. Lets be sure that the text will look good when there is a lot of it.
+
+
+
+
+ This is placeholder text for the voice chat options window. There will be controls here to allow the user to select their input and output hardware, adjust several volume parameters, and test their configuration.
+ @ui_opt:voice_show_flybar
+ @ui_opt:voice_auto_decline_invites
+ @ui_opt:voice_auto_join
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ @ui_opt:page_combat
+
+ @ui_opt:damage_num_others
+ @ui_opt:damage_num_self
+ @ui_opt:damage_snare
+ @ui_opt:damage_glancing_blow
+ @ui_opt:damage_critical_hit
+ @ui_opt:damage_lucky
+ @ui_opt:damage_dot
+ @ui_opt:damage_bleed
+ @ui_opt:damage_heal
+ @ui_opt:damage_freeshot
+ @ui_opt:enter_combat
+
+ @ui_opt:damage_done_to_me
+
+
+
+
+ @ui_opt:damage_done_to_others
+
+
+
+
+ @ui_opt:non_damage_done_to_me
+
+
+
+
+ @ui_opt:non_damage_done_to_others
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ @ui_opt:page_chat
+
+
+ @ui_opt:chat_box_font_size_default
+
+
+
+ @ui_opt:chat_format_mode
+ @ui_opt:chat_mode_prose
+ @ui_opt:chat_mode_diku
+ @ui_opt:chat_mode_brief
+ @ui_opt:profanity
+ @ui_opt:chat_show_afk_speech
+ @ui_opt:chat_auto_emote
+ @ui_opt:chat_timestamp
+ @ui_opt:chatbox_keyclick
+ @ui_opt:chat_bubble_enable
+
+
+ @ui_opt:chat_bubble_range_factor
+
+
+
+
+ @ui_opt:chat_bubble_font_size
+
+
+
+
+ @ui_opt:chat_bubble_duration
+
+
+
+ @ui_opt:chat_bubble_prose
+ @ui_opt:chat_bubble_socials
+ @ui_opt:chat_bubble_emotes
+ @ui_opt:chat_bubble_show_all
+
+ @ui_opt:chat_bubble_show_self
+ @ui_opt:chat_bubble_show_player
+ @ui_opt:chat_bubble_show_npc
+ @ui_opt:chat_bubble_show_guild
+ @ui_opt:chat_bubble_show_group
+
+
+
+
+
+
+
+
+
+
+
+
+ @ui_opt:combat_spam_filter
+
+
+ @ui_opt:combat_spam_range_filter
+
+
+
+ @ui_opt:combat_spam_brief
+ @ui_opt:combat_spam_verbose
+
+ @ui_opt:combat_spam_show_weapon
+ @ui_opt:combat_spam_show_damage_detail
+ @ui_opt:combat_spam_show_armor_absorption
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ @ui_opt:page_chat_colors
+
+
+
+
+ @ui_opt:text_colors_sentences
+
+
+
+
+
+
+
+
+
+
+
+
+
+ xxx palette name here
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ @ui_opt:text_colors_game_messages
+
+
+
+
+
+
+
+
+ @ui_opt:text_colors_words
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ @ui_opt:text_colors_input
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ @ui_opt:alarm_list
+
+
+
+
+
+
+
+
+ xxxtime
+ @ui_opt:alarm_earth_time
+
+ @ui_opt:page_alarm
+
+
+
+ @ui_opt:alarm_options
+
+ @ui_opt:alarm_in_minutes
+ @ui_opt:alarm_in_hours
+
+
+ @ui_opt:alarm_in
+
+
+ @ui_opt:alarm_at
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ @ui_opt:alarm_at_minutes
+ @ui_opt:alarm_at_hours
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ @ui_opt:alarm_sound
+
+ @ui_opt:alarm_recurring
+
+
+
+
+
+ @ui_opt:alarm_message
+ @ui_opt:alarm_message
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ @ui_opt:page_afk
+ @ui_opt:auto_afk_status
+
+
+ @ui_opt:auto_afk_time
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ @ui_opt:away_from_keyboard_auto_response_message
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ @ui_opt:hud_opacity
+
+
+
+
+
+
+ @ui_opt:overhead_map
+
+ @ui_opt:overhead_map_opacity
+
+
+
+ @ui_opt:overhead_map_show_waypoints
+ @ui_opt:overhead_map_show_creatures
+ @ui_opt:overhead_map_show_player
+ @ui_opt:overhead_map_show_buildings
+ @ui_opt:overhead_map_show_labels
+
+
+ @ui_opt:double_toolbar
+ @ui_opt:location_display
+ @ui_opt:dps_meter
+ @ui_opt:radar_terrain
+ @ui_opt:radar_blink_combat
+ @ui_opt:show_lookat_target_status_window
+ @ui_opt:show_status_over_intended_target
+ @ui_opt:winkey_windowed
+ @ui_opt:winkey_fullscreen
+ @ui_opt:show_notifications
+ @ui_opt:allow_overhead_map_rotation
+ @ui_opt:rotate_inventory_objects
+ @ui_opt:show_interesting_appearance
+ @ui_opt:show_auto_sort_inventory_contents
+ @ui_opt:show_auto_sort_data_pad_contents
+ @ui_opt:show_game_obj_arrows_on_radar
+ @ui_opt:show_radar_npc
+ @ui_skl:exp_monitor
+ @ui_opt:waypoint_mon
+ @ui_opt:waypoint_onscreen
+ @ui_opt:chat_bar_fades_out
+ @ui_opt:drag_onto_containers
+ @ui_opt:always_show_range_in_ground_radar
+ @ui_opt:show_target_arrow
+ @ui_opt:show_damager_arrow
+ @ui_opt:show_visible_enemy_damager_arrow
+ @ui_opt:new_vendor_examine
+ @ui_opt:show_quest_helper
+
+
+
+
+
+
+
+
+
+ @ui_opt:secondary_status
+
+
+
+
+
+
+
+
+ @ui_opt:ui_palette
+
+
+ @ui_opt:show_icon_names
+
+ @ui_opt:object_icon_size
+
+
+
+
+ @ui_opt:command_button_opacity
+
+
+
+
+ @ui_opt:fly_text_size
+
+
+
+
+
+ @ui_opt:space_camera_elasticity
+
+
+
+
+ @ui_opt:render_variable_target_reticle
+
+ @ui_opt:space_reticle_percentage
+
+
+
+
+
+
+ @ui_opt:buff_icon
+
+ @ui_opt:buff_icon_size_status
+
+
+
+
+ @ui_opt:buff_icon_size_target
+
+
+
+
+ @ui_opt:buff_icon_size_secondary_target
+
+
+
+
+ @ui_opt:buff_icon_size_pet
+
+
+
+
+ @ui_opt:buff_icon_whirlygig_opacity
+
+
+
+
+
+
+ @ui_opt:ui_res
+
+ @obj_attr_n:entangle_resistance
+ @obj_attr_n:res_cold_resist
+ @obj_attr_n:res_conductivity
+ @obj_attr_n:res_decay_resist
+ @obj_attr_n:res_flavor
+ @obj_attr_n:res_heat_resist
+ @obj_attr_n:res_malleability
+ @obj_attr_n:res_potential_energy
+ @obj_attr_n:res_quality
+ @obj_attr_n:res_shock_resistance
+ @obj_attr_n:res_toughness
+
+
+
+ @ui_opt:page_ui
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ @ui_opt:camera_zoom_speed
+
+
+
+
+ @ui_opt:mouse_sensitivity
+
+
+
+
+ @ui_opt:mouse_inertia
+
+
+
+
+ @ui_opt:dead_zone
+
+
+
+ @ui_opt:mouse_mode
+ @ui_opt:invert_mouselook
+ @ui_opt:turn_strafes
+ @ui_opt:can_fire_secondaries_from_toolbar
+ @ui_opt:target_nothing_untargets
+ @ui_opt:run_default
+ @ui_opt:ship_autolevel
+ @ui_opt:checkgimbal
+ @ui_opt:joystick_invert
+ @ui_opt:trackir
+
+ @ui_opt:joystick_dead_zone
+
+
+
+
+ @ui_opt:joystick_sensitivity
+
+
+
+
+ @ui_opt:pilot_mouse_mode
+ @ui_opt:pilot_mouse_mode_auto
+ @ui_opt:pilot_mouse_mode_virtual_joystick
+ @ui_opt:pilot_mouse_mode_cockpit_camera
+
+
+ @ui_opt:pov_hat_mode
+ @ui_opt:pov_hat_mode_snap
+
+ @ui_opt:pov_hat_mode_snap_angle
+
+
+
+ @ui_opt:pov_hat_mode_pan
+
+ @ui_opt:pov_hat_mode_pan_speed
+
+
+
+
+ @ui_opt:cockpit_camera_recenter
+
+ @ui_opt:cockpit_camera_snap_speed
+
+
+
+
+ @ui_opt:cockpit_camera_y_offset
+
+
+
+
+ @ui_opt:cockpit_camera_zoom_multiplier
+
+
+
+
+ @ui_opt:page_controls
+
+
+
+
+
+
+
+
+
+
+
+
+
+ @ui_opt:page_misc
+
+ @ui_opt:auto_reject_invite
+ @ui_opt:net_status
+ @ui_opt:confirm_obj_delete
+ @ui_opt:confirm_crafting
+ @ui_opt:show_system_message
+
+ @ui_opt:system_message_timeout
+
+
+
+
+ @ui_opt:object_name_font_size
+
+
+
+
+ @ui_opt:object_name_range
+
+
+
+ @ui_opt:object_name_show_all
+ @ui_opt:object_name_show_group
+ @ui_opt:object_name_show_players
+ @ui_opt:object_name_show_npcs
+ @ui_opt:object_name_show_guild
+ @ui_opt:object_name_show_signs
+ @ui_opt:object_name_show_my_name
+ @ui_opt:object_name_show_beasts
+ @ui_opt:screen_shake
+ @ui_opt:show_cockpit
+ @ui_opt:collection_show_server_first
+ @ui_opt:auto_loot_corpses
+ @ui_opt:show_corpse_loot_icon
+ @ui_opt:show_backpack
+ @ui_opt:show_helmet
+ @ui_opt:check_hide_appearance
+ @ui_opt:check_doubleclick_appearance
+ @ui_opt:check_show_appearance_inventory
+
+ @ui_opt:furniture_rotation_degree
+
+
+
+
+
+
+
+
+
+
+
+
+ @ui_opt:currency_format
+
+
+
+
+
+
+
+
+
+
+
+ ui_options_keymap.inc
+
+
+
+
+
+
+
+ @ui_opt:cpt_opt
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+