diff --git a/.gdbinit b/.gdbinit
index 8abe1fb..b45602e 100644
--- a/.gdbinit
+++ b/.gdbinit
@@ -4,8 +4,8 @@
 # set auto-load local-gdbinit on
 # add-auto-load-safe-path /
 
-set architecture arm
-handle SIGILL nostop pass noprint
-add-symbol-file app/bin/app.elf 0x40000000
-set backtrace limit 20
-b *0x40000000
+# set architecture arm
+# handle SIGILL nostop pass noprint
+# add-symbol-file app/bin/app.elf 0x40000000
+# set backtrace limit 20
+# b *0x40000000
diff --git a/.gitignore b/.gitignore
index 12aea63..f633842 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,40 +47,30 @@
 # Kernel Module Compile Results
 *.mod*
 *.cmd
-.tmp_versions/
-modules.order
-Module.symvers
-Mkfile.old
-dkms.conf
-
-\cmake-build-debug
-\.idea/
-/tmp/
-/deps/nano2-sdk/
-
-# Created by cmake
-googletest-download/
-googletest-src/
-googletest-build/
-CMakeFiles/
-CMakeCache.txt
-unittests
-*.cmake
-Testing/
-cmake-build-fuzz/
-
-# Others
-/cmake-build-debug/
-/cmake-build-fuzz/
-\.idea
-/app/bin/
-/app/debug/
-/app/obj/
 
+##########################
+
+tests_zemu/.yarn/*
+tests_zemu/!.yarn/patches
+tests_zemu/!.yarn/releases
+tests_zemu/!.yarn/plugins
+tests_zemu/!.yarn/sdks
+tests_zemu/!.yarn/versions
+tests_zemu/.pnp.*
+
+#########################
+
+.vscode
+.idea
+
+node_modules
+fuzz/corpora
+
+!build/.gitkeep
+build/*
+cmake-build-debug
+
+tests_zemu/snapshots-tmp
 tests_zemu/yarn.lock
-/tests_zemu/snapshots-tmp/
-/build
-/fuzz-*.log
-/fuzz/corpora
-/tests_tools/target/
-!/tests_tools/neon/yarn.lock
+tests_tools/target
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 28f544e..78475a3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,7 +41,7 @@ if(ENABLE_FUZZING)
         message(FATAL_ERROR "Fuzz logging enabled")
     endif()
 
-    set(CMAKE_CXX_CLANG_TIDY clang-tidy -checks=-*,bugprone-*,cert-*,clang-analyzer-*,-cert-err58-cpp,misc-*,-bugprone-suspicious-include)
+    set(CMAKE_CXX_CLANG_TIDY clang-tidy -checks=-*,bugprone-*,cert-*,clang-analyzer-*,-cert-err58-cpp,misc-*)
 
     if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
         # require at least clang 3.2
diff --git a/Makefile b/Makefile
index ff0ad95..652187e 100644
--- a/Makefile
+++ b/Makefile
@@ -23,6 +23,9 @@
 
 ifeq ($(BOLOS_SDK),)
 # In this case, there is not predefined SDK and we run dockerized
+# When not using the SDK, we override and build the XL complete app
+
+SUBSTRATE_PARSER_FULL ?= 1
 include $(CURDIR)/deps/ledger-zxlib/dockerized_build.mk
 
 else
@@ -33,18 +36,6 @@ default:
 	COIN=$(COIN) $(MAKE) -C app $@
 endif
 
-build_sr25519: SUPPORT_SR25519=1       # Alternative app purpose
-build_sr25519: SUBSTRATE_PARSER_FULL=1 # Use full parser
-build_sr25519: buildS
-	cp $(CURDIR)/app/bin/app.elf $(CURDIR)/app/output/app_sr25519.elf
-	cp $(CURDIR)/app/bin/app.elf $(CURDIR)/app/bin/app_sr25519.elf
-
-build_full_parser_s: SUBSTRATE_PARSER_FULL=1
-build_full_parser_s: buildS
-
-build_full_parser_x: SUBSTRATE_PARSER_FULL=1
-build_full_parser_x: buildX
-
 tests_tools_build:
 	cd tests_tools/neon && yarn install
 
diff --git a/README.md b/README.md
index a086f91..29ebb98 100644
--- a/README.md
+++ b/README.md
@@ -16,6 +16,8 @@ This project contains the Edgeware app (https://edgewa.re/) for Ledger Nano S an
 - C++ unit tests
 - Zemu tests
 
+For more information: [How to build](docs/build.md)
+
 ## ATTENTION
 
 Please:
diff --git a/tests_zemu/snapshots/s-mainmenu/00004.png b/tests_zemu/snapshots/s-mainmenu/00004.png
index f5097a0..79d9011 100644
Binary files a/tests_zemu/snapshots/s-mainmenu/00004.png and b/tests_zemu/snapshots/s-mainmenu/00004.png differ
diff --git a/tests_zemu/snapshots/s-mainmenu/00006.png b/tests_zemu/snapshots/s-mainmenu/00006.png
index 8a57fc9..d389fce 100644
Binary files a/tests_zemu/snapshots/s-mainmenu/00006.png and b/tests_zemu/snapshots/s-mainmenu/00006.png differ
diff --git a/tests_zemu/snapshots/s-mainmenu/00007.png b/tests_zemu/snapshots/s-mainmenu/00007.png
index d389fce..1f707f9 100644
Binary files a/tests_zemu/snapshots/s-mainmenu/00007.png and b/tests_zemu/snapshots/s-mainmenu/00007.png differ
diff --git a/tests_zemu/snapshots/s-mainmenu/00011.png b/tests_zemu/snapshots/s-mainmenu/00011.png
index 8a57fc9..79d9011 100644
Binary files a/tests_zemu/snapshots/s-mainmenu/00011.png and b/tests_zemu/snapshots/s-mainmenu/00011.png differ
diff --git a/tests_zemu/snapshots/s-mainmenu/00012.png b/tests_zemu/snapshots/s-mainmenu/00012.png
index f5097a0..27a6e33 100644
Binary files a/tests_zemu/snapshots/s-mainmenu/00012.png and b/tests_zemu/snapshots/s-mainmenu/00012.png differ
diff --git a/tests_zemu/snapshots/s-mainmenu/00013.png b/tests_zemu/snapshots/s-mainmenu/00013.png
index 27a6e33..f9903ba 100644
Binary files a/tests_zemu/snapshots/s-mainmenu/00013.png and b/tests_zemu/snapshots/s-mainmenu/00013.png differ
diff --git a/tests_zemu/snapshots/x-mainmenu/00004.png b/tests_zemu/snapshots/x-mainmenu/00004.png
index 207f140..05b5e01 100644
Binary files a/tests_zemu/snapshots/x-mainmenu/00004.png and b/tests_zemu/snapshots/x-mainmenu/00004.png differ
diff --git a/tests_zemu/snapshots/x-mainmenu/00011.png b/tests_zemu/snapshots/x-mainmenu/00011.png
index 207f140..05b5e01 100644
Binary files a/tests_zemu/snapshots/x-mainmenu/00011.png and b/tests_zemu/snapshots/x-mainmenu/00011.png differ
diff --git a/tests_zemu/tests/standard.test.ts b/tests_zemu/tests/standard.test.ts
index f2f02a4..3ad13be 100644
--- a/tests_zemu/tests/standard.test.ts
+++ b/tests_zemu/tests/standard.test.ts
@@ -15,8 +15,8 @@
  ******************************************************************************* */
 
 import Zemu, { DEFAULT_START_OPTIONS } from '@zondax/zemu'
-import { newEdgewareApp } from '@zondax/ledger-polkadot'
 import { APP_SEED, models } from './common'
+import { newEdgewareApp } from '@zondax/ledger-polkadot'
 
 // @ts-ignore
 import ed25519 from 'ed25519-supercop'