diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
new file mode 100644
index 000000000..b02835726
--- /dev/null
+++ b/.github/pull_request_template.md
@@ -0,0 +1,36 @@
+<!--
+     Before submitting a Pull Request, please consider the following to speed up reviews:
+     - 👷‍♀️ Create small PRs. Large PRs can usually be broken down into incremental PRs.
+     - 🚩 Do you already have several open PRs? Consider finishing or asking for help with existing PRs first.
+     - 🔧 Does your PR reference a discussed and approved issue, especially for personal or edge-case requests?
+     - 💡 Is the solution agreed upon? Save rework time by discussing strategy before coding.
+-->
+
+## Description
+
+
+## Related Issues or Discussions
+
+- Closes #
+
+## QA Instructions, Screenshots, Recordings
+
+_Please replace this line with instructions on how to test or view your changes, as well as any before/after
+images for UI changes._
+
+### Reviewer Checklist
+
+_Please replace the list below with specific features you want reviewers to look at._
+
+*Reviewers, refer to this list when testing features, or suggest new items *
+- [ ] Verify new features are functional
+  - [ ] Feature A does X
+  - [ ] Feature B does Y
+- [ ] Verify old features have not broken
+  - [ ] Feature Z can still be used
+- [ ] Test for edge cases / try to break things
+  - [ ] Feature A handles negative numbers
+- [ ] Identify opportunities for simplification and refactoring
+- [ ] Check for code legibility and appropriate comments
+
+<details><summary>Copy this list</summary>
diff --git a/client/homebrew/editor/snippetbar/snippetbar.jsx b/client/homebrew/editor/snippetbar/snippetbar.jsx
index af493c961..f2680079e 100644
--- a/client/homebrew/editor/snippetbar/snippetbar.jsx
+++ b/client/homebrew/editor/snippetbar/snippetbar.jsx
@@ -70,7 +70,7 @@ const Snippetbar = createClass({
 	mergeCustomizer : function(oldValue, newValue, key) {
 		if(key == 'snippets') {
 			const result = _.reverse(_.unionBy(_.reverse(newValue), _.reverse(oldValue), 'name')); // Join snippets together, with preference for the child theme over the parent theme
-			return _.filter(result, 'gen'); //Only keep snippets with a 'gen' property.
+			return result.filter(snip => snip.gen || snip.subsnippets);
 		}
 	},
 
diff --git a/client/homebrew/pages/vaultPage/vaultPage.less b/client/homebrew/pages/vaultPage/vaultPage.less
index 49b988ee4..95e6b4c69 100644
--- a/client/homebrew/pages/vaultPage/vaultPage.less
+++ b/client/homebrew/pages/vaultPage/vaultPage.less
@@ -1,32 +1,13 @@
-body {
-	height : 100vh;
-
-	.content { height : 100%; }
-
-	small {
-		font-size : 10pt;
-		color     : #555555;
-
-		a { color : #333333; }
-	}
-
-	code {
-		padding-inline : 5px;
-		background     : lightgrey;
-		border-radius  : 5px;
-	}
-
-	*:not(input) { user-select : none; }
-}
-
 .vaultPage {
 	height           : 100%;
 	overflow-y       : hidden;
 	background-color : #2C3E50;
-	
+
+	*:not(input) { user-select : none; }
 
 	.content {
 		background : #2C3E50;
+		height: 100%;
 
 		.dataGroup {
 			width      : 100%;
@@ -37,11 +18,24 @@ body {
 				position : relative;
 				padding  : 50px clamp(20px, 4vw, 50px);
 
+				small {
+					font-size : 10pt;
+					color     : #555555;
+			
+					a { color : #333333; }
+				}
+
+				code {
+					padding-inline : 5px;
+					background     : lightgrey;
+					border-radius  : 5px;
+					font-family    : monospace;
+				}
+
 				h1, h2, h3, h4 {
 					font-family    : 'CodeBold';
 					letter-spacing : 2px;
 				}
-
 				
 				legend {
 					h3 {
@@ -144,8 +138,6 @@ body {
 						}
 					}
 
-					
-
 					#searchButton {
 						position : absolute;
 						right    : 20px;
@@ -166,7 +158,6 @@ body {
 				overflow-y     : auto;
 				font-family    : 'BookInsanityRemake';
 				font-size      : 0.34cm;
-
 				
 				h3 {
 					font-family : 'Open Sans';
diff --git a/package-lock.json b/package-lock.json
index f138734cc..ed0cbf1f1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -52,7 +52,7 @@
       "devDependencies": {
         "@stylistic/stylelint-plugin": "^3.0.1",
         "eslint": "^9.9.1",
-        "eslint-plugin-jest": "^28.8.2",
+        "eslint-plugin-jest": "^28.8.3",
         "eslint-plugin-react": "^7.35.2",
         "globals": "^15.9.0",
         "jest": "^29.7.0",
@@ -5878,9 +5878,9 @@
       }
     },
     "node_modules/eslint-plugin-jest": {
-      "version": "28.8.2",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-28.8.2.tgz",
-      "integrity": "sha512-mC3OyklHmS5i7wYU1rGId9EnxRI8TVlnFG56AE+8U9iRy6zwaNygZR+DsdZuCL0gRG0wVeyzq+uWcPt6yJrrMA==",
+      "version": "28.8.3",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-28.8.3.tgz",
+      "integrity": "sha512-HIQ3t9hASLKm2IhIOqnu+ifw7uLZkIlR7RYNv7fMcEi/p0CIiJmfriStQS2LDkgtY4nyLbIZAD+JL347Yc2ETQ==",
       "dev": true,
       "dependencies": {
         "@typescript-eslint/utils": "^6.0.0 || ^7.0.0 || ^8.0.0"
diff --git a/package.json b/package.json
index c31e59094..8248f4304 100644
--- a/package.json
+++ b/package.json
@@ -127,7 +127,7 @@
   "devDependencies": {
     "@stylistic/stylelint-plugin": "^3.0.1",
     "eslint": "^9.9.1",
-    "eslint-plugin-jest": "^28.8.2",
+    "eslint-plugin-jest": "^28.8.3",
     "eslint-plugin-react": "^7.35.2",
     "globals": "^15.9.0",
     "jest": "^29.7.0",