diff --git a/.gitlab/issue_templates/Bug.md b/.gitlab/issue_templates/Bug.md
index 2730f825..46c86b62 100644
--- a/.gitlab/issue_templates/Bug.md
+++ b/.gitlab/issue_templates/Bug.md
@@ -1,35 +1,39 @@
 <!---
-Please read this!
+1. Before opening a new issue, make sure it isn't a duplicate.
 
-1. Before opening a new issue, make sure to search for keywords in the issues
-filtered by the "bug" label and verify the issue you're about to submit isn't a duplicate.
+2. Include the name of the affected component, eg: account-transaction-list or scan-address
 
-2. Make sure you're including the name of the affected component if applicable, as an example:
-
-account-transaction-list or scan-address
+3. Fill all proposed paragraphs (even with NA, if nothing available)
 --->
 
-### Summary
+## Summary
+<!--- Summarize the bug encountered concisely --->
 
-(Summarize the bug encountered concisely)
 
-### Steps to reproduce
+## Steps to reproduce
+<!--- How one can reproduce the issue - this is very important --->
 
-(How one can reproduce the issue - this is very important)
+## What is the current _bug_ behavior?
+<!--- What actually happens --->
 
-### What is the current _bug_ behavior?
+## What is the expected _correct_ behavior?
+<!--- What you should see instead --->
 
-(What actually happens)
+## Relevant logs, screenshots and/or links
+<!--- Paste any relevant logs - please use code blocks (```) to format console output,
+logs, and code as it's tough to read otherwise. --->
 
-### What is the expected _correct_ behavior?
+## Possible fixes / approach
+<!--- If you can, link to the line of code that might be responsible for the problem or describe how to solve it  --->
 
-(What you should see instead)
+## Additional information
+<!--- anything that might be important for whoever works with this issue  --->
 
-### Relevant logs and/or screenshots
+----
+<!--- if you know already how long it takes, add an estimate eg. 2h or 1d --->
+/estimate
 
-(Paste any relevant logs - please use code blocks (```) to format console output,
-logs, and code as it's tough to read otherwise.)
+<!--- these standard labels will be added to this issue>--->
+/label ~"type::bug" ~"proj::airgap"
 
-### Possible fixes
 
-(If you can, link to the line of code that might be responsible for the problem)
diff --git a/.gitlab/issue_templates/Epic.md b/.gitlab/issue_templates/Epic.md
new file mode 100644
index 00000000..7baea40d
--- /dev/null
+++ b/.gitlab/issue_templates/Epic.md
@@ -0,0 +1,30 @@
+<!---
+1. Before opening a new epic, make sure it isn't a duplicate.
+
+2. Give it a good name, summing up the goal to achieve
+
+3. After creating the epic, also create a label with the same name
+on the highest group/project level necessary and add it to this issue as well
+--->
+
+## Summary
+<!--- What is the greater goal to achieve with this epic? --->
+
+
+
+## Which issues need to be completed
+<!--- List all issues that need to be done. Example:
+- [] papers/airgap/airgap-vault#242+
+If you use this format, add the + at the end of the path
+--->
+
+
+<!--- --------------------------------------------------- --->
+
+
+<!--- these standard labels will be added to this issue, leave it as it is --->
+/label ~2141 ~"proj::airgap"
+
+
+
+
diff --git a/.gitlab/issue_templates/Feature.md b/.gitlab/issue_templates/Feature.md
index 1ee290d6..99bd9680 100644
--- a/.gitlab/issue_templates/Feature.md
+++ b/.gitlab/issue_templates/Feature.md
@@ -1,26 +1,43 @@
 <!---
-Please read this!
+1. Before opening a new issue, make sure it isn't a duplicate.
 
-1. Before opening a new issue, make sure to search for keywords in the issues
-filtered by the "feature" label and verify the issue you're about to submit isn't a duplicate.
+2. Include the name of the affected component, eg: account-transaction-list or scan-address
 
-2. Make sure you're including the name of the affected component if applicable, as an example:
-
-account-transaction-list or scan-address
+3. Fill all proposed paragraphs (even with NA, if nothing available)
 --->
 
-### Summary
+## Summary
+<!--- Summarize the feature concisely --->
+
+
+
+## What is the expected behavior?
+<!--- What the user should see / can do --->
+
+
+
+## Relevant Mockups, Screenshots and/or links
+<!--- Paste or link any relevant mockups or screenshot that describe the feature. --->
+
+
+
+## Possible fixes / approach
+<!--- If you can, link to the line of code that might be responsible for the problem or describe how to solve it  --->
+
+
+
+## Additional information
+<!--- anything that might be important for whoever works with this issue )  --->
+
 
-(Summarize the feature concisely)
 
-### What is the expected behavior?
+<!--- --------------------------------------------------- --->
 
-(Describe what the user should see)
+<!--- if you already know, please add an estimate eg. 2h or 1d, else leave it as it is--->
+/estimate
 
-### Relevant mockups or screenshots
 
-(Paste or link any relevant mockups or screenshot that describe the feature.)
 
-### Possible approach
+<!--- these standard labels will be added to this issue, leave it as it is --->
+/label ~"type::feature" ~"proj::airgap"
 
-(Outline a possible approach for this feature, ex. make an example how the code could look like)
diff --git a/.gitlab/issue_templates/Task.md b/.gitlab/issue_templates/Task.md
new file mode 100644
index 00000000..49000237
--- /dev/null
+++ b/.gitlab/issue_templates/Task.md
@@ -0,0 +1,39 @@
+<!---
+1. Before opening a new issue, make sure it isn't a duplicate.
+
+2. Include the name of the affected component, eg: account-transaction-list or scan-address
+
+3. Fill all proposed paragraphs (even with NA, if nothing available)
+--->
+
+## Summary
+<!--- Summarize the task concisely. --->
+
+
+
+## What steps need to be done?
+<!--- If it makes sense, list all necessary steps as a tasklist with checkboxes. --->
+
+
+
+## Relevant Mockups, Screenshots and/or links
+<!--- Paste or link any relevant mockups or screenshot that help to solve the task. --->
+
+
+
+## Additional information
+<!--- anything that might be important for whoever works with this issue.  --->
+
+
+
+<!--- --------------------------------------------------- --->
+
+<!--- if you already know, please add an estimate eg. 2h or 1d, else leave it as it is--->
+/estimate
+
+
+
+<!--- these standard labels will be added to this issue, leave it as it is --->
+/label ~"type::task" ~"proj::airgap"
+
+
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 4144c8d8..7e74a5a3 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -76,7 +76,7 @@ dependencies {
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion")
 
-    def saplingVersion = "0.0.6"
+    def saplingVersion = "0.0.7"
     implementation "com.github.airgap-it:airgap-sapling:$saplingVersion"
 }
 
diff --git a/ios/App/App.xcodeproj/project.pbxproj b/ios/App/App.xcodeproj/project.pbxproj
index d81b259f..f702ce68 100644
--- a/ios/App/App.xcodeproj/project.pbxproj
+++ b/ios/App/App.xcodeproj/project.pbxproj
@@ -551,7 +551,7 @@
 			repositoryURL = "https://github.com/airgap-it/airgap-sapling";
 			requirement = {
 				kind = upToNextMajorVersion;
-				minimumVersion = 0.0.6;
+				minimumVersion = 0.0.7;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */
diff --git a/ios/App/App.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ios/App/App.xcworkspace/xcshareddata/swiftpm/Package.resolved
index cc5a0400..dae43ad0 100644
--- a/ios/App/App.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/ios/App/App.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,16 +1,14 @@
 {
-  "object": {
-    "pins": [
-      {
-        "package": "AirGapSapling",
-        "repositoryURL": "https://github.com/airgap-it/airgap-sapling",
-        "state": {
-          "branch": null,
-          "revision": "c6606fce5d84cea678414681b13ef5efb3629a7e",
-          "version": "0.0.6"
-        }
+  "pins" : [
+    {
+      "identity" : "airgap-sapling",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/airgap-it/airgap-sapling",
+      "state" : {
+        "revision" : "00848f05c305c9997c8f7325527ddc20de7edd2b",
+        "version" : "0.0.7"
       }
-    ]
-  },
-  "version": 1
+    }
+  ],
+  "version" : 2
 }
diff --git a/package.json b/package.json
index c6fd5109..119dcfec 100644
--- a/package.json
+++ b/package.json
@@ -37,10 +37,10 @@
     "apply-diagnostic-modules": "node apply-diagnostic-modules.js"
   },
   "dependencies": {
-    "@airgap/angular-core": "0.0.26",
-    "@airgap/angular-ngrx": "0.0.26",
-    "@airgap/coinlib-core": "0.12.9",
-    "@airgap/sapling-wasm": "0.0.6",
+    "@airgap/angular-core": "0.0.27",
+    "@airgap/angular-ngrx": "0.0.27",
+    "@airgap/coinlib-core": "0.13.0",
+    "@airgap/sapling-wasm": "0.0.7",
     "@angular/common": "^11.2.9",
     "@angular/core": "^11.2.9",
     "@angular/forms": "^11.2.9",
diff --git a/yarn.lock b/yarn.lock
index b0eec843..8161e8eb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,24 +2,24 @@
 # yarn lockfile v1
 
 
-"@airgap/angular-core@0.0.26":
-  version "0.0.26"
-  resolved "https://registry.yarnpkg.com/@airgap/angular-core/-/angular-core-0.0.26.tgz#66c7fc1b67b6ee0078f30363cfa51f6031dd65c8"
-  integrity sha512-mPCDCOoTMe4d3QobRNK+ANGEWZWTUlWPAVO/5bSX7ZlRTLzsJfqK5JerKxk5jmB2jd7X7sHOpQJuhiDTt57ZDA==
+"@airgap/angular-core@0.0.27":
+  version "0.0.27"
+  resolved "https://registry.yarnpkg.com/@airgap/angular-core/-/angular-core-0.0.27.tgz#dce627883f5204395a462e9bd8232b3abd65ae59"
+  integrity sha512-jqvdd8O3iZWE6pN9ISxsIGdAs7NZaX/rAvEK2iKdOYJAtJMF5bPKjFT8unU/NRHD3zEykz14u9dvU59VN9596Q==
   dependencies:
     tslib "^2.2.0"
 
-"@airgap/angular-ngrx@0.0.26":
-  version "0.0.26"
-  resolved "https://registry.yarnpkg.com/@airgap/angular-ngrx/-/angular-ngrx-0.0.26.tgz#c01737a9048d3bfab84f3eaa44d80bf05de4b9b2"
-  integrity sha512-ud+POG5i/ahzily48sSS8WlN7l95DYqIP4g3u3PR+Q5qSKhZNrODf4330hFCFbCpYE7VywrRS7wd4yvQM7s4iA==
+"@airgap/angular-ngrx@0.0.27":
+  version "0.0.27"
+  resolved "https://registry.yarnpkg.com/@airgap/angular-ngrx/-/angular-ngrx-0.0.27.tgz#58d2e96e390481c1e381a8d3fce7518deed25d6c"
+  integrity sha512-P1dTpp8/NPhNdGy7aAIl1hsYvklrt4eo2DeLC4BQB8nxqAFNxZKsKb1MmqttJ2QuZwjIAwfKhmqGg1seY210RQ==
   dependencies:
     tslib "^2.2.0"
 
-"@airgap/coinlib-core@0.12.9":
-  version "0.12.9"
-  resolved "https://registry.yarnpkg.com/@airgap/coinlib-core/-/coinlib-core-0.12.9.tgz#ab5d5ab8ba8457ee8abf39273882fb65653d05cb"
-  integrity sha512-IknICQpx+mPQwOXzRSzZBvdBbOFJTmNijYWki/2SdIOsZz77PpFkHZ4+dw5nK8/6uI6+X2XA+dkGOtvgXdGdVA==
+"@airgap/coinlib-core@0.13.0":
+  version "0.13.0"
+  resolved "https://registry.yarnpkg.com/@airgap/coinlib-core/-/coinlib-core-0.13.0.tgz#0f45310fbd3b03386c4d439bb70db3118a728f01"
+  integrity sha512-MWrORGoqIhqwhrMfdfL/ynOHs5Hru6Zk0BLjIcQIPFOlKElzPFgX2VK9YxLfKh1bCgQ11atOOePwvbNLTwihug==
   dependencies:
     "@airgap/sapling-wasm" "0.0.5"
     "@ethereumjs/common" "2.6.0"
@@ -37,10 +37,10 @@
   resolved "https://registry.npmjs.org/@airgap/sapling-wasm/-/sapling-wasm-0.0.5.tgz"
   integrity sha512-u3dCsqC4WqTlscAU6p5BED+O/tXEDRcIzeOf7OTtz4zoK8wyMX6ZcJImZONhYG6IKu8cSc8eQNwm6fghHL3SxA==
 
-"@airgap/sapling-wasm@0.0.6":
-  version "0.0.6"
-  resolved "https://registry.npmjs.org/@airgap/sapling-wasm/-/sapling-wasm-0.0.6.tgz"
-  integrity sha512-hGD1ZMe3aLIJdjRxq6KVLjMkxza9BW2AZxJEWtVOLAwJDvUyb4yw+i2hnjIKve2kO82m6UJ3tJIDGhbZ4gU6eg==
+"@airgap/sapling-wasm@0.0.7":
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/@airgap/sapling-wasm/-/sapling-wasm-0.0.7.tgz#b88356f44807bf91405a9dc7c4111c995f269343"
+  integrity sha512-IMODbGPTBYKuO5ztiHX9C1PTlhqZvmVWv7m7zj5+VMcbBxrk4+jBAf7FYTH5l+IUsNMaHBOuh8Qq3A1b/pm7jQ==
 
 "@angular-devkit/architect@0.1102.14", "@angular-devkit/architect@^0.1102.8":
   version "0.1102.14"