diff --git a/snippets/articles/template.md b/snippets/articles/story-template.md
similarity index 76%
rename from snippets/articles/template.md
rename to snippets/articles/story-template.md
index f748a08cf..3f5d8cd08 100644
--- a/snippets/articles/template.md
+++ b/snippets/articles/story-template.md
@@ -6,7 +6,7 @@ language: javascript
 tags: [webdev]
 author: chalarangelo
 cover: image
-excerpt: A short summary of your story up to 180 characters long.
+excerpt: A short summary of your story up to 140 characters long.
 dateModified: 2021-06-13T05:00:00-04:00
 ---
 
diff --git a/snippets/css/template.md b/snippets/css/snippet-template.md
similarity index 97%
rename from snippets/css/template.md
rename to snippets/css/snippet-template.md
index b566cd4f2..43212cb21 100644
--- a/snippets/css/template.md
+++ b/snippets/css/snippet-template.md
@@ -2,7 +2,7 @@
 title: Snippet Name
 type: snippet
 language: css
-tags: [other]
+tags: [layout]
 cover: image
 dateModified: 2021-06-13T05:00:00-04:00
 ---
diff --git a/snippets/css/story-template.md b/snippets/css/story-template.md
new file mode 100644
index 000000000..470c8d3fa
--- /dev/null
+++ b/snippets/css/story-template.md
@@ -0,0 +1,34 @@
+---
+title: My amazing story
+shortTitle: Amazing story
+type: story
+language: css
+tags: [layout]
+cover: image
+excerpt: A short summary of your story up to 140 characters long.
+dateModified: 2021-06-13T05:00:00-04:00
+---
+
+Explain briefly what the snippet does.
+
+- Explain briefly how the snippet works.
+- Use bullet points for your snippet's explanation.
+- Try to explain everything briefly but clearly.
+
+```html
+<div class="my-snippet"></div>
+```
+
+```css
+.my-snippet {
+  background-color: #fff;
+  border: 1px solid #000;
+  border-radius: 4px;
+}
+```
+
+```js
+console.log(
+  "This is optional, if your snippet doesn't require JavaScript, be sure to delete this block!"
+)
+```
diff --git a/snippets/git/template.md b/snippets/git/snippet-template.md
similarity index 100%
rename from snippets/git/template.md
rename to snippets/git/snippet-template.md
diff --git a/snippets/git/story-template.md b/snippets/git/story-template.md
new file mode 100644
index 000000000..fb9e8d508
--- /dev/null
+++ b/snippets/git/story-template.md
@@ -0,0 +1,34 @@
+---
+title: My amazing story
+shortTitle: Amazing story
+type: story
+language: git
+tags: [branch]
+cover: image
+excerpt: A short summary of your story up to 140 characters long.
+dateModified: 2021-06-13T05:00:00-04:00
+---
+
+Explain briefly what the snippet does.
+
+- Explain briefly how the snippet works.
+- Use bullet points for your snippet's explanation.
+- Try to explain everything briefly but clearly.
+
+```html
+<div class="my-snippet"></div>
+```
+
+```css
+.my-snippet {
+  background-color: #fff;
+  border: 1px solid #000;
+  border-radius: 4px;
+}
+```
+
+```js
+console.log(
+  "This is optional, if your snippet doesn't require JavaScript, be sure to delete this block!"
+)
+```
diff --git a/snippets/js/template.md b/snippets/js/snippet-template.md
similarity index 100%
rename from snippets/js/template.md
rename to snippets/js/snippet-template.md
diff --git a/snippets/js/story-template.md b/snippets/js/story-template.md
new file mode 100644
index 000000000..fe25d1010
--- /dev/null
+++ b/snippets/js/story-template.md
@@ -0,0 +1,34 @@
+---
+title: My amazing story
+shortTitle: Amazing story
+type: story
+language: javascript
+tags: [array]
+cover: image
+excerpt: A short summary of your story up to 140 characters long.
+dateModified: 2021-06-13T05:00:00-04:00
+---
+
+Explain briefly what the snippet does.
+
+- Explain briefly how the snippet works.
+- Use bullet points for your snippet's explanation.
+- Try to explain everything briefly but clearly.
+
+```html
+<div class="my-snippet"></div>
+```
+
+```css
+.my-snippet {
+  background-color: #fff;
+  border: 1px solid #000;
+  border-radius: 4px;
+}
+```
+
+```js
+console.log(
+  "This is optional, if your snippet doesn't require JavaScript, be sure to delete this block!"
+)
+```
diff --git a/snippets/python/template.md b/snippets/python/snippet-template.md
similarity index 100%
rename from snippets/python/template.md
rename to snippets/python/snippet-template.md
diff --git a/snippets/python/story-template.md b/snippets/python/story-template.md
new file mode 100644
index 000000000..6d6d47082
--- /dev/null
+++ b/snippets/python/story-template.md
@@ -0,0 +1,34 @@
+---
+title: My amazing story
+shortTitle: Amazing story
+type: story
+language: python
+tags: [list]
+cover: image
+excerpt: A short summary of your story up to 140 characters long.
+dateModified: 2021-06-13T05:00:00-04:00
+---
+
+Explain briefly what the snippet does.
+
+- Explain briefly how the snippet works.
+- Use bullet points for your snippet's explanation.
+- Try to explain everything briefly but clearly.
+
+```html
+<div class="my-snippet"></div>
+```
+
+```css
+.my-snippet {
+  background-color: #fff;
+  border: 1px solid #000;
+  border-radius: 4px;
+}
+```
+
+```js
+console.log(
+  "This is optional, if your snippet doesn't require JavaScript, be sure to delete this block!"
+)
+```
diff --git a/snippets/react/template.md b/snippets/react/snippet-template.md
similarity index 94%
rename from snippets/react/template.md
rename to snippets/react/snippet-template.md
index 1b7b39729..612f6e01c 100644
--- a/snippets/react/template.md
+++ b/snippets/react/snippet-template.md
@@ -2,7 +2,7 @@
 title: Component Name
 type: snippet
 language: react
-tags: [components,state,effect]
+tags: [hooks]
 cover: image
 dateModified: 2021-06-13T05:00:00-04:00
 ---
diff --git a/snippets/react/story-template.md b/snippets/react/story-template.md
new file mode 100644
index 000000000..06150ce0e
--- /dev/null
+++ b/snippets/react/story-template.md
@@ -0,0 +1,34 @@
+---
+title: My amazing story
+shortTitle: Amazing story
+type: story
+language: react
+tags: [hooks]
+cover: image
+excerpt: A short summary of your story up to 140 characters long.
+dateModified: 2021-06-13T05:00:00-04:00
+---
+
+Explain briefly what the snippet does.
+
+- Explain briefly how the snippet works.
+- Use bullet points for your snippet's explanation.
+- Try to explain everything briefly but clearly.
+
+```html
+<div class="my-snippet"></div>
+```
+
+```css
+.my-snippet {
+  background-color: #fff;
+  border: 1px solid #000;
+  border-radius: 4px;
+}
+```
+
+```js
+console.log(
+  "This is optional, if your snippet doesn't require JavaScript, be sure to delete this block!"
+)
+```