diff --git a/sc2/ChangeLog b/sc2/ChangeLog
index e4cbd3fe3..def38ee3a 100644
--- a/sc2/ChangeLog
+++ b/sc2/ChangeLog
@@ -56,9 +56,10 @@
 - Spelling and punctuation pass (bug #1200), from Anthony J. Bentley
 - New Man Page edition of the user manual (Bug #1204), from Bentley
 - STAR CONTROL trademark information updated to reflect current events (#1201)
+- Reorganize and update credits generally - Michael
 
 0.7.1:
-- New SDL2 backend for modern operating systems - Micahel
+- New SDL2 backend for modern operating systems - Michael
 - Fixed netplay when compiling against modern versions of Visual
   Studio, from Ala-lala
 
diff --git a/sc2/content/base/cutscene/credits/credits.txt b/sc2/content/base/cutscene/credits/credits.txt
index dfbeac652..47095bdd3 100644
--- a/sc2/content/base/cutscene/credits/credits.txt
+++ b/sc2/content/base/cutscene/credits/credits.txt
@@ -31,9 +31,7 @@ CREW
  
 
 #(Core team caption)
-13 C
-CORE TEAM
-(in alphabetical order)
+17 C CORE TEAM
 
 #(Core team members)
 13 C
@@ -43,20 +41,34 @@ Michael Chapman Martin
 Chris Nelson
 Alex Volkov
  
+
 #(AP caption)
-13 C
-ADDITIONAL PROGRAMMING
-(in alphabetical order)
+17 C ADDITIONAL PROGRAMMING
 
 #(AP crew)
 13 C
+Karl Bartel
+Scott A. Colcord
+Loius Delacroix
+jdorje
 Geoffrey Hausheer
+Sze Howe Koh
+Ala-lala
+Mudrony Laszlo
+Peter MacMillan
+Sanjay Madhav
+Robert McNamara
+Vlad-Ceru Opran
+Peter Piwowarski
+Brian Rogers
+Horatiu Romosan
 Nicolas Simonds
+Peter van Valderen
+Alexander Waseleski
  
+
 #(Music remixers caption)
-13 C
-MUSIC REMIXERS
-(in alphabetical order)
+17 C MUSIC REMIXERS
 
 #(Music remixers)
 13 C
@@ -64,8 +76,10 @@ Jouni Airaksinen
 András Barják
 Matt Bentley
 Tore Aune Fjellstad
+Travis Chase
 Espen Gätzschmann
 Aaron J. Grier
+Harri Hakala
 A. Keren
 Casey Monroe
 Dan Nicholson
@@ -74,64 +88,64 @@ Riku Nuottajärvi
 Erol Otus
 Greg Szymanski
  
-#(Other contrib caption)
+
+#(Additional Artwork caption)
+17 C ADDITIONAL ARTWORK
+
+#(AW crew)
 13 C
-OTHER CONTRIBUTIONS
-(in alphabetical order)
+Jouni Airaksinen
+Erol Otus
+Zarla Sheenaza
+Joffrey Smith
+Yukki
+ 
+
+#(Other contrib caption)
+17 C OTHER CONTRIBUTIONS
 
 #(Other contrib crew)
 13 C
-Jouni Airaksinen
-(Startup Menu)
- 
-Karl Bartel
- 
-Travis Chase
-(BeOS port)
- 
+Anthony J. Bentley
+(Text Editing)
+
 Felix Lazarev
 (3DO internals)
- 
-Parker MacMillan
- 
-Sanjay Madhav
-(code patches)
- 
-Robert McNamara
-(MacOS X stuff)
- 
+
 Mike Melanson
 (ADPCM basis from MPlayer
   used for DUK audio)
  
-Mudrony Laszlo
-(PC/DOS content unpacking)
- 
-Erol Otus
-(Splash screen)
- 
-Brian Rogers
- 
-Horatiu Romosan
-(v0.1 Win32 installer)
- 
-Zarla Sheenaza
-(0.6 Win32 installer graphics)
- 
-Joffrey Smith
-(setup graphics)
- 
-Peter van Valderen
- 
 Alex Volkov
 (additional slides)
  
-Alexander Waseleski
-(code patches)
  
-Yukki
-(v0.1 Win32 installer graphics)
+#(Third Party Libraries)
+17 C EXTERNAL LIBRARIES
+
+#(Third Party Details)
+13 C
+Simple Directmedia Layer (SDL)
+Sam Lantinga et al.
+https://www.libsdl.org/
+
+libpng
+Guy Schalnat, Andreas Dilger, et al.
+https://libpng.org/pub/png/libpng.html
+
+Ogg Vorbis
+Xiph.Org Foundation
+https://xiph.org/
+
+Mikmod Sound System
+Jean-Paul Mikkers et al.
+http://mikmod.sourceforge.net
+
+zlib
+Jean-loup Gailly and Mark Adler
+https://www.zlib.net
  
+
 #(Original Game caption)
 13 C
 Original Game
diff --git a/sc2/content/base/cutscene/intro/intro.txt b/sc2/content/base/cutscene/intro/intro.txt
index b3513ceba..e045aca00 100644
--- a/sc2/content/base/cutscene/intro/intro.txt
+++ b/sc2/content/base/cutscene/intro/intro.txt
@@ -73,7 +73,7 @@ FTC 3000
 SYNC 5000
 #(Text fade-in)
 TFI Based on the source code of STAR CONTROL II
-(STAR CONTROL is a trademark of Stardock)
+(All trademarks belong to their respective owners)
 #(Synchronize)
 SYNC 8000
 #(Text fade-out)
diff --git a/sc2/content/version b/sc2/content/version
index d75b5b1d8..7faf7029d 100644
--- a/sc2/content/version
+++ b/sc2/content/version
@@ -1,3 +1,3 @@
-0.7.0
+0.8.0
 
 $Format:%ad$