diff --git a/lsteamclient/cb_getapi_sizes.dat b/lsteamclient/cb_getapi_sizes.dat
index 9c37500e..fea8e2e7 100644
--- a/lsteamclient/cb_getapi_sizes.dat
+++ b/lsteamclient/cb_getapi_sizes.dat
@@ -1,112 +1,118 @@
 #ifdef __i386__
-case 513: /* LobbyCreated_t_16 */
-    return 12;
-case 4524: /* HTML_ShowToolTip_t_8 */
-    return 8;
-case 3415: /* RemoveAppDependencyResult_t_24 */
-    return 16;
-case 4514: /* HTML_JSAlert_t_8 */
-    return 8;
-case 3416: /* GetAppDependenciesResult_t_152 */
-    return 148;
-case 4502: /* HTML_NeedsPaint_t_48 */
-    return 48;
-case 1303: /* RemoteStorageAppSyncProgress_t_288 */
-    return 280;
 case 152: /* MicroTxnAuthorizationResponse_t_24 */
     return 16;
+case 209: /* GSReputation_t_40 */
+    return 32;
+case 513: /* LobbyCreated_t_16 */
+    return 12;
+case 1023: /* FileDetailsResult_t_40 */
+    return 36;
+case 1106: /* LeaderboardScoreUploaded_t_32 */
+    return 28;
+case 1111: /* LeaderboardUGCSet_t_16 */
+    return 12;
+case 1112: /* PS3TrophiesInstalled_t_24 */
+    return 20;
+case 1221: /* SteamNetConnectionStatusChangedCallback_t_712 */
+    return 704;
+case 1303: /* RemoteStorageAppSyncProgress_t_288 */
+    return 280;
+case 1307: /* RemoteStorageFileShareResult_t_280 */
+    return 272;
+case 1308: /* RemoteStorageDownloadUGCResult_t_40 */
+    return 32;
+case 1309: /* RemoteStoragePublishFileResult_t_24 */
+    return 16;
+case 1310: /* RemoteStorageGetPublishedFileDetailsResult_t_1744 */
+    return 1732;
+case 1311: /* RemoteStorageDeletePublishedFileResult_t_16 */
+    return 12;
+case 1312: /* RemoteStorageEnumerateUserPublishedFilesResult_t_416 */
+    return 412;
+case 1313: /* RemoteStorageSubscribePublishedFileResult_t_16 */
+    return 12;
+case 1314: /* RemoteStorageEnumerateUserSubscribedFilesResult_t_616 */
+    return 612;
+case 1315: /* RemoteStorageUnsubscribePublishedFileResult_t_16 */
+    return 12;
+case 1316: /* RemoteStorageUpdatePublishedFileResult_t_24 */
+    return 16;
+case 1317: /* RemoteStorageDownloadUGCResult_t_296 */
+    return 288;
+case 1318: /* RemoteStorageGetPublishedFileDetailsResult_t_9760 */
+    return 9748;
+case 1319: /* RemoteStorageEnumerateWorkshopFilesResult_t_624 */
+    return 620;
+case 1320: /* RemoteStorageGetPublishedItemVoteDetailsResult_t_32 */
+    return 28;
+case 1324: /* RemoteStorageUpdateUserPublishedItemVoteResult_t_16 */
+    return 12;
+case 1325: /* RemoteStorageUserVoteDetails_t_24 */
+    return 16;
+case 1326: /* RemoteStorageEnumerateUserSharedWorkshopFilesResult_t_416 */
+    return 412;
+case 1327: /* RemoteStorageSetUserPublishedFileActionResult_t_24 */
+    return 16;
+case 1330: /* RemoteStoragePublishedFileUpdated_t_24 */
+    return 20;
+case 2101: /* HTTPRequestCompleted_t_32 */
+    return 24;
+case 2102: /* HTTPRequestHeadersReceived_t_16 */
+    return 12;
+case 2103: /* HTTPRequestDataReceived_t_24 */
+    return 20;
+case 3402: /* SteamUGCRequestUGCDetailsResult_t_9784 */
+    return 9768;
+case 3403: /* CreateItemResult_t_24 */
+    return 16;
+case 3405: /* ItemInstalled_t_16 */
+    return 12;
+case 3406: /* DownloadItemResult_t_24 */
+    return 16;
+case 3412: /* AddUGCDependencyResult_t_24 */
+    return 20;
+case 3413: /* RemoveUGCDependencyResult_t_24 */
+    return 20;
+case 3414: /* AddAppDependencyResult_t_24 */
+    return 16;
+case 3415: /* RemoveAppDependencyResult_t_24 */
+    return 16;
+case 3416: /* GetAppDependenciesResult_t_152 */
+    return 148;
+case 3417: /* DeleteItemResult_t_16 */
+    return 12;
+case 4502: /* HTML_NeedsPaint_t_48 */
+    return 48;
+case 4503: /* HTML_StartRequest_t_20 */
+    return 20;
 case 4505: /* HTML_URLChanged_t_24 */
     return 24;
 case 4506: /* HTML_FinishedRequest_t_12 */
     return 12;
-case 1307: /* RemoteStorageFileShareResult_t_280 */
-    return 272;
+case 4507: /* HTML_OpenLinkInNewTab_t_8 */
+    return 8;
 case 4508: /* HTML_ChangedTitle_t_8 */
     return 8;
-case 1309: /* RemoteStoragePublishFileResult_t_24 */
+case 4513: /* HTML_LinkAtPosition_t_20 */
+    return 20;
+case 4514: /* HTML_JSAlert_t_8 */
+    return 8;
+case 4515: /* HTML_JSConfirm_t_8 */
+    return 8;
+case 4516: /* HTML_FileOpenDialog_t_12 */
+    return 12;
+case 4517: /* HTML_ComboNeedsPaint_t_16 */
     return 16;
-case 1310: /* RemoteStorageGetPublishedFileDetailsResult_t_1744 */
-    return 1732;
-case 1311: /* RemoteStorageDeletePublishedFileResult_t_16 */
-    return 12;
-case 1312: /* RemoteStorageEnumerateUserPublishedFilesResult_t_416 */
-    return 412;
-case 1313: /* RemoteStorageSubscribePublishedFileResult_t_16 */
-    return 12;
-case 1314: /* RemoteStorageEnumerateUserSubscribedFilesResult_t_616 */
-    return 612;
-case 1315: /* RemoteStorageUnsubscribePublishedFileResult_t_16 */
-    return 12;
-case 1316: /* RemoteStorageUpdatePublishedFileResult_t_24 */
-    return 16;
-case 1317: /* RemoteStorageDownloadUGCResult_t_296 */
-    return 288;
-case 1318: /* RemoteStorageGetPublishedFileDetailsResult_t_9760 */
-    return 9748;
-case 1319: /* RemoteStorageEnumerateWorkshopFilesResult_t_624 */
-    return 620;
-case 1320: /* RemoteStorageGetPublishedItemVoteDetailsResult_t_32 */
-    return 28;
 case 4521: /* HTML_NewWindow_t_28 */
     return 28;
 case 4523: /* HTML_StatusText_t_8 */
     return 8;
-case 1324: /* RemoteStorageUpdateUserPublishedItemVoteResult_t_16 */
-    return 12;
-case 1325: /* RemoteStorageUserVoteDetails_t_24 */
-    return 16;
-case 1326: /* RemoteStorageEnumerateUserSharedWorkshopFilesResult_t_416 */
-    return 412;
-case 1327: /* RemoteStorageSetUserPublishedFileActionResult_t_24 */
-    return 16;
-case 1330: /* RemoteStoragePublishedFileUpdated_t_24 */
-    return 20;
-case 5301: /* JoinPartyCallback_t_280 */
-    return 276;
-case 5302: /* CreateBeaconCallback_t_16 */
-    return 12;
-case 2103: /* HTTPRequestDataReceived_t_24 */
-    return 20;
-case 4507: /* HTML_OpenLinkInNewTab_t_8 */
+case 4524: /* HTML_ShowToolTip_t_8 */
     return 8;
-case 2101: /* HTTPRequestCompleted_t_32 */
-    return 24;
 case 4525: /* HTML_UpdateToolTip_t_8 */
     return 8;
-case 4503: /* HTML_StartRequest_t_20 */
+case 4704: /* SteamInventoryStartPurchaseResult_t_24 */
     return 20;
-case 2102: /* HTTPRequestHeadersReceived_t_16 */
-    return 12;
-case 4513: /* HTML_LinkAtPosition_t_20 */
-    return 20;
-case 3402: /* SteamUGCRequestUGCDetailsResult_t_9784 */
-    return 9768;
-case 3403: /* CreateItemResult_t_24 */
-    return 16;
-case 1221: /* SteamNetConnectionStatusChangedCallback_t_712 */
-    return 704;
-case 3405: /* ItemInstalled_t_16 */
-    return 12;
-case 3406: /* DownloadItemResult_t_24 */
-    return 16;
-case 209: /* GSReputation_t_40 */
-    return 32;
-case 1106: /* LeaderboardScoreUploaded_t_32 */
-    return 28;
-case 4515: /* HTML_JSConfirm_t_8 */
-    return 8;
-case 3412: /* AddUGCDependencyResult_t_24 */
-    return 20;
-case 3413: /* RemoveUGCDependencyResult_t_24 */
-    return 20;
-case 3414: /* AddAppDependencyResult_t_24 */
-    return 16;
-case 1111: /* LeaderboardUGCSet_t_16 */
-    return 12;
-case 1112: /* PS3TrophiesInstalled_t_24 */
-    return 20;
-case 3417: /* DeleteItemResult_t_16 */
-    return 12;
 case 5211: /* RequestPlayersForGameProgressCallback_t_16 */
     return 12;
 case 5212: /* RequestPlayersForGameResultCallback_t_64 */
@@ -117,42 +123,34 @@ case 5214: /* SubmitPlayerResultResultCallback_t_24 */
     return 20;
 case 5215: /* EndGameResultCallback_t_16 */
     return 12;
-case 4704: /* SteamInventoryStartPurchaseResult_t_24 */
-    return 20;
-case 4517: /* HTML_ComboNeedsPaint_t_16 */
+case 5301: /* JoinPartyCallback_t_280 */
+    return 276;
+case 5302: /* CreateBeaconCallback_t_16 */
+    return 12;
+#endif
+#ifdef __x86_64__
+case 152: /* MicroTxnAuthorizationResponse_t_24 */
     return 16;
-case 1308: /* RemoteStorageDownloadUGCResult_t_40 */
+case 209: /* GSReputation_t_40 */
     return 32;
-case 4516: /* HTML_FileOpenDialog_t_12 */
+case 513: /* LobbyCreated_t_16 */
     return 12;
 case 1023: /* FileDetailsResult_t_40 */
     return 36;
-#endif
-#ifdef __x86_64__
-case 513: /* LobbyCreated_t_16 */
+case 1106: /* LeaderboardScoreUploaded_t_32 */
+    return 28;
+case 1111: /* LeaderboardUGCSet_t_16 */
     return 12;
-case 4524: /* HTML_ShowToolTip_t_16 */
-    return 12;
-case 3415: /* RemoveAppDependencyResult_t_24 */
-    return 16;
-case 4514: /* HTML_JSAlert_t_16 */
-    return 12;
-case 3416: /* GetAppDependenciesResult_t_152 */
-    return 148;
-case 4502: /* HTML_NeedsPaint_t_56 */
-    return 52;
+case 1112: /* PS3TrophiesInstalled_t_24 */
+    return 20;
+case 1221: /* SteamNetConnectionStatusChangedCallback_t_712 */
+    return 704;
 case 1303: /* RemoteStorageAppSyncProgress_t_288 */
     return 280;
-case 152: /* MicroTxnAuthorizationResponse_t_24 */
-    return 16;
-case 4505: /* HTML_URLChanged_t_48 */
-    return 36;
-case 4506: /* HTML_FinishedRequest_t_24 */
-    return 20;
 case 1307: /* RemoteStorageFileShareResult_t_280 */
     return 272;
-case 4508: /* HTML_ChangedTitle_t_16 */
-    return 12;
+case 1308: /* RemoteStorageDownloadUGCResult_t_40 */
+    return 32;
 case 1309: /* RemoteStoragePublishFileResult_t_24 */
     return 16;
 case 1310: /* RemoteStorageGetPublishedFileDetailsResult_t_1744 */
@@ -177,10 +175,6 @@ case 1319: /* RemoteStorageEnumerateWorkshopFilesResult_t_624 */
     return 620;
 case 1320: /* RemoteStorageGetPublishedItemVoteDetailsResult_t_32 */
     return 28;
-case 4521: /* HTML_NewWindow_t_40 */
-    return 32;
-case 4523: /* HTML_StatusText_t_16 */
-    return 12;
 case 1324: /* RemoteStorageUpdateUserPublishedItemVoteResult_t_16 */
     return 12;
 case 1325: /* RemoteStorageUserVoteDetails_t_24 */
@@ -191,52 +185,64 @@ case 1327: /* RemoteStorageSetUserPublishedFileActionResult_t_24 */
     return 16;
 case 1330: /* RemoteStoragePublishedFileUpdated_t_24 */
     return 20;
-case 5301: /* JoinPartyCallback_t_280 */
-    return 276;
-case 5302: /* CreateBeaconCallback_t_16 */
+case 2101: /* HTTPRequestCompleted_t_32 */
+    return 24;
+case 2102: /* HTTPRequestHeadersReceived_t_16 */
     return 12;
 case 2103: /* HTTPRequestDataReceived_t_24 */
     return 20;
-case 4507: /* HTML_OpenLinkInNewTab_t_16 */
-    return 12;
-case 2101: /* HTTPRequestCompleted_t_32 */
-    return 24;
-case 4525: /* HTML_UpdateToolTip_t_16 */
-    return 12;
-case 4503: /* HTML_StartRequest_t_40 */
-    return 32;
-case 2102: /* HTTPRequestHeadersReceived_t_16 */
-    return 12;
-case 4513: /* HTML_LinkAtPosition_t_32 */
-    return 24;
 case 3402: /* SteamUGCRequestUGCDetailsResult_t_9784 */
     return 9768;
 case 3403: /* CreateItemResult_t_24 */
     return 16;
-case 1221: /* SteamNetConnectionStatusChangedCallback_t_712 */
-    return 704;
 case 3405: /* ItemInstalled_t_16 */
     return 12;
 case 3406: /* DownloadItemResult_t_24 */
     return 16;
-case 209: /* GSReputation_t_40 */
-    return 32;
-case 1106: /* LeaderboardScoreUploaded_t_32 */
-    return 28;
-case 4515: /* HTML_JSConfirm_t_16 */
-    return 12;
 case 3412: /* AddUGCDependencyResult_t_24 */
     return 20;
 case 3413: /* RemoveUGCDependencyResult_t_24 */
     return 20;
 case 3414: /* AddAppDependencyResult_t_24 */
     return 16;
-case 1111: /* LeaderboardUGCSet_t_16 */
-    return 12;
-case 1112: /* PS3TrophiesInstalled_t_24 */
-    return 20;
+case 3415: /* RemoveAppDependencyResult_t_24 */
+    return 16;
+case 3416: /* GetAppDependenciesResult_t_152 */
+    return 148;
 case 3417: /* DeleteItemResult_t_16 */
     return 12;
+case 4502: /* HTML_NeedsPaint_t_56 */
+    return 52;
+case 4503: /* HTML_StartRequest_t_40 */
+    return 32;
+case 4505: /* HTML_URLChanged_t_48 */
+    return 36;
+case 4506: /* HTML_FinishedRequest_t_24 */
+    return 20;
+case 4507: /* HTML_OpenLinkInNewTab_t_16 */
+    return 12;
+case 4508: /* HTML_ChangedTitle_t_16 */
+    return 12;
+case 4513: /* HTML_LinkAtPosition_t_32 */
+    return 24;
+case 4514: /* HTML_JSAlert_t_16 */
+    return 12;
+case 4515: /* HTML_JSConfirm_t_16 */
+    return 12;
+case 4516: /* HTML_FileOpenDialog_t_24 */
+    return 20;
+case 4517: /* HTML_ComboNeedsPaint_t_24 */
+    return 20;
+case 4521: /* HTML_NewWindow_t_40 */
+    return 32;
+case 4523: /* HTML_StatusText_t_16 */
+    return 12;
+case 4524: /* HTML_ShowToolTip_t_16 */
+    return 12;
+case 4525: /* HTML_UpdateToolTip_t_16 */
+    return 12;
+case 4704: /* SteamInventoryStartPurchaseResult_t_24 */
+    return 20;
 case 5211: /* RequestPlayersForGameProgressCallback_t_16 */
     return 12;
 case 5212: /* RequestPlayersForGameResultCallback_t_64 */
@@ -247,14 +253,8 @@ case 5214: /* SubmitPlayerResultResultCallback_t_24 */
     return 20;
 case 5215: /* EndGameResultCallback_t_16 */
     return 12;
-case 4704: /* SteamInventoryStartPurchaseResult_t_24 */
-    return 20;
-case 4517: /* HTML_ComboNeedsPaint_t_24 */
-    return 20;
-case 1308: /* RemoteStorageDownloadUGCResult_t_40 */
-    return 32;
-case 4516: /* HTML_FileOpenDialog_t_24 */
-    return 20;
-case 1023: /* FileDetailsResult_t_40 */
-    return 36;
+case 5301: /* JoinPartyCallback_t_280 */
+    return 276;
+case 5302: /* CreateBeaconCallback_t_16 */
+    return 12;
 #endif
diff --git a/lsteamclient/cb_getapi_table.dat b/lsteamclient/cb_getapi_table.dat
index b9b27f1f..21fb89d2 100644
--- a/lsteamclient/cb_getapi_table.dat
+++ b/lsteamclient/cb_getapi_table.dat
@@ -1,62 +1,56 @@
 #ifdef __i386__
-case 513:
-    switch(callback_len){
-    default:
-    case 16: cb_LobbyCreated_t_16(lin_callback, callback); break;
-    }
-    break;
-case 4524:
-    switch(callback_len){
-    default:
-    case 8: cb_HTML_ShowToolTip_t_8(lin_callback, callback); break;
-    }
-    break;
-case 3415:
-    switch(callback_len){
-    default:
-    case 24: cb_RemoveAppDependencyResult_t_24(lin_callback, callback); break;
-    }
-    break;
-case 4514:
-    switch(callback_len){
-    default:
-    case 8: cb_HTML_JSAlert_t_8(lin_callback, callback); break;
-    }
-    break;
-case 3416:
-    switch(callback_len){
-    default:
-    case 152: cb_GetAppDependenciesResult_t_152(lin_callback, callback); break;
-    }
-    break;
-case 4502:
-    switch(callback_len){
-    default:
-    case 48: cb_HTML_NeedsPaint_t_48(lin_callback, callback); break;
-    }
-    break;
-case 1303:
-    switch(callback_len){
-    default:
-    case 288: cb_RemoteStorageAppSyncProgress_t_288(lin_callback, callback); break;
-    }
-    break;
 case 152:
     switch(callback_len){
     default:
     case 24: cb_MicroTxnAuthorizationResponse_t_24(lin_callback, callback); break;
     }
     break;
-case 4505:
+case 209:
     switch(callback_len){
     default:
-    case 24: cb_HTML_URLChanged_t_24(lin_callback, callback); break;
+    case 40: cb_GSReputation_t_40(lin_callback, callback); break;
     }
     break;
-case 4506:
+case 513:
     switch(callback_len){
     default:
-    case 12: cb_HTML_FinishedRequest_t_12(lin_callback, callback); break;
+    case 16: cb_LobbyCreated_t_16(lin_callback, callback); break;
+    }
+    break;
+case 1023:
+    switch(callback_len){
+    default:
+    case 40: cb_FileDetailsResult_t_40(lin_callback, callback); break;
+    }
+    break;
+case 1106:
+    switch(callback_len){
+    default:
+    case 32: cb_LeaderboardScoreUploaded_t_32(lin_callback, callback); break;
+    }
+    break;
+case 1111:
+    switch(callback_len){
+    default:
+    case 16: cb_LeaderboardUGCSet_t_16(lin_callback, callback); break;
+    }
+    break;
+case 1112:
+    switch(callback_len){
+    default:
+    case 24: cb_PS3TrophiesInstalled_t_24(lin_callback, callback); break;
+    }
+    break;
+case 1221:
+    switch(callback_len){
+    default:
+    case 712: cb_SteamNetConnectionStatusChangedCallback_t_712(lin_callback, callback); break;
+    }
+    break;
+case 1303:
+    switch(callback_len){
+    default:
+    case 288: cb_RemoteStorageAppSyncProgress_t_288(lin_callback, callback); break;
     }
     break;
 case 1307:
@@ -66,10 +60,10 @@ case 1307:
     case 16: cb_RemoteStorageFileShareResult_t_16(lin_callback, callback); break;
     }
     break;
-case 4508:
+case 1308:
     switch(callback_len){
     default:
-    case 8: cb_HTML_ChangedTitle_t_8(lin_callback, callback); break;
+    case 40: cb_RemoteStorageDownloadUGCResult_t_40(lin_callback, callback); break;
     }
     break;
 case 1309:
@@ -149,6 +143,183 @@ case 1320:
     case 32: cb_RemoteStorageGetPublishedItemVoteDetailsResult_t_32(lin_callback, callback); break;
     }
     break;
+case 1324:
+    switch(callback_len){
+    default:
+    case 16: cb_RemoteStorageUpdateUserPublishedItemVoteResult_t_16(lin_callback, callback); break;
+    }
+    break;
+case 1325:
+    switch(callback_len){
+    default:
+    case 24: cb_RemoteStorageUserVoteDetails_t_24(lin_callback, callback); break;
+    }
+    break;
+case 1326:
+    switch(callback_len){
+    default:
+    case 416: cb_RemoteStorageEnumerateUserSharedWorkshopFilesResult_t_416(lin_callback, callback); break;
+    }
+    break;
+case 1327:
+    switch(callback_len){
+    default:
+    case 24: cb_RemoteStorageSetUserPublishedFileActionResult_t_24(lin_callback, callback); break;
+    }
+    break;
+case 1330:
+    switch(callback_len){
+    default:
+    case 24: cb_RemoteStoragePublishedFileUpdated_t_24(lin_callback, callback); break;
+    }
+    break;
+case 2101:
+    switch(callback_len){
+    default:
+    case 32: cb_HTTPRequestCompleted_t_32(lin_callback, callback); break;
+    case 24: cb_HTTPRequestCompleted_t_24(lin_callback, callback); break;
+    }
+    break;
+case 2102:
+    switch(callback_len){
+    default:
+    case 16: cb_HTTPRequestHeadersReceived_t_16(lin_callback, callback); break;
+    }
+    break;
+case 2103:
+    switch(callback_len){
+    default:
+    case 24: cb_HTTPRequestDataReceived_t_24(lin_callback, callback); break;
+    }
+    break;
+case 3402:
+    switch(callback_len){
+    default:
+    case 9784: cb_SteamUGCRequestUGCDetailsResult_t_9784(lin_callback, callback); break;
+    case 9776: cb_SteamUGCRequestUGCDetailsResult_t_9776(lin_callback, callback); break;
+    case 9768: cb_SteamUGCRequestUGCDetailsResult_t_9768(lin_callback, callback); break;
+    }
+    break;
+case 3403:
+    switch(callback_len){
+    default:
+    case 24: cb_CreateItemResult_t_24(lin_callback, callback); break;
+    }
+    break;
+case 3405:
+    switch(callback_len){
+    default:
+    case 16: cb_ItemInstalled_t_16(lin_callback, callback); break;
+    }
+    break;
+case 3406:
+    switch(callback_len){
+    default:
+    case 24: cb_DownloadItemResult_t_24(lin_callback, callback); break;
+    }
+    break;
+case 3412:
+    switch(callback_len){
+    default:
+    case 24: cb_AddUGCDependencyResult_t_24(lin_callback, callback); break;
+    }
+    break;
+case 3413:
+    switch(callback_len){
+    default:
+    case 24: cb_RemoveUGCDependencyResult_t_24(lin_callback, callback); break;
+    }
+    break;
+case 3414:
+    switch(callback_len){
+    default:
+    case 24: cb_AddAppDependencyResult_t_24(lin_callback, callback); break;
+    }
+    break;
+case 3415:
+    switch(callback_len){
+    default:
+    case 24: cb_RemoveAppDependencyResult_t_24(lin_callback, callback); break;
+    }
+    break;
+case 3416:
+    switch(callback_len){
+    default:
+    case 152: cb_GetAppDependenciesResult_t_152(lin_callback, callback); break;
+    }
+    break;
+case 3417:
+    switch(callback_len){
+    default:
+    case 16: cb_DeleteItemResult_t_16(lin_callback, callback); break;
+    }
+    break;
+case 4502:
+    switch(callback_len){
+    default:
+    case 48: cb_HTML_NeedsPaint_t_48(lin_callback, callback); break;
+    }
+    break;
+case 4503:
+    switch(callback_len){
+    default:
+    case 20: cb_HTML_StartRequest_t_20(lin_callback, callback); break;
+    }
+    break;
+case 4505:
+    switch(callback_len){
+    default:
+    case 24: cb_HTML_URLChanged_t_24(lin_callback, callback); break;
+    }
+    break;
+case 4506:
+    switch(callback_len){
+    default:
+    case 12: cb_HTML_FinishedRequest_t_12(lin_callback, callback); break;
+    }
+    break;
+case 4507:
+    switch(callback_len){
+    default:
+    case 8: cb_HTML_OpenLinkInNewTab_t_8(lin_callback, callback); break;
+    }
+    break;
+case 4508:
+    switch(callback_len){
+    default:
+    case 8: cb_HTML_ChangedTitle_t_8(lin_callback, callback); break;
+    }
+    break;
+case 4513:
+    switch(callback_len){
+    default:
+    case 20: cb_HTML_LinkAtPosition_t_20(lin_callback, callback); break;
+    }
+    break;
+case 4514:
+    switch(callback_len){
+    default:
+    case 8: cb_HTML_JSAlert_t_8(lin_callback, callback); break;
+    }
+    break;
+case 4515:
+    switch(callback_len){
+    default:
+    case 8: cb_HTML_JSConfirm_t_8(lin_callback, callback); break;
+    }
+    break;
+case 4516:
+    switch(callback_len){
+    default:
+    case 12: cb_HTML_FileOpenDialog_t_12(lin_callback, callback); break;
+    }
+    break;
+case 4517:
+    switch(callback_len){
+    default:
+    case 16: cb_HTML_ComboNeedsPaint_t_16(lin_callback, callback); break;
+    }
+    break;
 case 4521:
     switch(callback_len){
     default:
@@ -162,65 +333,10 @@ case 4523:
     case 8: cb_HTML_StatusText_t_8(lin_callback, callback); break;
     }
     break;
-case 1324:
+case 4524:
     switch(callback_len){
     default:
-    case 16: cb_RemoteStorageUpdateUserPublishedItemVoteResult_t_16(lin_callback, callback); break;
-    }
-    break;
-case 1325:
-    switch(callback_len){
-    default:
-    case 24: cb_RemoteStorageUserVoteDetails_t_24(lin_callback, callback); break;
-    }
-    break;
-case 1326:
-    switch(callback_len){
-    default:
-    case 416: cb_RemoteStorageEnumerateUserSharedWorkshopFilesResult_t_416(lin_callback, callback); break;
-    }
-    break;
-case 1327:
-    switch(callback_len){
-    default:
-    case 24: cb_RemoteStorageSetUserPublishedFileActionResult_t_24(lin_callback, callback); break;
-    }
-    break;
-case 1330:
-    switch(callback_len){
-    default:
-    case 24: cb_RemoteStoragePublishedFileUpdated_t_24(lin_callback, callback); break;
-    }
-    break;
-case 5301:
-    switch(callback_len){
-    default:
-    case 280: cb_JoinPartyCallback_t_280(lin_callback, callback); break;
-    }
-    break;
-case 5302:
-    switch(callback_len){
-    default:
-    case 16: cb_CreateBeaconCallback_t_16(lin_callback, callback); break;
-    }
-    break;
-case 2103:
-    switch(callback_len){
-    default:
-    case 24: cb_HTTPRequestDataReceived_t_24(lin_callback, callback); break;
-    }
-    break;
-case 4507:
-    switch(callback_len){
-    default:
-    case 8: cb_HTML_OpenLinkInNewTab_t_8(lin_callback, callback); break;
-    }
-    break;
-case 2101:
-    switch(callback_len){
-    default:
-    case 32: cb_HTTPRequestCompleted_t_32(lin_callback, callback); break;
-    case 24: cb_HTTPRequestCompleted_t_24(lin_callback, callback); break;
+    case 8: cb_HTML_ShowToolTip_t_8(lin_callback, callback); break;
     }
     break;
 case 4525:
@@ -229,108 +345,10 @@ case 4525:
     case 8: cb_HTML_UpdateToolTip_t_8(lin_callback, callback); break;
     }
     break;
-case 4503:
+case 4704:
     switch(callback_len){
     default:
-    case 20: cb_HTML_StartRequest_t_20(lin_callback, callback); break;
-    }
-    break;
-case 2102:
-    switch(callback_len){
-    default:
-    case 16: cb_HTTPRequestHeadersReceived_t_16(lin_callback, callback); break;
-    }
-    break;
-case 4513:
-    switch(callback_len){
-    default:
-    case 20: cb_HTML_LinkAtPosition_t_20(lin_callback, callback); break;
-    }
-    break;
-case 3402:
-    switch(callback_len){
-    default:
-    case 9784: cb_SteamUGCRequestUGCDetailsResult_t_9784(lin_callback, callback); break;
-    case 9776: cb_SteamUGCRequestUGCDetailsResult_t_9776(lin_callback, callback); break;
-    case 9768: cb_SteamUGCRequestUGCDetailsResult_t_9768(lin_callback, callback); break;
-    }
-    break;
-case 3403:
-    switch(callback_len){
-    default:
-    case 24: cb_CreateItemResult_t_24(lin_callback, callback); break;
-    }
-    break;
-case 1221:
-    switch(callback_len){
-    default:
-    case 712: cb_SteamNetConnectionStatusChangedCallback_t_712(lin_callback, callback); break;
-    }
-    break;
-case 3405:
-    switch(callback_len){
-    default:
-    case 16: cb_ItemInstalled_t_16(lin_callback, callback); break;
-    }
-    break;
-case 3406:
-    switch(callback_len){
-    default:
-    case 24: cb_DownloadItemResult_t_24(lin_callback, callback); break;
-    }
-    break;
-case 209:
-    switch(callback_len){
-    default:
-    case 40: cb_GSReputation_t_40(lin_callback, callback); break;
-    }
-    break;
-case 1106:
-    switch(callback_len){
-    default:
-    case 32: cb_LeaderboardScoreUploaded_t_32(lin_callback, callback); break;
-    }
-    break;
-case 4515:
-    switch(callback_len){
-    default:
-    case 8: cb_HTML_JSConfirm_t_8(lin_callback, callback); break;
-    }
-    break;
-case 3412:
-    switch(callback_len){
-    default:
-    case 24: cb_AddUGCDependencyResult_t_24(lin_callback, callback); break;
-    }
-    break;
-case 3413:
-    switch(callback_len){
-    default:
-    case 24: cb_RemoveUGCDependencyResult_t_24(lin_callback, callback); break;
-    }
-    break;
-case 3414:
-    switch(callback_len){
-    default:
-    case 24: cb_AddAppDependencyResult_t_24(lin_callback, callback); break;
-    }
-    break;
-case 1111:
-    switch(callback_len){
-    default:
-    case 16: cb_LeaderboardUGCSet_t_16(lin_callback, callback); break;
-    }
-    break;
-case 1112:
-    switch(callback_len){
-    default:
-    case 24: cb_PS3TrophiesInstalled_t_24(lin_callback, callback); break;
-    }
-    break;
-case 3417:
-    switch(callback_len){
-    default:
-    case 16: cb_DeleteItemResult_t_16(lin_callback, callback); break;
+    case 24: cb_SteamInventoryStartPurchaseResult_t_24(lin_callback, callback); break;
     }
     break;
 case 5211:
@@ -363,28 +381,36 @@ case 5215:
     case 16: cb_EndGameResultCallback_t_16(lin_callback, callback); break;
     }
     break;
-case 4704:
+case 5301:
     switch(callback_len){
     default:
-    case 24: cb_SteamInventoryStartPurchaseResult_t_24(lin_callback, callback); break;
+    case 280: cb_JoinPartyCallback_t_280(lin_callback, callback); break;
     }
     break;
-case 4517:
+case 5302:
     switch(callback_len){
     default:
-    case 16: cb_HTML_ComboNeedsPaint_t_16(lin_callback, callback); break;
+    case 16: cb_CreateBeaconCallback_t_16(lin_callback, callback); break;
     }
     break;
-case 1308:
+#endif
+#ifdef __x86_64__
+case 152:
     switch(callback_len){
     default:
-    case 40: cb_RemoteStorageDownloadUGCResult_t_40(lin_callback, callback); break;
+    case 24: cb_MicroTxnAuthorizationResponse_t_24(lin_callback, callback); break;
     }
     break;
-case 4516:
+case 209:
     switch(callback_len){
     default:
-    case 12: cb_HTML_FileOpenDialog_t_12(lin_callback, callback); break;
+    case 40: cb_GSReputation_t_40(lin_callback, callback); break;
+    }
+    break;
+case 513:
+    switch(callback_len){
+    default:
+    case 16: cb_LobbyCreated_t_16(lin_callback, callback); break;
     }
     break;
 case 1023:
@@ -393,42 +419,28 @@ case 1023:
     case 40: cb_FileDetailsResult_t_40(lin_callback, callback); break;
     }
     break;
-#endif
-#ifdef __x86_64__
-case 513:
+case 1106:
     switch(callback_len){
     default:
-    case 16: cb_LobbyCreated_t_16(lin_callback, callback); break;
+    case 32: cb_LeaderboardScoreUploaded_t_32(lin_callback, callback); break;
     }
     break;
-case 4524:
+case 1111:
     switch(callback_len){
     default:
-    case 16: cb_HTML_ShowToolTip_t_16(lin_callback, callback); break;
+    case 16: cb_LeaderboardUGCSet_t_16(lin_callback, callback); break;
     }
     break;
-case 3415:
+case 1112:
     switch(callback_len){
     default:
-    case 24: cb_RemoveAppDependencyResult_t_24(lin_callback, callback); break;
+    case 24: cb_PS3TrophiesInstalled_t_24(lin_callback, callback); break;
     }
     break;
-case 4514:
+case 1221:
     switch(callback_len){
     default:
-    case 16: cb_HTML_JSAlert_t_16(lin_callback, callback); break;
-    }
-    break;
-case 3416:
-    switch(callback_len){
-    default:
-    case 152: cb_GetAppDependenciesResult_t_152(lin_callback, callback); break;
-    }
-    break;
-case 4502:
-    switch(callback_len){
-    default:
-    case 56: cb_HTML_NeedsPaint_t_56(lin_callback, callback); break;
+    case 712: cb_SteamNetConnectionStatusChangedCallback_t_712(lin_callback, callback); break;
     }
     break;
 case 1303:
@@ -437,24 +449,6 @@ case 1303:
     case 288: cb_RemoteStorageAppSyncProgress_t_288(lin_callback, callback); break;
     }
     break;
-case 152:
-    switch(callback_len){
-    default:
-    case 24: cb_MicroTxnAuthorizationResponse_t_24(lin_callback, callback); break;
-    }
-    break;
-case 4505:
-    switch(callback_len){
-    default:
-    case 48: cb_HTML_URLChanged_t_48(lin_callback, callback); break;
-    }
-    break;
-case 4506:
-    switch(callback_len){
-    default:
-    case 24: cb_HTML_FinishedRequest_t_24(lin_callback, callback); break;
-    }
-    break;
 case 1307:
     switch(callback_len){
     default:
@@ -462,10 +456,10 @@ case 1307:
     case 16: cb_RemoteStorageFileShareResult_t_16(lin_callback, callback); break;
     }
     break;
-case 4508:
+case 1308:
     switch(callback_len){
     default:
-    case 16: cb_HTML_ChangedTitle_t_16(lin_callback, callback); break;
+    case 40: cb_RemoteStorageDownloadUGCResult_t_40(lin_callback, callback); break;
     }
     break;
 case 1309:
@@ -545,19 +539,6 @@ case 1320:
     case 32: cb_RemoteStorageGetPublishedItemVoteDetailsResult_t_32(lin_callback, callback); break;
     }
     break;
-case 4521:
-    switch(callback_len){
-    default:
-    case 40: cb_HTML_NewWindow_t_40(lin_callback, callback); break;
-    case 32: cb_HTML_NewWindow_t_32(lin_callback, callback); break;
-    }
-    break;
-case 4523:
-    switch(callback_len){
-    default:
-    case 16: cb_HTML_StatusText_t_16(lin_callback, callback); break;
-    }
-    break;
 case 1324:
     switch(callback_len){
     default:
@@ -588,30 +569,6 @@ case 1330:
     case 24: cb_RemoteStoragePublishedFileUpdated_t_24(lin_callback, callback); break;
     }
     break;
-case 5301:
-    switch(callback_len){
-    default:
-    case 280: cb_JoinPartyCallback_t_280(lin_callback, callback); break;
-    }
-    break;
-case 5302:
-    switch(callback_len){
-    default:
-    case 16: cb_CreateBeaconCallback_t_16(lin_callback, callback); break;
-    }
-    break;
-case 2103:
-    switch(callback_len){
-    default:
-    case 24: cb_HTTPRequestDataReceived_t_24(lin_callback, callback); break;
-    }
-    break;
-case 4507:
-    switch(callback_len){
-    default:
-    case 16: cb_HTML_OpenLinkInNewTab_t_16(lin_callback, callback); break;
-    }
-    break;
 case 2101:
     switch(callback_len){
     default:
@@ -619,28 +576,16 @@ case 2101:
     case 24: cb_HTTPRequestCompleted_t_24(lin_callback, callback); break;
     }
     break;
-case 4525:
-    switch(callback_len){
-    default:
-    case 16: cb_HTML_UpdateToolTip_t_16(lin_callback, callback); break;
-    }
-    break;
-case 4503:
-    switch(callback_len){
-    default:
-    case 40: cb_HTML_StartRequest_t_40(lin_callback, callback); break;
-    }
-    break;
 case 2102:
     switch(callback_len){
     default:
     case 16: cb_HTTPRequestHeadersReceived_t_16(lin_callback, callback); break;
     }
     break;
-case 4513:
+case 2103:
     switch(callback_len){
     default:
-    case 32: cb_HTML_LinkAtPosition_t_32(lin_callback, callback); break;
+    case 24: cb_HTTPRequestDataReceived_t_24(lin_callback, callback); break;
     }
     break;
 case 3402:
@@ -657,12 +602,6 @@ case 3403:
     case 24: cb_CreateItemResult_t_24(lin_callback, callback); break;
     }
     break;
-case 1221:
-    switch(callback_len){
-    default:
-    case 712: cb_SteamNetConnectionStatusChangedCallback_t_712(lin_callback, callback); break;
-    }
-    break;
 case 3405:
     switch(callback_len){
     default:
@@ -675,24 +614,6 @@ case 3406:
     case 24: cb_DownloadItemResult_t_24(lin_callback, callback); break;
     }
     break;
-case 209:
-    switch(callback_len){
-    default:
-    case 40: cb_GSReputation_t_40(lin_callback, callback); break;
-    }
-    break;
-case 1106:
-    switch(callback_len){
-    default:
-    case 32: cb_LeaderboardScoreUploaded_t_32(lin_callback, callback); break;
-    }
-    break;
-case 4515:
-    switch(callback_len){
-    default:
-    case 16: cb_HTML_JSConfirm_t_16(lin_callback, callback); break;
-    }
-    break;
 case 3412:
     switch(callback_len){
     default:
@@ -711,16 +632,16 @@ case 3414:
     case 24: cb_AddAppDependencyResult_t_24(lin_callback, callback); break;
     }
     break;
-case 1111:
+case 3415:
     switch(callback_len){
     default:
-    case 16: cb_LeaderboardUGCSet_t_16(lin_callback, callback); break;
+    case 24: cb_RemoveAppDependencyResult_t_24(lin_callback, callback); break;
     }
     break;
-case 1112:
+case 3416:
     switch(callback_len){
     default:
-    case 24: cb_PS3TrophiesInstalled_t_24(lin_callback, callback); break;
+    case 152: cb_GetAppDependenciesResult_t_152(lin_callback, callback); break;
     }
     break;
 case 3417:
@@ -729,6 +650,103 @@ case 3417:
     case 16: cb_DeleteItemResult_t_16(lin_callback, callback); break;
     }
     break;
+case 4502:
+    switch(callback_len){
+    default:
+    case 56: cb_HTML_NeedsPaint_t_56(lin_callback, callback); break;
+    }
+    break;
+case 4503:
+    switch(callback_len){
+    default:
+    case 40: cb_HTML_StartRequest_t_40(lin_callback, callback); break;
+    }
+    break;
+case 4505:
+    switch(callback_len){
+    default:
+    case 48: cb_HTML_URLChanged_t_48(lin_callback, callback); break;
+    }
+    break;
+case 4506:
+    switch(callback_len){
+    default:
+    case 24: cb_HTML_FinishedRequest_t_24(lin_callback, callback); break;
+    }
+    break;
+case 4507:
+    switch(callback_len){
+    default:
+    case 16: cb_HTML_OpenLinkInNewTab_t_16(lin_callback, callback); break;
+    }
+    break;
+case 4508:
+    switch(callback_len){
+    default:
+    case 16: cb_HTML_ChangedTitle_t_16(lin_callback, callback); break;
+    }
+    break;
+case 4513:
+    switch(callback_len){
+    default:
+    case 32: cb_HTML_LinkAtPosition_t_32(lin_callback, callback); break;
+    }
+    break;
+case 4514:
+    switch(callback_len){
+    default:
+    case 16: cb_HTML_JSAlert_t_16(lin_callback, callback); break;
+    }
+    break;
+case 4515:
+    switch(callback_len){
+    default:
+    case 16: cb_HTML_JSConfirm_t_16(lin_callback, callback); break;
+    }
+    break;
+case 4516:
+    switch(callback_len){
+    default:
+    case 24: cb_HTML_FileOpenDialog_t_24(lin_callback, callback); break;
+    }
+    break;
+case 4517:
+    switch(callback_len){
+    default:
+    case 24: cb_HTML_ComboNeedsPaint_t_24(lin_callback, callback); break;
+    }
+    break;
+case 4521:
+    switch(callback_len){
+    default:
+    case 40: cb_HTML_NewWindow_t_40(lin_callback, callback); break;
+    case 32: cb_HTML_NewWindow_t_32(lin_callback, callback); break;
+    }
+    break;
+case 4523:
+    switch(callback_len){
+    default:
+    case 16: cb_HTML_StatusText_t_16(lin_callback, callback); break;
+    }
+    break;
+case 4524:
+    switch(callback_len){
+    default:
+    case 16: cb_HTML_ShowToolTip_t_16(lin_callback, callback); break;
+    }
+    break;
+case 4525:
+    switch(callback_len){
+    default:
+    case 16: cb_HTML_UpdateToolTip_t_16(lin_callback, callback); break;
+    }
+    break;
+case 4704:
+    switch(callback_len){
+    default:
+    case 24: cb_SteamInventoryStartPurchaseResult_t_24(lin_callback, callback); break;
+    }
+    break;
 case 5211:
     switch(callback_len){
     default:
@@ -759,34 +777,16 @@ case 5215:
     case 16: cb_EndGameResultCallback_t_16(lin_callback, callback); break;
     }
     break;
-case 4704:
+case 5301:
     switch(callback_len){
     default:
-    case 24: cb_SteamInventoryStartPurchaseResult_t_24(lin_callback, callback); break;
+    case 280: cb_JoinPartyCallback_t_280(lin_callback, callback); break;
     }
     break;
-case 4517:
+case 5302:
     switch(callback_len){
     default:
-    case 24: cb_HTML_ComboNeedsPaint_t_24(lin_callback, callback); break;
-    }
-    break;
-case 1308:
-    switch(callback_len){
-    default:
-    case 40: cb_RemoteStorageDownloadUGCResult_t_40(lin_callback, callback); break;
-    }
-    break;
-case 4516:
-    switch(callback_len){
-    default:
-    case 24: cb_HTML_FileOpenDialog_t_24(lin_callback, callback); break;
-    }
-    break;
-case 1023:
-    switch(callback_len){
-    default:
-    case 40: cb_FileDetailsResult_t_40(lin_callback, callback); break;
+    case 16: cb_CreateBeaconCallback_t_16(lin_callback, callback); break;
     }
     break;
 #endif
diff --git a/lsteamclient/gen_wrapper.py b/lsteamclient/gen_wrapper.py
index f441777b..d90d33c2 100755
--- a/lsteamclient/gen_wrapper.py
+++ b/lsteamclient/gen_wrapper.py
@@ -1263,7 +1263,7 @@ cbsizefile = open("cb_getapi_sizes.dat", "w")
 
 cbsizefile.write("#ifdef __i386__\n")
 getapifile.write("#ifdef __i386__\n")
-for cb in cb_table.keys():
+for cb in sorted(cb_table.keys()):
     cbsizefile.write("case %u: /* %s */\n" % (cb, cb_table[cb][1][0][1]))
     cbsizefile.write("    return %u;\n" % cb_table[cb][0])
     getapifile.write("case %u:\n" % cb)
@@ -1277,7 +1277,7 @@ getapifile.write("#endif\n")
 
 cbsizefile.write("#ifdef __x86_64__\n")
 getapifile.write("#ifdef __x86_64__\n")
-for cb in cb_table64.keys():
+for cb in sorted(cb_table64.keys()):
     cbsizefile.write("case %u: /* %s */\n" % (cb, cb_table64[cb][1][0][1]))
     cbsizefile.write("    return %u;\n" % cb_table64[cb][0])
     getapifile.write("case %u:\n" % cb)