diff --git a/openpgp b/openpgp
index 34f4efb5..e6f5060a 160000
--- a/openpgp
+++ b/openpgp
@@ -1 +1 @@
-Subproject commit 34f4efb5ee266d8524404931276f414d347806cc
+Subproject commit e6f5060a703ef19af6005a57fc833e9333b3eb80
diff --git a/solo.files b/solo.files
index 0397c954..ffff0505 100644
--- a/solo.files
+++ b/solo.files
@@ -68,6 +68,7 @@ crypto/cifra/src/testsha1.c
 crypto/cifra/src/testsha2.c
 crypto/cifra/src/testsha3.c
 crypto/cifra/src/testutil.h
+crypto/libsalty/salty.h
 crypto/micro-ecc/test/test_compress.c
 crypto/micro-ecc/test/test_compute.c
 crypto/micro-ecc/test/test_ecdh.c
@@ -789,33 +790,60 @@ openpgp/pc/usbip.cpp
 openpgp/pc/usbip.h
 openpgp/src/apduexecutor.cpp
 openpgp/src/apduexecutor.h
-openpgp/src/applets/apducommand.cpp
-openpgp/src/applets/apducommand.h
-openpgp/src/applets/apduconst.h
-openpgp/src/applets/applet.cpp
-openpgp/src/applets/applet.h
-openpgp/src/applets/appletstorage.cpp
-openpgp/src/applets/appletstorage.h
-openpgp/src/applets/openpgp/cryptoapdu.cpp
-openpgp/src/applets/openpgp/cryptoapdu.h
-openpgp/src/applets/openpgp/openpgpconst.cpp
-openpgp/src/applets/openpgp/openpgpconst.h
-openpgp/src/applets/openpgp/openpgpfactory.cpp
-openpgp/src/applets/openpgp/openpgpfactory.h
-openpgp/src/applets/openpgp/openpgpstruct.cpp
-openpgp/src/applets/openpgp/openpgpstruct.h
-openpgp/src/applets/openpgp/resetprovider.cpp
-openpgp/src/applets/openpgp/resetprovider.h
-openpgp/src/applets/openpgp/secureapdu.cpp
-openpgp/src/applets/openpgp/secureapdu.h
-openpgp/src/applets/openpgp/security.cpp
-openpgp/src/applets/openpgp/security.h
-openpgp/src/applets/openpgp/userapdu.cpp
-openpgp/src/applets/openpgp/userapdu.h
-openpgp/src/applets/openpgpapplet.cpp
-openpgp/src/applets/openpgpapplet.h
-openpgp/src/applets/testapplet.cpp
-openpgp/src/applets/testapplet.h
+openpgp/src/applications/apducommand.cpp
+openpgp/src/applications/apducommand.h
+openpgp/src/applications/apduconst.h
+openpgp/src/applications/application.cpp
+openpgp/src/applications/application.h
+openpgp/src/applications/applicationstorage.cpp
+openpgp/src/applications/applicationstorage.h
+openpgp/src/applications/openpgp/cryptoapdu.cpp
+openpgp/src/applications/openpgp/cryptoapdu.h
+openpgp/src/applications/openpgp/openpgpconst.cpp
+openpgp/src/applications/openpgp/openpgpconst.h
+openpgp/src/applications/openpgp/openpgpfactory.cpp
+openpgp/src/applications/openpgp/openpgpfactory.h
+openpgp/src/applications/openpgp/openpgpstruct.cpp
+openpgp/src/applications/openpgp/openpgpstruct.h
+openpgp/src/applications/openpgp/resetprovider.cpp
+openpgp/src/applications/openpgp/resetprovider.h
+openpgp/src/applications/openpgp/secureapdu.cpp
+openpgp/src/applications/openpgp/secureapdu.h
+openpgp/src/applications/openpgp/security.cpp
+openpgp/src/applications/openpgp/security.h
+openpgp/src/applications/openpgp/userapdu.cpp
+openpgp/src/applications/openpgp/userapdu.h
+openpgp/src/applications/openpgpapplication.cpp
+openpgp/src/applications/openpgpapplication.h
+openpgp/src/applications/testapplication.cpp
+openpgp/src/applications/testapplication.h
+openpgp/src/applications/apducommand.cpp
+openpgp/src/applications/apducommand.h
+openpgp/src/applications/apduconst.h
+openpgp/src/applications/application.cpp
+openpgp/src/applications/application.h
+openpgp/src/applications/applicationstorage.cpp
+openpgp/src/applications/applicationstorage.h
+openpgp/src/applications/openpgp/cryptoapdu.cpp
+openpgp/src/applications/openpgp/cryptoapdu.h
+openpgp/src/applications/openpgp/openpgpconst.cpp
+openpgp/src/applications/openpgp/openpgpconst.h
+openpgp/src/applications/openpgp/openpgpfactory.cpp
+openpgp/src/applications/openpgp/openpgpfactory.h
+openpgp/src/applications/openpgp/openpgpstruct.cpp
+openpgp/src/applications/openpgp/openpgpstruct.h
+openpgp/src/applications/openpgp/resetprovider.cpp
+openpgp/src/applications/openpgp/resetprovider.h
+openpgp/src/applications/openpgp/secureapdu.cpp
+openpgp/src/applications/openpgp/secureapdu.h
+openpgp/src/applications/openpgp/security.cpp
+openpgp/src/applications/openpgp/security.h
+openpgp/src/applications/openpgp/userapdu.cpp
+openpgp/src/applications/openpgp/userapdu.h
+openpgp/src/applications/openpgpapplication.cpp
+openpgp/src/applications/openpgpapplication.h
+openpgp/src/applications/testapplication.cpp
+openpgp/src/applications/testapplication.h
 openpgp/src/cryptolib-mbedtls.cpp
 openpgp/src/cryptolib-mbedtls.h
 openpgp/src/cryptolib.cpp
diff --git a/solo.includes b/solo.includes
index e707a238..c346fed8 100644
--- a/solo.includes
+++ b/solo.includes
@@ -28,8 +28,8 @@ openpgp/libs/bearssl
 openpgp/libs/stm32fs
 openpgp/pc
 openpgp/src
-openpgp/src/applets
-openpgp/src/applets/openpgp
+openpgp/src/applications
+openpgp/src/applications/openpgp
 openpgp/stm32l432
 pc
 targets/stm32l432/bootloader
@@ -42,3 +42,6 @@ tinycbor/src
 targets/stm32l432
 openpgp
 targets/stm32l432/build
+openpgp/src/applications/openpgp
+openpgp/src/applications
+crypto/libsalty
diff --git a/targets/stm32l432/Makefile b/targets/stm32l432/Makefile
index 8c595609..a5670a20 100644
--- a/targets/stm32l432/Makefile
+++ b/targets/stm32l432/Makefile
@@ -36,7 +36,7 @@ all:
 	$(MAKE) -f $(APPMAKE) -j8 solo.hex PREFIX=$(PREFIX) DEBUG=$(DEBUG) EXTRA_DEFINES='-DFLASH_ROP=1'
 
 all-hacker:
-	$(MAKE) -f $(APPMAKE)  solo.hex PREFIX=$(PREFIX) DEBUG=$(DEBUG) EXTRA_DEFINES='-DSOLO_HACKER -DFLASH_ROP=0'
+	$(MAKE) -f $(APPMAKE) -j8 solo.hex PREFIX=$(PREFIX) DEBUG=$(DEBUG) EXTRA_DEFINES='-DSOLO_HACKER -DFLASH_ROP=0'
 
 all-locked:
 	$(MAKE) -f $(APPMAKE) -j8 solo.hex PREFIX=$(PREFIX) EXTRA_DEFINES='-DFLASH_ROP=2'