diff --git a/PackageSources/ModelBehaviorDefs/TFDi_Design/MD11/FlightDeck/Overhead.xml b/PackageSources/ModelBehaviorDefs/TFDi_Design/MD11/FlightDeck/Overhead.xml
index 2b7b990..d31f245 100644
--- a/PackageSources/ModelBehaviorDefs/TFDi_Design/MD11/FlightDeck/Overhead.xml
+++ b/PackageSources/ModelBehaviorDefs/TFDi_Design/MD11/FlightDeck/Overhead.xml
@@ -64,6 +64,7 @@
90130
90131
+
MD11_OVHD_ELEC_CAB_BUS_BT
MD11_OVHD_ELEC_CAB_BUS_BT
@@ -184,6 +185,7 @@
90157
90158
+
MD11_OVHD_GALLEY_BUS_1_BT
MD11_OVHD_GALLEY_BUS_1_BT
@@ -194,6 +196,7 @@
90163
90164
+
MD11_OVHD_GALLEY_BUS_2_BT
MD11_OVHD_GALLEY_BUS_2_BT
@@ -204,6 +207,7 @@
90165
90166
+
MD11_OVHD_GALLEY_BUS_3_BT
MD11_OVHD_GALLEY_BUS_3_BT
diff --git a/scripts/tooltips.csv b/scripts/tooltips.csv
index 08c0998..944d559 100644
--- a/scripts/tooltips.csv
+++ b/scripts/tooltips.csv
@@ -653,39 +653,39 @@ Glareshield.xml|TFDi_Design_MD11_Knob_Push|MD11_RECP_BAROSET_CAP|First Officer A
Glareshield.xml|TFDi_Design_MD11_Switch_SingleEvent_Template|MD11_RECP_MINIMUMS_KB|First Officer Minimums Mode (%((L:MD11_RECP_MINIMUMS_KB))%{if}Baro%{else}Radio%{end})
Glareshield.xml|TFDi_Design_MD11_Knob_Push|MD11_RECP_MINIMUMS_CAP|First Officer Minimums Setting (%((TODO:VAR)) %((L:MD11_LECP_MINIMUMS_KB))%{if}Baro%{else}Radio%{end})
Glareshield.xml|TFDi_Design_MD11_Knob_Push|MD11_RECP_WXBRT_KB|First Officer Weather Radar/Terrain Display Brightness (%((L:MD11_RECP_WXBRT_KB) 5 *)%!d!%%)
-Overhead.xml|TFDi_Design_MD11_Button_Template|MD11_OVHD_ELEC_GEN1_BT|
-Overhead.xml|TFDi_Design_MD11_Button_Template|MD11_OVHD_ELEC_GEN1_DRIVE_BT|
-Overhead.xml|TFDi_Design_MD11_Button_Template|MD11_OVHD_ELEC_GEN2_BT|
-Overhead.xml|TFDi_Design_MD11_Button_Template|MD11_OVHD_ELEC_GEN2_DRIVE_BT|
-Overhead.xml|TFDi_Design_MD11_Button_Template|MD11_OVHD_ELEC_GEN3_BT|
-Overhead.xml|TFDi_Design_MD11_Button_Template|MD11_OVHD_ELEC_GEN3_DRIVE_BT|
-Overhead.xml|TFDi_Design_MD11_Button_Template|MD11_OVHD_ELEC_CAB_BUS_BT|
-Overhead.xml|TFDi_Design_MD11_Button_Template|MD11_OVHD_ELEC_AC_TIE1_BT|
-Overhead.xml|TFDi_Design_MD11_Button_Template|MD11_OVHD_ELEC_GLY_EXT_PWR_BT|
-Overhead.xml|TFDi_Design_MD11_Button_Template|MD11_OVHD_ELEC_AC_TIE2_BT|
-Overhead.xml|TFDi_Design_MD11_Button_Template|MD11_OVHD_ELEC_EXT_PWR_BT|
-Overhead.xml|TFDi_Design_MD11_Button_Template|MD11_OVHD_ELEC_APU_PWR_BT|
-Overhead.xml|TFDi_Design_MD11_Button_Template|MD11_OVHD_ELEC_AC_TIE3_BT|
-Overhead.xml|TFDi_Design_MD11_Button_Template|MD11_OVHD_ELEC_ADG_ELEC_BT|
-Overhead.xml|TFDi_Design_MD11_Button_Template|MD11_OVHD_ELEC_BATT_BT|
-Overhead.xml|TFDi_Design_MD11_Button_Template|MD11_OVHD_ELEC_DC_TIE1_BT|
-Overhead.xml|TFDi_Design_MD11_Button_Template|MD11_OVHD_ELEC_DC_TIE3_BT|
-Overhead.xml|TFDi_Design_MD11_Button_Template|MD11_OVHD_ELEC_SYSTEM_SEL_BT|
-Overhead.xml|TFDi_Design_MD11_Button_Template|MD11_OVHD_GALLEY_BUS_1_BT|
-Overhead.xml|TFDi_Design_MD11_Button_Template|MD11_OVHD_GALLEY_BUS_2_BT|
-Overhead.xml|TFDi_Design_MD11_Button_Template|MD11_OVHD_GALLEY_BUS_3_BT|
-Overhead.xml|TFDi_Design_MD11_Button_Template|MD11_OVHD_HYD_1_3_RMP_BT|
-Overhead.xml|TFDi_Design_MD11_Button_Template|MD11_OVHD_HYD_2_3_RMP_BT|
-Overhead.xml|TFDi_Design_MD11_Button_Template|MD11_OVHD_HYD_AUX_PUMP_1_BT|
-Overhead.xml|TFDi_Design_MD11_Button_Template|MD11_OVHD_HYD_AUX_PUMP_2_BT|
-Overhead.xml|TFDi_Design_MD11_Button_Template|MD11_OVHD_HYD_SYSTEM_SEL_BT|
-Overhead.xml|TFDi_Design_MD11_Button_Template|MD11_OVHD_HYD_EDP_1_L_BT|
-Overhead.xml|TFDi_Design_MD11_Button_Template|MD11_OVHD_HYD_EDP_1_R_BT|
-Overhead.xml|TFDi_Design_MD11_Button_Template|MD11_OVHD_HYD_EDP_2_L_BT|
-Overhead.xml|TFDi_Design_MD11_Button_Template|MD11_OVHD_HYD_EDP_2_R_BT|
-Overhead.xml|TFDi_Design_MD11_Button_Template|MD11_OVHD_HYD_EDP_3_L_BT|
-Overhead.xml|TFDi_Design_MD11_Button_Template|MD11_OVHD_HYD_EDP_3_R_BT|
-Overhead.xml|TFDi_Design_MD11_Button_Template|MD11_OVHD_HYD_HYD_TEST_BT|
+Overhead.xml|TFDi_Design_MD11_Button_Template|MD11_OVHD_ELEC_GEN1_BT|Generator 1
+Overhead.xml|TFDi_Design_MD11_Button_Template|MD11_OVHD_ELEC_GEN1_DRIVE_BT|Generator 1 IDG Disconnect
+Overhead.xml|TFDi_Design_MD11_Button_Template|MD11_OVHD_ELEC_GEN2_BT|Generator 2
+Overhead.xml|TFDi_Design_MD11_Button_Template|MD11_OVHD_ELEC_GEN2_DRIVE_BT|Generator 2 IDG Disconnect
+Overhead.xml|TFDi_Design_MD11_Button_Template|MD11_OVHD_ELEC_GEN3_BT|Generator 3
+Overhead.xml|TFDi_Design_MD11_Button_Template|MD11_OVHD_ELEC_GEN3_DRIVE_BT|Generator 3 IDG Disconnect
+Overhead.xml|TFDi_Design_MD11_Button_Template|MD11_OVHD_ELEC_CAB_BUS_BT|Cabin Bus
+Overhead.xml|TFDi_Design_MD11_Button_Template|MD11_OVHD_ELEC_AC_TIE1_BT|AC Bus Tie 1
+Overhead.xml|TFDi_Design_MD11_Button_Template|MD11_OVHD_ELEC_GLY_EXT_PWR_BT|External Galley Power
+Overhead.xml|TFDi_Design_MD11_Button_Template|MD11_OVHD_ELEC_AC_TIE2_BT|AC Bus Tie 2
+Overhead.xml|TFDi_Design_MD11_Button_Template|MD11_OVHD_ELEC_EXT_PWR_BT|External Power
+Overhead.xml|TFDi_Design_MD11_Button_Template|MD11_OVHD_ELEC_APU_PWR_BT|APU Power
+Overhead.xml|TFDi_Design_MD11_Button_Template|MD11_OVHD_ELEC_AC_TIE3_BT|AC Bus Tie 3
+Overhead.xml|TFDi_Design_MD11_Button_Template|MD11_OVHD_ELEC_ADG_ELEC_BT|Air Driven Generator (ADG) Electrical Generator
+Overhead.xml|TFDi_Design_MD11_Button_Template|MD11_OVHD_ELEC_BATT_BT|Battery
+Overhead.xml|TFDi_Design_MD11_Button_Template|MD11_OVHD_ELEC_DC_TIE1_BT|DC Bus Tie 1
+Overhead.xml|TFDi_Design_MD11_Button_Template|MD11_OVHD_ELEC_DC_TIE3_BT|DC Bus Tie 3
+Overhead.xml|TFDi_Design_MD11_Button_Template|MD11_OVHD_ELEC_SYSTEM_SEL_BT|Electrical System Mode (%((L:MD11_OVHD_ELEC_SYSTEM_SEL_BT))%{if}Manual%{else}Auto%{end})
+Overhead.xml|TFDi_Design_MD11_Button_Template|MD11_OVHD_GALLEY_BUS_1_BT|Galley Bus 1
+Overhead.xml|TFDi_Design_MD11_Button_Template|MD11_OVHD_GALLEY_BUS_2_BT|Galley Bus 2
+Overhead.xml|TFDi_Design_MD11_Button_Template|MD11_OVHD_GALLEY_BUS_3_BT|Galley Bus 3
+Overhead.xml|TFDi_Design_MD11_Button_Template|MD11_OVHD_HYD_1_3_RMP_BT|Hydraulic Reversible Motor Pump 1-3
+Overhead.xml|TFDi_Design_MD11_Button_Template|MD11_OVHD_HYD_2_3_RMP_BT|Hydraulic Reversible Motor Pump 2-3
+Overhead.xml|TFDi_Design_MD11_Button_Template|MD11_OVHD_HYD_AUX_PUMP_1_BT|Auxiliary Hydraulic Pump 1
+Overhead.xml|TFDi_Design_MD11_Button_Template|MD11_OVHD_HYD_AUX_PUMP_2_BT|Auxiliary Hydraulic Pump 2
+Overhead.xml|TFDi_Design_MD11_Button_Template|MD11_OVHD_HYD_SYSTEM_SEL_BT|Hydraulic System Mode (%((L:MD11_OVHD_HYD_SYSTEM_SEL_BT))%{if}Manual%{else}Auto%{end})
+Overhead.xml|TFDi_Design_MD11_Button_Template|MD11_OVHD_HYD_EDP_1_L_BT|Engine 1 Left Engine Driven Hydraulic Pump
+Overhead.xml|TFDi_Design_MD11_Button_Template|MD11_OVHD_HYD_EDP_1_R_BT|Engine 1 Right Engine Driven Hydraulic Pump
+Overhead.xml|TFDi_Design_MD11_Button_Template|MD11_OVHD_HYD_EDP_2_L_BT|Engine 2 Left Engine Driven Hydraulic Pump
+Overhead.xml|TFDi_Design_MD11_Button_Template|MD11_OVHD_HYD_EDP_2_R_BT|Engine 2 Right Engine Driven Hydraulic Pump
+Overhead.xml|TFDi_Design_MD11_Button_Template|MD11_OVHD_HYD_EDP_3_L_BT|Engine 3 Left Engine Driven Hydraulic Pump
+Overhead.xml|TFDi_Design_MD11_Button_Template|MD11_OVHD_HYD_EDP_3_R_BT|Engine 3 Right Engine Driven Hydraulic Pump
+Overhead.xml|TFDi_Design_MD11_Button_Template|MD11_OVHD_HYD_HYD_TEST_BT|Hydraulic System Test
Overhead.xml|TFDi_Design_MD11_Button_Template|MD11_OVHD_FUEL_FILL_TANK_1_BT|
Overhead.xml|TFDi_Design_MD11_Button_Template|MD11_OVHD_FUEL_PUMP_TANK_1_BT|
Overhead.xml|TFDi_Design_MD11_Button_Template|MD11_OVHD_FUEL_XFEED_TANK_1_BT|
@@ -801,8 +801,8 @@ Overhead.xml|TFDi_Design_MD11_Switch_SingleEvent_Template|MD11_OVHD_STBY_CMPS_SW
Overhead.xml|TFDi_Design_MD11_Switch_SingleEvent_Template|MD11_OVHD_IRS_1_KB|
Overhead.xml|TFDi_Design_MD11_Switch_SingleEvent_Template|MD11_OVHD_IRS_2_KB|
Overhead.xml|TFDi_Design_MD11_Switch_SingleEvent_Template|MD11_OVHD_IRS_3_KB|
-Overhead.xml|TFDi_Design_MD11_Knob_Template|MD11_OVHD_ELEC_EMER_PWR_KB|
-Overhead.xml|TFDi_Design_MD11_Knob_Template|MD11_OVHD_ELEC_SMOKE_ELEC_AIR_KB|
+Overhead.xml|TFDi_Design_MD11_Knob_Template|MD11_OVHD_ELEC_EMER_PWR_KB|Emergency Power (%((L:MD11_OVHD_ELEC_EMER_PWR_KB))%{case}%{:0}Off%{:1}Armed%{:2}On%{end})
+Overhead.xml|TFDi_Design_MD11_Knob_Template|MD11_OVHD_ELEC_SMOKE_ELEC_AIR_KB|Smoke Electric/Air System Off (%((L:MD11_OVHD_ELEC_SMOKE_ELEC_AIR_KB))%{case}%{:0}Normal%{:1}Electrical 3/Air 1 Off%{:2}Electrical 2/Air 3 Off%{:3}Electrical 1/Air 2 Off%{end})
Overhead.xml|TFDi_Design_MD11_Knob_Template|MD11_OVHD_LTS_OUTER_OVHD_PNL_FLOOD_KB|
Overhead.xml|TFDi_Design_MD11_Knob_Template|MD11_OVHD_LTS_INNER_OVHD_PNL_FLOOD_KB|
Overhead.xml|TFDi_Design_MD11_Knob_Template|MD11_OVHD_LTS_OUTER_INSTR_PED_PNL_FLOOD_KB|
@@ -819,12 +819,12 @@ Overhead.xml|TFDi_Design_MD11_Knob_Template|MD11_OVHD_PNEU_MLDG_ALT_KB|
Overhead.xml|TFDi_Design_MD11_Knob_Template|MD11_OVHD_L_WIPER_KB|
Overhead.xml|TFDi_Design_MD11_Knob_Template|MD11_OVHD_R_WIPER_KB|
Overhead.xml|TFDi_Design_MD11_Knob_Template|MD11_OVHD_FLTCTL_FLAPLIM_KB|
-Overhead.xml|TFDi_Design_MD11_Guard_Template|MD11_OVHD_ELEC_GEN1_DRIVE_GRD|
-Overhead.xml|TFDi_Design_MD11_Guard_Template|MD11_OVHD_ELEC_GEN2_DRIVE_GRD|
-Overhead.xml|TFDi_Design_MD11_Guard_Template|MD11_OVHD_ELEC_GEN3_DRIVE_GRD|
-Overhead.xml|TFDi_Design_MD11_Guard_Template|MD11_OVHD_ELEC_CAB_BUS_GRD|
-Overhead.xml|TFDi_Design_MD11_Guard_Template|MD11_OVHD_ELEC_BATT_GRD|
-Overhead.xml|TFDi_Design_MD11_Guard_Template|MD11_OVHD_HYD_HYD_TEST_GRD|
+Overhead.xml|TFDi_Design_MD11_Guard_Template|MD11_OVHD_ELEC_GEN1_DRIVE_GRD|Generator 1 IDG Disconnect
+Overhead.xml|TFDi_Design_MD11_Guard_Template|MD11_OVHD_ELEC_GEN2_DRIVE_GRD|Generator 2 IDG Disconnect
+Overhead.xml|TFDi_Design_MD11_Guard_Template|MD11_OVHD_ELEC_GEN3_DRIVE_GRD|Generator 3 IDG Disconnect
+Overhead.xml|TFDi_Design_MD11_Guard_Template|MD11_OVHD_ELEC_CAB_BUS_GRD|Cabin Bus
+Overhead.xml|TFDi_Design_MD11_Guard_Template|MD11_OVHD_ELEC_BATT_GRD|Battery
+Overhead.xml|TFDi_Design_MD11_Guard_Template|MD11_OVHD_HYD_HYD_TEST_GRD|Hydraulic System Test
Overhead.xml|TFDi_Design_MD11_Guard_Template|MD11_OVHD_FUEL_DUMP_GRD|
Overhead.xml|TFDi_Design_MD11_Guard_Template|MD11_OVHD_FUEL_MANF_DRAIN_GRD|
Overhead.xml|TFDi_Design_MD11_Guard_Template|MD11_OVHD_PNEU_MASKS_GRD|
diff --git a/xkhofmann-tfdidesign-md11-fixes.code-workspace b/xkhofmann-tfdidesign-md11-fixes.code-workspace
index d6a81a2..72ab779 100644
--- a/xkhofmann-tfdidesign-md11-fixes.code-workspace
+++ b/xkhofmann-tfdidesign-md11-fixes.code-workspace
@@ -28,6 +28,7 @@
"Autoflight",
"AUTOFLIGHT",
"Autothrust",
+ "Baro",
"BARO",
"BAROSET",
"BRTDIM",
@@ -185,6 +186,7 @@
"TOOLTIPID",
"TRFC",
"UPARROW",
+ "Uplock",
"UPRAUX",
"UYDA",
"UYDAFAIL",