diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno.dm b/code/modules/client/preference_setup/loadout/loadout_xeno.dm
index 8ff1003214c..79e6a1ec7f4 100644
--- a/code/modules/client/preference_setup/loadout/loadout_xeno.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_xeno.dm
@@ -62,29 +62,29 @@
 	display_name = "headtail-wear, female, pink, cloth (Skrell)"
 	path = /obj/item/clothing/ears/skrell/cloth_female/pink
 
-/datum/gear/uniform/jumpsuit/teshari
+/datum/gear/uniform/teshari
 	display_name = "smock, grey (Teshari)"
 	path = /obj/item/clothing/under/seromi
 	whitelisted = "Teshari"
 	sort_category = "Xenowear"
 
-/datum/gear/uniform/jumpsuit/teshari/yellow
+/datum/gear/uniform/teshari/jumpsuit
 	display_name = "smock, yellow (Teshari)"
 	path = /obj/item/clothing/under/seromi/yellow
 
-/datum/gear/uniform/jumpsuit/teshari/red
+/datum/gear/uniform/teshari/jumpsuit/red
 	display_name = "smock, red (Teshari)"
 	path = /obj/item/clothing/under/seromi/red
 
-/datum/gear/uniform/jumpsuit/teshari/white
+/datum/gear/uniform/teshari/jumpsuit/white
 	display_name = "smock, white (Teshari)"
 	path = /obj/item/clothing/under/seromi/white
 
-/datum/gear/uniform/jumpsuit/teshari/medical
+/datum/gear/uniform/teshari/jumpsuit/medical
 	display_name = "smock, Medical (Teshari)"
 	path = /obj/item/clothing/under/seromi/medical
 
-/datum/gear/uniform/jumpsuit/teshari/rainbow
+/datum/gear/uniform/teshari/jumpsuit/rainbow
 	display_name = "smock, rainbow (Teshari)"
 	path = /obj/item/clothing/under/seromi/rainbow
 
diff --git a/html/changelog.html b/html/changelog.html
index b8cbe719601..c743aadeefa 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -53,6 +53,29 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">17 April 2016</h2>
+			<h3 class="author">Datraen updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Manually ports /tg/station's dark click code https://github.com/tgstation/-tg-station/pull/10272 by Razharas.</li>
+				<li class="bugfix">Teshari smocks now spawn as smocks, and not aqua jumpsuits.</li>
+				<li class="bugfix">Checks to see if new a two-handed weapon can be wielded when dropped.</li>
+			</ul>
+			<h3 class="author">EmperorJon updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Robotics Console now correctly shows the operational/lockdown state and button based off if it thinks the synthetic is locked down or not.</li>
+				<li class="bugfix">Autotraitor synths now behave the same as Traitor synths - they are not locked down.</li>
+			</ul>
+			<h3 class="author">Kelenius updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Solars now start wired.</li>
+			</ul>
+			<h3 class="author">Neerti updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Ports Bay's volume-based inventory system.  It works off by weight classes instead of just slots, allowing you to hold more light items than you could previously.</li>
+				<li class="rscadd">Bulky items can now go in your backpack, however it will require twice the space of a normal sized item.</li>
+				<li class="rscdel">Spacesuits, RIGs, and sniper rifles made heavier.</li>
+			</ul>
+
 			<h2 class="date">07 April 2016</h2>
 			<h3 class="author">Datraen updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 30f344240f9..5a36a0a5b7c 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -2218,3 +2218,23 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       and languages.
   - bugfix: DNA extract sting won't produce a strange message if there's no target.
   - tweak: Cultists no longer need to research words.
+2016-04-17:
+  Datraen:
+  - rscadd: Manually ports /tg/station's dark click code https://github.com/tgstation/-tg-station/pull/10272
+      by Razharas.
+  - bugfix: Teshari smocks now spawn as smocks, and not aqua jumpsuits.
+  - bugfix: Checks to see if new a two-handed weapon can be wielded when dropped.
+  EmperorJon:
+  - bugfix: Robotics Console now correctly shows the operational/lockdown state and
+      button based off if it thinks the synthetic is locked down or not.
+  - bugfix: Autotraitor synths now behave the same as Traitor synths - they are not
+      locked down.
+  Kelenius:
+  - rscadd: Solars now start wired.
+  Neerti:
+  - rscadd: Ports Bay's volume-based inventory system.  It works off by weight classes
+      instead of just slots, allowing you to hold more light items than you could
+      previously.
+  - rscadd: Bulky items can now go in your backpack, however it will require twice
+      the space of a normal sized item.
+  - rscdel: Spacesuits, RIGs, and sniper rifles made heavier.
diff --git a/html/changelogs/Datraen-DarkClickPort.yml b/html/changelogs/Datraen-DarkClickPort.yml
deleted file mode 100644
index c34938f923c..00000000000
--- a/html/changelogs/Datraen-DarkClickPort.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: Datraen
-
-delete-after: True
-
-changes: 
-  - rscadd: "Manually ports /tg/station's dark click code https://github.com/tgstation/-tg-station/pull/10272 by Razharas."
diff --git a/html/changelogs/Kelenius-pleaseSwitchMeOn.yml b/html/changelogs/Kelenius-pleaseSwitchMeOn.yml
deleted file mode 100644
index a7aa5cc204e..00000000000
--- a/html/changelogs/Kelenius-pleaseSwitchMeOn.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-################################
-# Example Changelog File
-#
-# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
-#
-# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
-# When it is, any changes listed below will disappear.
-#
-# Valid Prefixes: 
-#   bugfix
-#   wip (For works in progress)
-#   tweak
-#   soundadd
-#   sounddel
-#   rscadd (general adding of nice things)
-#   rscdel (general deleting of nice things)
-#   imageadd
-#   imagedel
-#   maptweak
-#   spellcheck (typo fixes)
-#   experiment
-#################################
-
-# Your name.  
-author: Kelenius
-
-# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
-delete-after: True
-
-# Any changes you've made.  See valid prefix list above.
-# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
-# SCREW THIS UP AND IT WON'T WORK.
-# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
-# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
-changes: 
-  - rscadd: "Solars now start wired."
diff --git a/html/changelogs/Neerti-InventorySystemPort.yml b/html/changelogs/Neerti-InventorySystemPort.yml
deleted file mode 100644
index db9dd5d2fca..00000000000
--- a/html/changelogs/Neerti-InventorySystemPort.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-################################
-# Example Changelog File
-#
-# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
-#
-# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
-# When it is, any changes listed below will disappear.
-#
-# Valid Prefixes: 
-#   bugfix
-#   wip (For works in progress)
-#   tweak
-#   soundadd
-#   sounddel
-#   rscadd (general adding of nice things)
-#   rscdel (general deleting of nice things)
-#   imageadd
-#   imagedel
-#   maptweak
-#   spellcheck (typo fixes)
-#   experiment
-#################################
-
-# Your name.  
-author: Neerti
-
-# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
-delete-after: True
-
-# Any changes you've made.  See valid prefix list above.
-# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
-# SCREW THIS UP AND IT WON'T WORK.
-# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
-# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
-changes: 
-  - rscadd: "Ports Bay's volume-based inventory system.  It works off by weight classes instead of just slots, allowing you to hold more light items than you could previously."
-  - rscadd: "Bulky items can now go in your backpack, however it will require twice the space of a normal sized item."
-  - rscdel: "Spacesuits, RIGs, and sniper rifles made heavier."
diff --git a/html/changelogs/datraen-twohanddrop.yml b/html/changelogs/datraen-twohanddrop.yml
deleted file mode 100644
index ccb05e07811..00000000000
--- a/html/changelogs/datraen-twohanddrop.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: Datraen
-
-delete-after: True
-
-changes: 
-  - bugfix: "Checks to see if new a two-handed weapon can be wielded when dropped."
diff --git a/html/changelogs/emperorjon-11_Apr._Lockdown_fix.yml b/html/changelogs/emperorjon-11_Apr._Lockdown_fix.yml
deleted file mode 100644
index 794becc5c32..00000000000
--- a/html/changelogs/emperorjon-11_Apr._Lockdown_fix.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-author: EmperorJon
-
-delete-after: True
-
-changes: 
-  - bugfix: "Robotics Console now correctly shows the operational/lockdown state and button based off if it thinks the synthetic is locked down or not."
-  - bugfix: "Autotraitor synths now behave the same as Traitor synths - they are not locked down."
\ No newline at end of file