diff --git a/DefInjected/ChemicalDefs/Drugs.xml b/DefInjected/ChemicalDefs/Drugs.xml
index 8c82e5cf..d2ad6779 100644
--- a/DefInjected/ChemicalDefs/Drugs.xml
+++ b/DefInjected/ChemicalDefs/Drugs.xml
@@ -2,36 +2,38 @@
 <LanguageData>
  <!--A15  defs-->
 
-    <Beer.label>啤酒</Beer.label>
-    <Beer.description>除了水以外，人类所消耗的第一饮料。啤酒的味道不错，但主要效果是让人迷醉。过度饮用会导致酒精成瘾。</Beer.description>
+    <Alcohol.label>酒精</Alcohol.label>
+    
 
-    <Wort.label>麦芽汁</Wort.label>
-    <Wort.description>各种材料混合在一起，还未发酵的啤酒，需要放在发酵桶里酿造后才能变成真正的啤酒。</Wort.description>
+    <WakeUp.label>清醒剂</WakeUp.label>
+    
 
-    <Amphetamine.label>安非他命</Amphetamine.label>
-    <Amphetamine.description>一种成瘾性极强的兴奋剂，安非他命能够强化使用者的认知能力，使得服用者在短时期内工作时更加集中，忘记疲劳。但是药物成瘾后会使得精神受损，有时还会导致精神崩溃。</Amphetamine.description>
+    <Smokeleaf.label>烟叶</Smokeleaf.label>
+   
 
-    <Joint.label>大麻烟</Joint.label>
-    <Joint.description>将大麻烟叶卷在纸中点燃来抽，这种烟卷会让人兴奋，但是也会成瘾，减缓使用者的注意力和行动速度，长期使用会产生药物依赖。</Joint.description>
+    <Psychite.label>精神药物</Psychite.label>
 
-    <Flake.label>薄片</Flake.label>
-    <Flake.description>一种薄薄的原料，抽起来会让人精神愉悦，这种东西非常便于制造，有着极强的药物依赖性。</Flake.description>
-
-    <Yayo.label>椰油</Yayo.label>
-    <Yayo.description>一种精细的白色粉末，用鼻子吸入后可以使人高度兴奋，服用者会精神倍增并且能够抑制疼痛。但是却极易成瘾。</Yayo.description>
 
     <GoJuice.label>果味剂</GoJuice.label>
-    <GoJuice.description>一种合成毒品，被设计用来给太空陆战队员服用。“果汁”能够屏蔽痛感并提升服用者的近战和射击技能。同时还能够提升行动速度，但是发明他的化学家们却无法戒断这种药物的成瘾性。</GoJuice.description>
-
-    <MalariBlock.label>疟疾疫苗</MalariBlock.label>
-    <MalariBlock.description>一种用来针对疟疾的特效药物，五天一服，远离疟疾。</MalariBlock.description>
+ 
 
     <Luciferium.label>魔鬼素</Luciferium.label>
-    <Luciferium.description>来自闪耀世界的药物，全方位提升能力，但是100%成瘾，一旦无法继续摄入就会导致疯狂或者死亡。</Luciferium.description>
+    
 
 <!--A15  addiction Need
 
-
+<Alcohol.description>除了水以外，人类所消耗的第一饮料。啤酒的味道不错，但主要效果是让人迷醉。过度饮用会导致酒精成瘾。</Alcohol.description>
+<Wort.description>各种材料混合在一起，还未发酵的啤酒，需要放在发酵桶里酿造后才能变成真正的啤酒。</Wort.description>
+  <Wort.label>麦芽汁</Wort.label>
+    <Amphetamine.description>一种成瘾性极强的兴奋剂，安非他命能够强化使用者的认知能力，使得服用者在短时期内工作时更加集中，忘记疲劳。但是药物成瘾后会使得精神受损，有时还会导致精神崩溃。</Amphetamine.description>
+        <Flake.description>一种薄薄的原料，抽起来会让人精神愉悦，这种东西非常便于制造，有着极强的药物依赖性。</Flake.description>
+ <Joint.description>将大麻烟叶卷在纸中点燃来抽，这种烟卷会让人兴奋，但是也会成瘾，减缓使用者的注意力和行动速度，长期使用会产生药物依赖。</Joint.description>
+    <Yayo.label>椰油</Yayo.label>
+    <Yayo.description>一种精细的白色粉末，用鼻子吸入后可以使人高度兴奋，服用者会精神倍增并且能够抑制疼痛。但是却极易成瘾。</Yayo.description>
+       <GoJuice.description>一种合成毒品，被设计用来给太空陆战队员服用。“果汁”能够屏蔽痛感并提升服用者的近战和射击技能。同时还能够提升行动速度，但是发明他的化学家们却无法戒断这种药物的成瘾性。</GoJuice.description>
+<Luciferium.description>来自闪耀世界的药物，全方位提升能力，但是100%成瘾，一旦无法继续摄入就会导致疯狂或者死亡。</Luciferium.description>
+    <MalariBlock.label>疟疾疫苗</MalariBlock.label>
+    <MalariBlock.description>一种用来针对疟疾的特效药物，五天一服，远离疟疾。</MalariBlock.description>
 -->
 
 </LanguageData>
\ No newline at end of file
diff --git a/DefInjected/HeDiffDefs/Hediffs_Drugs.xml b/DefInjected/HeDiffDefs/Hediffs_Drugs.xml
index bd36aa45..0d7cf772 100644
--- a/DefInjected/HeDiffDefs/Hediffs_Drugs.xml
+++ b/DefInjected/HeDiffDefs/Hediffs_Drugs.xml
@@ -26,24 +26,24 @@
   <WakeUpHigh.label>清醒剂亢奋</WakeUpHigh.label>
   <WakeUpTolerance.label>清醒剂耐受</WakeUpTolerance.label>
   <WakeUpAddiction.label>清醒剂成瘾</WakeUpAddiction.label>
-  <WakeUpAddiction.stages.0.label>隐藏</WakeUpAddiction.stages.0.label>
-  <WakeUpAddiction.stages.1.label>戒断</WakeUpAddiction.stages.1.label>
+  <WakeUpAddiction.stages.0.label>戒断</WakeUpAddiction.stages.0.label>
+
 
   <SmokeleafHigh.label>烟叶沉醉</SmokeleafHigh.label>
   <SmokeleafAddiction.label>烟叶成瘾</SmokeleafAddiction.label>
-  <SmokeleafAddiction.stages.0.label>隐藏</SmokeleafAddiction.stages.0.label>
+  <SmokeleafAddiction.stages.0.label>戒断</SmokeleafAddiction.stages.0.label>
+
   <FlakeHigh.label>精神药物亢奋（薄片）</FlakeHigh.label>
   <YayoHigh.label>精神药物亢奋（亢奋）</YayoHigh.label>
+  <PsychiteAddiction.label>精神药物成瘾</PsychiteAddiction.label>
+  <PsychiteAddiction.stages.0.label>戒断</PsychiteAddiction.stages.0.label>
 
-  <CocaineAddiction.label>可卡因成瘾</CocaineAddiction.label>
-  <CocaineAddiction.stages.0.label>隐藏</CocaineAddiction.stages.0.label>
-  <CocaineAddiction.stages.1.label>戒断</CocaineAddiction.stages.1.label>
 
   <GoJuiceHigh.label>果味剂亢奋</GoJuiceHigh.label>
   <GoJuiceAddiction.label>果味剂成瘾</GoJuiceAddiction.label>
   <GoJuiceAddiction.stages.0.label>未满足</GoJuiceAddiction.stages.0.label>
-  <GoJuiceAddiction.stages.1.label>戒断</GoJuiceAddiction.stages.1.label>
 
+  <LuciferiumHigh.label>恶魔剂亢奋</LuciferiumHigh.label>
   <LuciferiumAddiction.label>恶魔剂成瘾</LuciferiumAddiction.label>
   <LuciferiumAddiction.stages.0.label>未满足</LuciferiumAddiction.stages.0.label>
 
diff --git a/DefInjected/ResearchProjectDefs/ResearchProjects_Drugs.xml b/DefInjected/ResearchProjectDefs/ResearchProjects_Drugs.xml
index 91d80439..fd9b27b9 100644
--- a/DefInjected/ResearchProjectDefs/ResearchProjects_Drugs.xml
+++ b/DefInjected/ResearchProjectDefs/ResearchProjects_Drugs.xml
@@ -3,15 +3,6 @@
 
   <!--A15 research-->
 
-  <AmphetamineProduction.label>制造安非他命</AmphetamineProduction.label>
-  <AmphetamineProduction.description>你的化学家将掌握合成安非他命的配方和技术。</AmphetamineProduction.description>
-
-  <FlakeProduction.label>制造薄片</FlakeProduction.label>
-  <FlakeProduction.description>你的化学家们将学会制造薄片，一种便宜但是极易成瘾的兴奋剂。</FlakeProduction.description>
-
-  <YayoProduction.label>制造椰油</YayoProduction.label>
-  <YayoProduction.description>学习制造椰油，一种会成瘾的致幻兴奋剂。</YayoProduction.description>
-
   <GoJuiceProduction.label>制造果味剂</GoJuiceProduction.label>
   <GoJuiceProduction.description>学会制造这种名为“果味剂”的合成的战斗增强兴奋剂。</GoJuiceProduction.description>
 
diff --git a/DefInjected/ThingDefs/Drugs.xml b/DefInjected/ThingDefs/Drugs.xml
index 7277b9c5..55783717 100644
--- a/DefInjected/ThingDefs/Drugs.xml
+++ b/DefInjected/ThingDefs/Drugs.xml
@@ -5,11 +5,11 @@
     <Beer.ingestible.ingestReportString>饮用{0}</Beer.ingestible.ingestReportString>
     <Beer.ingestible.ingestReportString>饮用{0}中</Beer.ingestible.ingestReportString>
 
-    <Amphetamine.ingestible.ingestReportString>服用{0}</Amphetamine.ingestible.ingestReportString>
-    <Amphetamine.ingestible.ingestReportString>服用{0}中</Amphetamine.ingestible.ingestReportString>
+    <WakeUp.ingestible.ingestReportString>服用{0}</WakeUp.ingestible.ingestReportString>
+    <WakeUp.ingestible.ingestReportString>服用{0}中</WakeUp.ingestible.ingestReportString>
 
-    <Joint.ingestible.ingestReportString>吸{0}</Joint.ingestible.ingestReportString>
-    <Joint.ingestible.ingestReportString>吸{0}中</Joint.ingestible.ingestReportString>
+    <SmokeleafJoint.ingestible.ingestReportString>吸{0}</SmokeleafJoint.ingestible.ingestReportString>
+    <SmokeleafJoint.ingestible.ingestReportString>吸{0}中</SmokeleafJoint.ingestible.ingestReportString>
 
     <Yayo.ingestible.ingestReportString>吸{0}</Yayo.ingestible.ingestReportString>
     <Yayo.ingestible.ingestReportString>吸{0}中</Yayo.ingestible.ingestReportString>
diff --git a/DefInjected/ThoughtDefs/Thoughts_Drugs.xml b/DefInjected/ThoughtDefs/Thoughts_Drugs.xml
index 993a9818..3edda56d 100644
--- a/DefInjected/ThoughtDefs/Thoughts_Drugs.xml
+++ b/DefInjected/ThoughtDefs/Thoughts_Drugs.xml
@@ -29,10 +29,12 @@
  <!-- <AmphetamineWithdrawal.stages.1.label>安非他命戒断</AmphetamineWithdrawal.stages.1.label>
   <AmphetamineWithdrawal.stages.1.description>我感到头晕眼花，注意力无法集中。</AmphetamineWithdrawal.stages.1.description>
 -->
-  <SmokeleaHigh.label>烟叶沉醉</SmokeleaHigh.label>
-  <SmokeleaHigh.description>我感觉……我没有任何感觉了伙计。</SmokeleaHigh.description>
-  <SmokeleaWithdrawal.stages.1.label>大麻戒断</SmokeleaWithdrawal.stages.1.label>
-  <SmokeleaWithdrawal.stages.1.description>好难受，无法集中注意力...</SmokeleaWithdrawal.stages.1.description>
+  <SmokeleafHigh.label>烟叶沉醉</SmokeleafHigh.label>
+  <SmokeleafHigh.description>我感觉……我没有任何感觉了伙计。</SmokeleafHigh.description>
+  <SmokeleafHigh.stages.0.description>哪里感觉不太对?</SmokeleafHigh.stages.0.description>
+  <SmokeleafWithdrawal.stages.1.label>烟叶戒断</SmokeleafWithdrawal.stages.1.label>
+  <SmokeleafWithdrawal.stages.1.description>好难受，无法集中注意力...</SmokeleafWithdrawal.stages.1.description>
+
 
   <FlakeHigh.label>精神药物亢奋（薄片）</FlakeHigh.label>
   <FlakeHigh.description>太棒了，太棒了。</FlakeHigh.description>