diff --git a/source/hos/pkg1.c b/source/hos/pkg1.c
index b1768f8..e80f964 100644
--- a/source/hos/pkg1.c
+++ b/source/hos/pkg1.c
@@ -22,10 +22,61 @@
 #include "pkg1.h"
 #include "../sec/se.h"
 
-#define HASH_ORDER_100_100 {2, 3, 4, 0, 5, 6, 1}
-#define HASH_ORDER_200_510 {2, 3, 4, 0, 5, 7, 10, 12, 11, 6, 8, 1}
-#define HASH_ORDER_600_620 {6, 5, 10, 7, 8, 2, 3, 4, 0, 12, 11, 1}
-#define HASH_ORDER_700_10x {6, 5, 10, 7, 8, 2, 3, 4, 0, 12, 11, 9, 1}
+#define HASH_ORDER_100_100 { \
+		FS_KEY_AREA_KEY_APPLI_SOURCE, \
+		FS_KEY_AREA_KEY_OCEAN_SOURCE, \
+		FS_KEY_AREA_KEY_SYSTE_SOURCE, \
+		FS_HEADER_KEK_SOURCE, \
+		FS_SAVE_MAC_KEK_SOURCE, \
+		FS_SAVE_MAC_KEY_SOURCE, \
+		FS_HEADER_KEY_SOURCE \
+	}
+
+#define HASH_ORDER_200_510 { \
+		FS_KEY_AREA_KEY_APPLI_SOURCE, \
+		FS_KEY_AREA_KEY_OCEAN_SOURCE, \
+		FS_KEY_AREA_KEY_SYSTE_SOURCE, \
+		FS_HEADER_KEK_SOURCE, \
+		FS_SAVE_MAC_KEK_SOURCE, \
+		FS_SAVE_MAC_SD_KEK_SOURCE, \
+		FS_SD_KEK_SOURCE, \
+		FS_SD_SAVE_KEY_SOURCE, \
+		FS_SD_NCA_KEY_SOURCE, \
+		FS_SAVE_MAC_KEY_SOURCE, \
+		FS_SAVE_MAC_SD_KEY_SOURCE, \
+		FS_HEADER_KEY_SOURCE \
+	}
+
+#define HASH_ORDER_600_620 { \
+		FS_SAVE_MAC_KEY_SOURCE, \
+		FS_SAVE_MAC_KEK_SOURCE, \
+		FS_SD_KEK_SOURCE, \
+		FS_SAVE_MAC_SD_KEK_SOURCE, \
+		FS_SAVE_MAC_SD_KEY_SOURCE, \
+		FS_KEY_AREA_KEY_APPLI_SOURCE, \
+		FS_KEY_AREA_KEY_OCEAN_SOURCE, \
+		FS_KEY_AREA_KEY_SYSTE_SOURCE, \
+		FS_HEADER_KEK_SOURCE, \
+		FS_SD_SAVE_KEY_SOURCE, \
+		FS_SD_NCA_KEY_SOURCE, \
+		FS_HEADER_KEY_SOURCE \
+	}
+
+#define HASH_ORDER_700_10x { \
+		FS_SAVE_MAC_KEY_SOURCE, \
+		FS_SAVE_MAC_KEK_SOURCE, \
+		FS_SD_KEK_SOURCE, \
+		FS_SAVE_MAC_SD_KEK_SOURCE, \
+		FS_SAVE_MAC_SD_KEY_SOURCE, \
+		FS_KEY_AREA_KEY_APPLI_SOURCE, \
+		FS_KEY_AREA_KEY_OCEAN_SOURCE, \
+		FS_KEY_AREA_KEY_SYSTE_SOURCE, \
+		FS_HEADER_KEK_SOURCE, \
+		FS_SD_SAVE_KEY_SOURCE, \
+		FS_SD_NCA_KEY_SOURCE, \
+		FS_SD_CUSTOM_KEY_SOURCE, \
+		FS_HEADER_KEY_SOURCE \
+	}
 
 static const pkg1_id_t _pkg1_ids[] = {
 	{ "20161121183008", 0, {0x1b517, 0x125bc2, 1, 16,  6, HASH_ORDER_100_100,      0, 0x449dc} }, //1.0.0
@@ -42,7 +93,7 @@ static const pkg1_id_t _pkg1_ids[] = {
 	{ "20190531152432", 8, {0x29c50,   0x6a73, 0,  8, 12, HASH_ORDER_700_10x, 0x5563, 0x1d437} }, //8.1.0
 	{ "20190809135709", 9, {0x2ec10,   0x5573, 0,  1, 12, HASH_ORDER_700_10x, 0x6495, 0x1d807} }, //9.0.0 - 9.0.1
 	{ "20191021113848", 10,{0x2ec10,   0x5573, 0,  1, 12, HASH_ORDER_700_10x, 0x6495, 0x1d807} }, //9.1.0
-	{ "20200303104606", 10,{0x30ea0,   0x5e4b, 0,  1, 12, HASH_ORDER_700_10x, 0x663c, 0x1d9a4} }, //10.0.0
+	{ "20200303104606", 10,{0x30ea0,   0x5e4b, 0,  1, 12, HASH_ORDER_700_10x, 0x663c, 0x1d9a4} }, //10.0.0+
 	{ NULL } //End.
 };
 
diff --git a/source/hos/pkg1.h b/source/hos/pkg1.h
index 1d1e4ad..a7d6a8d 100644
--- a/source/hos/pkg1.h
+++ b/source/hos/pkg1.h
@@ -19,6 +19,20 @@
 
 #include "../utils/types.h"
 
+#define FS_HEADER_KEK_SOURCE         0
+#define FS_HEADER_KEY_SOURCE         1
+#define FS_KEY_AREA_KEY_APPLI_SOURCE 2
+#define FS_KEY_AREA_KEY_OCEAN_SOURCE 3
+#define FS_KEY_AREA_KEY_SYSTE_SOURCE 4
+#define FS_SAVE_MAC_KEK_SOURCE       5
+#define FS_SAVE_MAC_KEY_SOURCE       6
+#define FS_SAVE_MAC_SD_KEK_SOURCE    7
+#define FS_SAVE_MAC_SD_KEY_SOURCE    8
+#define FS_SD_CUSTOM_KEY_SOURCE      9
+#define FS_SD_KEK_SOURCE             10
+#define FS_SD_NCA_KEY_SOURCE         11
+#define FS_SD_SAVE_KEY_SOURCE        12
+
 typedef struct _key_info_t
 {
 	u32 start_offset;
diff --git a/source/keys/keys.c b/source/keys/keys.c
index 52bcdce..d49be51 100644
--- a/source/keys/keys.c
+++ b/source/keys/keys.c
@@ -472,7 +472,7 @@ get_tsec: ;
 
     if (!pkg1_not_100) {
         // 1.0.0 doesn't have SD keys at all and the first key isn't aligned with the rest
-        memcpy(fs_keys[2], ki->kip1->data + ki->kip1->sections[0].size_comp + 0x1ae0e, 0x10);
+        memcpy(fs_keys[FS_KEY_AREA_KEY_APPLI_SOURCE], ki->kip1->data + ki->kip1->sections[0].size_comp + 0x1ae0e, 0x10);
         hash_index = 1;
     }
 
@@ -506,15 +506,15 @@ pkg2_done:
 
     TPRINTFARGS("%kFS keys...      ", colors[(color_idx++) % 6]);
 
-    if (_key_exists(fs_keys[0]) && _key_exists(fs_keys[1]) && _key_exists(master_key[0])) {
-        _generate_kek(8, fs_keys[0], master_key[0], aes_kek_generation_source, aes_key_generation_source);
-        se_aes_crypt_block_ecb(8, 0, header_key + 0x00, fs_keys[1] + 0x00);
-        se_aes_crypt_block_ecb(8, 0, header_key + 0x10, fs_keys[1] + 0x10);
+    if (_key_exists(fs_keys[FS_HEADER_KEK_SOURCE]) && _key_exists(fs_keys[FS_HEADER_KEY_SOURCE]) && _key_exists(master_key[0])) {
+        _generate_kek(8, fs_keys[FS_HEADER_KEK_SOURCE], master_key[0], aes_kek_generation_source, aes_key_generation_source);
+        se_aes_crypt_block_ecb(8, 0, header_key + 0x00, fs_keys[FS_HEADER_KEY_SOURCE] + 0x00);
+        se_aes_crypt_block_ecb(8, 0, header_key + 0x10, fs_keys[FS_HEADER_KEY_SOURCE] + 0x10);
     }
 
-    if (_key_exists(fs_keys[5]) && _key_exists(fs_keys[6]) && _key_exists(device_key)) {
-        _generate_kek(8, fs_keys[5], device_key, aes_kek_generation_source, NULL);
-        se_aes_crypt_block_ecb(8, 0, save_mac_key, fs_keys[6]);
+    if (_key_exists(fs_keys[FS_SAVE_MAC_KEK_SOURCE]) && _key_exists(fs_keys[FS_SAVE_MAC_KEY_SOURCE]) && _key_exists(device_key)) {
+        _generate_kek(8, fs_keys[FS_SAVE_MAC_KEK_SOURCE], device_key, aes_kek_generation_source, NULL);
+        se_aes_crypt_block_ecb(8, 0, save_mac_key, fs_keys[FS_SAVE_MAC_KEY_SOURCE]);
     }
 
     if (_key_exists(master_key[MAX_KEY])) {
@@ -523,9 +523,9 @@ pkg2_done:
     for (u32 i = 0; i < MAX_KEY; i++) {
         if (!_key_exists(master_key[i]))
             continue;
-        if (_key_exists(fs_keys[2]) && _key_exists(fs_keys[3]) && _key_exists(fs_keys[4])) {
+        if (_key_exists(fs_keys[FS_KEY_AREA_KEY_APPLI_SOURCE]) && _key_exists(fs_keys[FS_KEY_AREA_KEY_OCEAN_SOURCE]) && _key_exists(fs_keys[FS_KEY_AREA_KEY_SYSTE_SOURCE])) {
             for (u32 j = 0; j < 3; j++) {
-                _generate_kek(8, fs_keys[2 + j], master_key[i], aes_kek_generation_source, NULL);
+                _generate_kek(8, fs_keys[FS_KEY_AREA_KEY_APPLI_SOURCE + j], master_key[i], aes_kek_generation_source, NULL);
                 se_aes_crypt_block_ecb(8, 0, key_area_key[j][i], aes_key_generation_source);
             }
         }
@@ -981,15 +981,15 @@ key_output: ;
     SAVE_KEY("eticket_rsa_kek_personalized", eticket_rsa_kek_personalized, 0x10);
     SAVE_KEY("eticket_rsa_kek_source", es_keys[0], 0x10);
     SAVE_KEY("eticket_rsa_kekek_source", es_keys[1], 0x10);
-    SAVE_KEY("header_kek_source", fs_keys[0], 0x10);
+    SAVE_KEY("header_kek_source", fs_keys[FS_HEADER_KEK_SOURCE], 0x10);
     SAVE_KEY("header_key", header_key, 0x20);
-    SAVE_KEY("header_key_source", fs_keys[1], 0x20);
+    SAVE_KEY("header_key_source", fs_keys[FS_HEADER_KEY_SOURCE], 0x20);
     SAVE_KEY_FAMILY("key_area_key_application", key_area_key[0], 0, MAX_KEY, 0x10);
-    SAVE_KEY("key_area_key_application_source", fs_keys[2], 0x10);
+    SAVE_KEY("key_area_key_application_source", fs_keys[FS_KEY_AREA_KEY_APPLI_SOURCE], 0x10);
     SAVE_KEY_FAMILY("key_area_key_ocean", key_area_key[1], 0, MAX_KEY, 0x10);
-    SAVE_KEY("key_area_key_ocean_source", fs_keys[3], 0x10);
+    SAVE_KEY("key_area_key_ocean_source", fs_keys[FS_KEY_AREA_KEY_OCEAN_SOURCE], 0x10);
     SAVE_KEY_FAMILY("key_area_key_system", key_area_key[2], 0, MAX_KEY, 0x10);
-    SAVE_KEY("key_area_key_system_source", fs_keys[4], 0x10);
+    SAVE_KEY("key_area_key_system_source", fs_keys[FS_KEY_AREA_KEY_SYSTE_SOURCE], 0x10);
     SAVE_KEY_FAMILY("keyblob", keyblob, 0, 6, 0x90);
     SAVE_KEY_FAMILY("keyblob_key", keyblob_key, 0, 6, 0x10);
     SAVE_KEY_FAMILY("keyblob_key_source", keyblob_key_source, 0, 6, 0x10);
@@ -1010,15 +1010,15 @@ key_output: ;
     for (u32 i = 0; i < 0x10; i++)
         temp_key[i] = aes_kek_generation_source[i] ^ aes_kek_seed_01[i];
     SAVE_KEY("rsa_private_kek_generation_source", temp_key, 0x10);
-    SAVE_KEY("save_mac_kek_source", fs_keys[5], 0x10);
+    SAVE_KEY("save_mac_kek_source", fs_keys[FS_SAVE_MAC_KEK_SOURCE], 0x10);
     SAVE_KEY("save_mac_key", save_mac_key, 0x10);
-    SAVE_KEY("save_mac_key_source", fs_keys[6], 0x10);
-    SAVE_KEY("save_mac_sd_card_kek_source", fs_keys[7], 0x10);
-    SAVE_KEY("save_mac_sd_card_key_source", fs_keys[8], 0x10);
-    SAVE_KEY("sd_card_custom_storage_key_source", fs_keys[9], 0x20);
-    SAVE_KEY("sd_card_kek_source", fs_keys[10], 0x10);
-    SAVE_KEY("sd_card_nca_key_source", fs_keys[11], 0x20);
-    SAVE_KEY("sd_card_save_key_source", fs_keys[12], 0x20);
+    SAVE_KEY("save_mac_key_source", fs_keys[FS_SAVE_MAC_KEY_SOURCE], 0x10);
+    SAVE_KEY("save_mac_sd_card_kek_source", fs_keys[FS_SAVE_MAC_SD_KEK_SOURCE], 0x10);
+    SAVE_KEY("save_mac_sd_card_key_source", fs_keys[FS_SAVE_MAC_SD_KEY_SOURCE], 0x10);
+    SAVE_KEY("sd_card_custom_storage_key_source", fs_keys[FS_SD_CUSTOM_KEY_SOURCE], 0x20);
+    SAVE_KEY("sd_card_kek_source", fs_keys[FS_SD_KEK_SOURCE], 0x10);
+    SAVE_KEY("sd_card_nca_key_source", fs_keys[FS_SD_NCA_KEY_SOURCE], 0x20);
+    SAVE_KEY("sd_card_save_key_source", fs_keys[FS_SD_SAVE_KEY_SOURCE], 0x20);
     SAVE_KEY("sd_seed", sd_seed, 0x10);
     SAVE_KEY("secure_boot_key", sbk, 0x10);
     SAVE_KEY("ssl_rsa_kek", ssl_rsa_kek, 0x10);
diff --git a/source/keys/save.h b/source/keys/save.h
index c42b7bf..a89a675 100644
--- a/source/keys/save.h
+++ b/source/keys/save.h
@@ -193,7 +193,7 @@ typedef struct {
 } remap_storage_ctx_t;
 
 typedef struct {
-    uint64_t title_id;
+    uint64_t program_id;
     uint8_t user_id[0x10];
     uint64_t save_id;
     uint8_t save_data_type;
diff --git a/source/libs/fatfs/ffconf.h b/source/libs/fatfs/ffconf.h
index ebd7f22..af35a21 100644
--- a/source/libs/fatfs/ffconf.h
+++ b/source/libs/fatfs/ffconf.h
@@ -41,7 +41,7 @@
 #define FF_USE_MKFS		0
 /* This option switches f_mkfs() function. (0:Disable or 1:Enable) */
 
-#define FF_FASTFS 0
+#define FF_FASTFS		0
 
 #if FF_FASTFS
 #define FF_USE_FASTSEEK	1
diff --git a/source/sec/se.c b/source/sec/se.c
index 484f3c8..768d772 100644
--- a/source/sec/se.c
+++ b/source/sec/se.c
@@ -418,8 +418,8 @@ int se_aes_xts_crypt_sec(u32 ks1, u32 ks2, u32 enc, u64 sec, void *dst, const vo
 	u8 *tweak = (u8 *)malloc(0x10);
 	u8 *temptweak = (u8 *)malloc(0x10);
 	u32 *pdst = (u32 *)dst;
-    u32 *psrc = (u32 *)src;
-    u32 *ptweak = (u32 *)tweak;
+	u32 *psrc = (u32 *)src;
+	u32 *ptweak = (u32 *)tweak;
 
 	//Generate tweak.
 	for (int i = 0xF; i >= 0; i--)