diff --git a/build-devkit.sh b/build-devkit.sh
index a723509..64827e1 100755
--- a/build-devkit.sh
+++ b/build-devkit.sh
@@ -23,32 +23,42 @@ echo "Patches and improvements are of course welcome, please send these to the p
 echo "https://sourceforge.net/tracker/?group_id=114505&atid=668553"
 echo
 
-LIBOGC_VER=1.8.15
+GENERAL_TOOLS_VER=1.0.0
+
 LIBGBA_VER=20150106
+GBATOOLS_VER=1.0.0
+
 LIBNDS_VER=1.5.12
-LIBCTRU_VER=0.6.0
 DEFAULT_ARM7_VER=0.6.0
 DSWIFI_VER=0.3.17
-LIBMIRKO_VER=0.9.7
 MAXMOD_VER=1.0.9
 FILESYSTEM_VER=0.9.12
 LIBFAT_VER=1.0.14
-PSPSDK_VER=20120404
-GBATOOLS_VER=1.0.0
 DSTOOLS_VER=1.0.2
-GP32_TOOLS_VER=1.0.1
 GRIT_VER=0.8.13
 NDSTOOL_VER=1.50.3
-GENERAL_TOOLS_VER=1.0.0
 DLDITOOL_VER=1.24.0
-GAMECUBE_TOOLS_VER=1.0.1
-WIILOAD_VER=0.5.1
 MMUTIL_VER=1.8.6
-DFU_UTIL_VER=0.8.1
+
+DFU_UTIL_VER=0.9.1
 STLINK_VER=0.5.8
-TOOLS3DS_VER=1.1.1
+
+
+GAMECUBE_TOOLS_VER=1.0.0
+LIBOGC_VER=1.8.15
+WIILOAD_VER=0.5.1
+
+LIBCTRU_VER=1.1.0
+CITRO3D_VER=1.1.0
+TOOLS3DS_VER=1.1.4
 LINK3DS_VER=0.5.1
-PICASSO_VER=2.1.0
+PICASSO_VER=2.5.0
+
+GP32_TOOLS_VER=1.0.1
+LIBMIRKO_VER=0.9.7
+
+PSPSDK_VER=20120404
+
 
 #---------------------------------------------------------------------------------
 function extract_and_patch {