diff --git a/plugins/include/tf2.inc b/plugins/include/tf2.inc
index 62cc4e7c..b7d2f066 100644
--- a/plugins/include/tf2.inc
+++ b/plugins/include/tf2.inc
@@ -107,18 +107,18 @@ enum TFCond
 	TFCond_RegenBuffed,
 	TFCond_MarkedForDeath,
 	TFCond_NoHealingDamageBuff,
-	TFCond_SpeedBuffAlly,
+	TFCond_SpeedBuffAlly,		//32
 	TFCond_HalloweenCritCandy,
 	TFCond_CritCanteen,
-	
-	TFCond_CritHype = 36,
+	TFCond_CritDemoCharge,
+	TFCond_CritHype,
 	TFCond_CritOnFirstBlood,
 	TFCond_CritOnWin,
 	TFCond_CritOnFlagCapture,
 	TFCond_CritOnKill,
 	TFCond_RestrictToMelee,
-	
-	TFCond_Reprogrammed = 43,
+	TFCond_DefenseBuffNoCritBlock,
+	TFCond_Reprogrammed,
 	TFCond_CritMmmph,
 	TFCond_DefenseBuffMmmph,
 	TFCond_FocusBuff,
@@ -140,16 +140,19 @@ enum TFCond
 	TFCond_SmallBlastResist,
 	TFCond_SmallFireResist,
 	TFCond_Stealthed, // 64
-
-	TFCond_StealthedUserBuffFade = 66,
-
-	TFCond_MVMBotRadiowave = 71,
+	TFCond_MedigunDebuff,
+	TFCond_StealthedUserBuffFade,
+	TFCond_BulletImmune,
+	TFCond_BlastImmune,
+	TFCond_FireImmune,
+	TFCond_PreventDeath,
+	TFCond_MVMBotRadiowave,
 	TFCond_HalloweenSpeedBoost,
 	TFCond_HalloweenQuickHeal,
 	TFCond_HalloweenGiant,
-	TFCond_HalloweenTiny, // 75
-
-	TFCond_HalloweenGhostMode = 77,
+	TFCond_HalloweenTiny,
+	TFCond_HalloweenInHell,
+	TFCond_HalloweenGhostMode,
 };
 
 enum TFHoliday
diff --git a/plugins/include/tf2_stocks.inc b/plugins/include/tf2_stocks.inc
index e8b09d2c..20a29ebc 100644
--- a/plugins/include/tf2_stocks.inc
+++ b/plugins/include/tf2_stocks.inc
@@ -143,6 +143,7 @@ enum {
 	TF_CUSTOM_MERASMUS_ZAP,
 	TF_CUSTOM_MERASMUS_DECAPITATION,
 	TF_CUSTOM_CANNONBALL_PUSH,
+	TF_CUSTOM_TAUNT_ALLCLASS_GUITAR_RIFF,
 };
 
 // Weapon codes as used in some events, such as player_death