diff --git a/Shadowrun Sixth World/CHANGELOG.md b/Shadowrun Sixth World/CHANGELOG.md
index b08b8c6883..f4ae5770d1 100644
--- a/Shadowrun Sixth World/CHANGELOG.md	
+++ b/Shadowrun Sixth World/CHANGELOG.md	
@@ -1,6 +1,21 @@
 Change Log
 ==============================================
 
+**2021-03-29** v.25 Chuz (James Culp)
+	Fixed Matrix ASDF indicator bubbles so 0 doesn't light up all 10 indicators
+	Started changes for NPC sheets.
+	Updated npc sheets image, settings and toggle headers.
+	Styled npc toggles and attribute buttons
+	Updated attribute roll buttons to be consistent with PC sheet buttons.
+	Made Magic now visible if Awakened OR Spirit are selected
+	Made Force only visible if Spirit is selected
+	Updated styles and html to make settings hide/reveal correctly for non-pc sheets
+	Updated matrix grid to work properly with 0 for a stat
+	Changed npc pain tolerance to be in options
+	Updated npc options -> grunt type (mundane, awakened, emergent, spirit) to be a select labeled Archetype
+	Updated "Bonuses" and "Modifier" column variables for non-PC sheets.  They now have the proper name='' fields.
+	DR, I/ID, AC, CM and Move (from npc stat blocks) are now represented along with common rolls (DR, Defense and Soak)	
+
 **2021-03-22** v.24 Chuz (James Culp)
 	Beginning v.24
 	Rearranged player/character names, toggles and navigation buttons in header - still tweaking layout
diff --git a/Shadowrun Sixth World/README.md b/Shadowrun Sixth World/README.md
index 61865b6c2b..df968795aa 100644
--- a/Shadowrun Sixth World/README.md	
+++ b/Shadowrun Sixth World/README.md	
@@ -4,8 +4,7 @@ Shadowrun Sixth World Character Sheet
 **`This is a work in progress.`**
 =
 
-At this point only the PC sheet is functional and that is lacking all work in the Matrix section.
-
+At this point only the PC sheet is functional, NPC sheets are being addressed now.
 
 Roll20 Forum Post: https://app.roll20.net/forum/post/9862344/shadowrun-sixth-world-character-sheet-for-shadowrun-sixth-world-6e
 
@@ -18,18 +17,15 @@ TO DO
 	* Ammo only has one input, there should be an input for per reload and max
 	* Arms -> Ranged Might need to add a "Gunnery" skill option and when selected change attribute to Logic
 
-**`Grunt Sheet`**
-	* everything
-
-**`Host Sheet`**
-	* everything
-
-**`Sprite Sheet`**
-	* everything
-
-**`Vehicle Sheet`**
-	* everything
-
+**`NPC Sheets`**
+	* Fix Qualities
+	* Fix Augmentations
+	* Fix Gear
+	* Fix Skills
+	* Fix Weapons
+	* Fix Matrix Device / Programs
+	* Fix Spells
+	* Fix Complex Forms
 
 **`Future Features Wishlist`**
 	* Extended Tests Roller?
@@ -44,5 +40,11 @@ TO DO
 	* Add spot for augs/bioware grades (Standard/Beta/Delta/etc)
 	* Matrix -> Programs (checkboxes to indicate currently loaded)
 	* GOD character sheet (track OS score for multiple characters, npcs)
+	* Add spot for augs/bioware grades (Standard/Beta/Delta/etc)
+	* Skills (Expertise and Specialization Buttons) colorize them ... maybe 2 light shades of purple one lighter than the other
+	* Matrix -> Programs (checkboxes to indicate currently loaded)
+	* Major/Minor Actions block for PCs, maybe auto-calculated also?
+	* Add move-mod to PC sheet and Sprint roller calculations
+