diff --git a/buildcfg.txt b/buildcfg.txt
index e991d862..e8eec928 100644
--- a/buildcfg.txt
+++ b/buildcfg.txt
@@ -2231,8 +2231,8 @@ MANFB8B2	27	17
 AMMOA0	14	14
 ARM1A0	15	17
 ARM1B0	15	17
-ARM2A0	15	18
-ARM2B0	15	18
+ARM2A0	15	22
+ARM2B0	15	22
 BAL1A0	8	8
 BAL1B0	8	8
 BAL1C0	16	17
@@ -2249,30 +2249,30 @@ BAL7B4B6	21	8
 BAL7C0	16	16
 BAL7D0	20	19
 BAL7E0	21	20
-BAR1A0	10	28
-BAR1B0	10	28
-BEXPA0	10	28
-BEXPB0	10	27
-BEXPC0	19	32
-BEXPD0	27	46
-BEXPE0	29 	49
+BAR1A0	11	32
+BAR1B0	11	32
+BEXPA0	11	33
+BEXPB0	12	32
+BEXPC0	18	40
+BEXPD0	28	50
+BEXPE0	29 	53
 BKEYA0	7	19
 BKEYB0	7	19
 BLUDA0	7	5
 BLUDB0	8	7
 BLUDC0	7	7
-BON1A0	7	16
-BON1B0	7	16
-BON1C0	7	16
-BON1D0	7	16
-BON2A0	11	18
-BON2B0	11	18
-BON2C0	11	18
-BON2D0	11	18
+BON1A0	6	19
+BON1B0	6	19
+BON1C0	6	19
+BON1D0	6	19
+BON2A0	6	19
+BON2B0	6	19
+BON2C0	6	19
+BON2D0	6	19
 BPAKA0	8	26
 BROKA0	27	20
-CANDA0	8	15
-CBRAA0	14	61
+CANDA0	8	20
+CBRAA0	11	56
 CHGGA0	-105	-114
 CHGGB0	-105	-121
 CHGFA0	-125	-83
@@ -2303,10 +2303,10 @@ MISLA8A2	14	12
 MISLB0	36	37
 MISLC0	39	38
 MISLD0	45	41
-PINSA0	12	32
-PINSB0	12	32
-PINSC0	12	32
-PINSD0	12	32
+PINSA0	12	25
+PINSB0	12	25
+PINSC0	12	25
+PINSD0	12	25
 PISFA0	-147	-66
 PISGA0	-138	-104
 PISGB0	-138	-83
@@ -2377,8 +2377,8 @@ PUNGA0  -100	-138
 PUNGB0  -68	-75
 PUNGC0  -273	-76
 PUNGD0  -200	-67
-PVISA0	19	9
-PVISB0	19	9
+PVISA0	14	13
+PVISB0	14	13
 RKEYA0	8	19
 RKEYB0	8	19
 ROCKA0	6	25
@@ -2395,10 +2395,10 @@ SHTGC0	-52	-40
 SHTGD0	-34	-44
 SHTFA0	-142	-94
 SHTFB0	-132	-87
-SOULA0	12	32
-SOULB0	12	32
-SOULC0	12	32
-SOULD0	12	32
+SOULA0	12	25
+SOULB0	12	25
+SOULC0	12	25
+SOULD0	12	25
 STIMA0	7	15
 SUITA0	11	52
 TFOGA0 25 59
@@ -2411,10 +2411,10 @@ TFOGG0 25 59
 TFOGH0 25 59
 TFOGI0 25 59
 TFOGJ0 25 59
-TREDA0	14	93
-TREDB0	14	93
-TREDC0	14	93
-TREDD0	14	93
+TREDA0	14	94
+TREDB0	14	96
+TREDC0	14	97
+TREDD0	14	94
 
 YKEYA0	8	19
 YKEYB0	8	19
@@ -2433,10 +2433,10 @@ HDB3A0	11	59
 HDB4A0	11	59
 HDB5A0	11	59
 HDB6A0	11	59
-MEGAA0	12	32
-MEGAB0	12	32
-MEGAC0	12	32
-MEGAD0	12	32
+MEGAA0	12	25
+MEGAB0	12	25
+MEGAC0	12	25
+MEGAD0	12	25
 SHT2A0	-104	-99
 SHT2B0	-102	-102
 SHT2C0	-94	-119
@@ -2484,8 +2484,8 @@ BFE2A0  36      28
 BFE2B0  34      28
 BFE2C0  12      10
 BFE2D0  4       4
-BSKUA0	7	18
-BSKUB0	7	18
+BSKUA0	6	17
+BSKUB0	6	17
 CELLA0	8	12
 CELPA0	15	20
 CEYEA0	24	58
@@ -2498,9 +2498,9 @@ COL4A0 18 40
 COL5A0 18 48
 COL5B0 18 48
 COL6A0 18 50
-FCANA0	16	64
-FCANB0	16	64
-FCANC0	16	64
+FCANA0	13	53
+FCANB0	13	52
+FCANC0	13	51
 FSKUA0 22 55
 FSKUB0 22 55
 FSKUC0 22 55
@@ -2511,10 +2511,10 @@ GOR2A0	12	83
 GOR3A0	12	83
 GOR4A0	19	67
 GOR5A0	12	51
-PINVA0	12	32
-PINVB0	12	32
-PINVC0	12	32
-PINVD0	12	32
+PINVA0	12	25
+PINVB0	12	25
+PINVC0	12	25
+PINVD0	12	25
 PLASA0	29	16
 PLSEA0	11	11
 PLSEB0	15	14
@@ -2534,9 +2534,9 @@ POL3B0	19	48
 POL4A0	19	51
 POL6A0	17	62
 POL6B0	19	62
-PSTRA0	12	21
-RSKUA0	7	18
-RSKUB0	7	18
+PSTRA0	14	19
+RSKUA0	6	17
+RSKUB0	6	17
 SMBTA0	9	67
 SMBTB0	9	68
 SMBTC0	9	70
@@ -2550,16 +2550,16 @@ SMRTB0	10	68
 SMRTC0	10	70
 SMRTD0	10	69
 SMT2A0	10	42
-TBLUA0	13	91
-TBLUB0	13	92
-TBLUC0	13	93
-TBLUD0	13	92
-TGRNA0	13	93
-TGRNB0	13	93
-TGRNC0	13	93
-TGRND0	13	93
-YSKUA0	7	18
-YSKUB0	7	18
+TBLUA0	13	94
+TBLUB0	13	96
+TBLUC0	13	97
+TBLUD0	13	94
+TGRNA0	13	94
+TGRNB0	13	96
+TGRNC0	13	97
+TGRND0	13	94
+YSKUA0	6	17
+YSKUB0	6	17