diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..0ab1e12
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,9 @@
+root = true
+
+[*.{md,py,txt}]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
diff --git a/.gitignore b/.gitignore
index b6e4761..38a24a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,7 @@
 __pycache__/
 *.py[cod]
 *$py.class
-
+.idea/
 # C extensions
 *.so
 
@@ -10,7 +10,7 @@ __pycache__/
 .Python
 build/
 develop-eggs/
-dist/
+/dist/
 downloads/
 eggs/
 .eggs/
diff --git a/CHANGELOGS.md b/CHANGELOGS.md
new file mode 100644
index 0000000..c64e7f4
--- /dev/null
+++ b/CHANGELOGS.md
@@ -0,0 +1,36 @@
+# CHANGELOGS
+
+## 1.1.0
+
+* Bulk refactors and code documentation
+* New commands for `static.py` files
+    * `--serve` for livewatch changes
+    * `--watch` for watch specific files and folders.
+    * `--port` especiffy serve port
+
+## 1.0.0
+
+* Back to namespace method for write templates names
+    * Example: `html5up/massively` instead of just `massively`
+* Template assets are not included in the library to minimize the size of the library, they were moved to
+  a [separate repository](https://github.com/jamstackpy/jamstack-templates).
+
+## 0.1.0
+
+* Improve **Plain** template
+* Add new templates (massively, phantom)
+* When creating a project, instead of writing the template like this: **html5up/massively**, you can use the name
+  directly, i.e. **massively**
+* The assets of each template are now included in the library
+
+## 0.0.4
+
+* Add README.md info
+
+## 0.0.3
+
+* Add plain template
+
+## 0.0.1
+
+* Initial release
diff --git a/README.md b/README.md
index e38b842..8d4ee1d 100644
--- a/README.md
+++ b/README.md
@@ -1,36 +1,75 @@
-# jamstack
+<div align="center">
+  <img alt="Jamstack logo" src="https://i.imgur.com/sXUAdYJ.png" height="217" />
+</div>
 
 ![](https://img.shields.io/pypi/v/jamstack)
 
-Install
+Also known as Jamstackpy, is a tool that allows you to create static websites using the power of **Python** hand in hand
+with the [Flask](https://github.com/pallets/flask) library. Its operation is based on templates which are rendered with
+the powerful Jinja engine generating your website with all its dependencies.
+
+## Installation
 
 ```bash
 python -m pip install jamstack
 ```
 
-Create basic project
+## Create basic project
 
 ```bash
 jamstack plain <foldername>
 ```
 
-`jamstack plain myproject`
+## Templates
+
+Jamstack has templates available courtesy of [html5up](https://html5up.net).
+
+| Template                                   | Command           | Tutorial                                                                 |
+|--------------------------------------------|-------------------|--------------------------------------------------------------------------|
+| [Massively](https://html5up.net/massively) | html5up/massively |                                                                          |
+| [Phantom](https://html5up.net/phantom)     | html5up/phantom   | [**HERE**](https://github.com/jamstackpy/jamstack/wiki/Phantom-template) |
 
+The syntax is as follows:
+
+```bash
+jamstack t <template_command> <project_folder_name>
+```
 
-with available templates
+Use the `--existing` flag if you want the project to be created in an existing folder
 
 ```bash
-jamstack t <template> <foldername>
+jamstack t html5up/massively myproject --existing
 ```
 
-The only available template is 'html5up/massively' (`jamstack t html5up/massively myproject`)
+By default, projects based in templates are created without the assets (stylesheets, images, etc...) to download them,
+you must pass
+the `--jamdo` option to the `static.py` file of the respective project.
 
-Use the --existing flag if you want the project to be created in an existing folder (`jamstack t html5up/massively myproject --existing`)
+## Build
 
-Run project:
+To build the site run the file `static.py`.
 
 ```bash
 python static.py
 ```
 
-Use the --server flag if you want to start livewatch
+Your site will be generated in the **dist/** folder.
+
+## Other project command-line options
+
+| Argument  | Description                                                               |
+|-----------|---------------------------------------------------------------------------|
+| `--serve` | Optional. Start project livewatch (autoreload when files change).         |
+| `--watch` | Optional. Specify files and folders to watch. Must be separated by comma. |
+| `--port`  | Optional. Specify server port.                                            |
+
+## Sites using jamstack
+
+- [DeliciousPy Telegram Channel](https://deliciouspy.github.io/)
+- [The Flask Community Work Group](https://flaskcwg.github.io/)
+- [Abdur-Rahmaan Janhangeer](https://compileralchemy.github.io/)
+
+# TODO
+
+- [ ] Replace `python static.py --serve/--jamdo` by something like `jamstack --serve/--jamdo`
+- [ ] Remove Flask as Main requirement and just use Jinja
diff --git a/jamstack/__init__.py b/jamstack/__init__.py
index a1d58d1..9260b35 100644
--- a/jamstack/__init__.py
+++ b/jamstack/__init__.py
@@ -1,2 +1,2 @@
-version_info = (0, 0, 5)
-__version__ = ".".join([str(v) for v in version_info])
+version_info = (1, 1, 0)
+__version__ = ".".join(map(str, version_info))
diff --git a/jamstack/__main__.py b/jamstack/__main__.py
index d9dd81d..1754516 100644
--- a/jamstack/__main__.py
+++ b/jamstack/__main__.py
@@ -1,58 +1,54 @@
 import os
 from pathlib import Path
-from jamstack.api.file import trycopytree
 
 import click
 
+from jamstack.api.file import trycopytree
+
 package_folder = Path(__file__).parent.absolute()
 sites_path = os.path.join(package_folder, 'sites')
 
-@click.group(help="<Jamstack cli/>")
+
+@click.group(help="Jamstack command line interface")
 def cli():
     pass
 
 
-@click.command(help="<Empty, plain repo />")
+@click.command(help="Create an empty, plain repository")
 @click.argument('project_name')
 @click.option('--existing/--not-existing', default=False)
 def plain(project_name, existing):
     path = '.'
 
-    dirs_exist_ok = False
-    if existing is True:
-        dirs_exist_ok = True
     trycopytree(
         os.path.join(sites_path, 'plain'),
         os.path.join(path, project_name),
-        dirs_exist_ok=dirs_exist_ok
-        )
+        existing
+    )
 
 
-@click.command(help="<Repo by templates />")
+@click.command(help="Create a repository from a template")
 @click.argument('template')
 @click.argument('project_name')
 @click.option('--existing/--not-existing', default=False)
 def t(template, project_name, existing):
     path = '.'
+    namespace, project = template.split('/')
 
-    namespace = template.split('/')[0]
-    project = template.split('/')[1]
-
-    dirs_exist_ok = False
-    if existing is True:
-        dirs_exist_ok = True
     trycopytree(
         os.path.join(sites_path, namespace, project),
         os.path.join(path, project_name),
-        dirs_exist_ok=dirs_exist_ok
-        )
+        existing
+    )
 
 
 cli.add_command(plain)
 cli.add_command(t)
 
+
 def main():
     cli()
 
+
 if __name__ == "__main__":
     cli()
diff --git a/jamstack/api/file.py b/jamstack/api/file.py
index dad294c..86d4c8b 100644
--- a/jamstack/api/file.py
+++ b/jamstack/api/file.py
@@ -1,54 +1,33 @@
+import logging
 import os
 import shutil
 import uuid
 
-# from werkzeug.utils import secure_filename
 
-
-def trycopytree(source, dest, verbose=False, dirs_exist_ok=False):
+def trycopytree(source, dest, dirs_exist_ok):
     """
-    Recursive copy of folder
+    Copy a file or directory from source to dest.
 
     Parameters
     ----------
     source: str
-        source folder path
+        source file or directory path
     dest: str
-        destination folder path
-
+        destination file or directory path
+    dirs_exist_ok:
+        especifies if the project folder already exist
     Returns
     -------
     None
     """
     try:
         shutil.copytree(source, dest, dirs_exist_ok=dirs_exist_ok)
-        if verbose:
-            print("done copying {} to {}".format(source, dest))
-    except Exception as e:
-        print(e)
-
-
-def trycopy(source, dest, verbose=False):
-    """
-    Non-ecursive copy of folder
-
-    Parameters
-    ----------
-    source: str
-        source folder path
-    dest: str
-        destination folder path
-
-    Returns
-    -------
-    None
-    """
-    try:
-        shutil.copy(source, dest)
-        if verbose:
-            print("done copying {} to {}".format(source, dest))
+        os.mkdir(os.path.join(dest, 'dist'))  # Maybe place in static.py?
+        print('Project created successfully! :)')
+    except FileExistsError:
+        print('Project folder already exist! Use --existing if you want to override it.')
     except Exception as e:
-        print(e)
+        logging.exception(e)
 
 
 def trymkdir(path, verbose=False):
@@ -59,6 +38,8 @@ def trymkdir(path, verbose=False):
     ----------
     path: str
         path with folder already in
+    verbose: bool, optional
+        If True, print debug information. Default is False.
 
     Returns
     -------
@@ -69,7 +50,7 @@ def trymkdir(path, verbose=False):
         if verbose:
             print("created dir at", path)
     except Exception as e:
-        print(e)
+        logging.exception(e)
 
 
 def trymkfile(path, content, verbose=False):
@@ -82,20 +63,22 @@ def trymkfile(path, content, verbose=False):
         path to create file with filename included
     content: str
         file content
+    verbose: bool, optional
+        If True, print debug information. Default is False.
 
     Returns
     -------
     None
     """
     try:
-        with open(path, "w+") as f:
+        with open(path, "x") as f:
             f.write(content)
         if verbose:
             print("file created at {}".format(path))
             print("with content:")
             print(content)
     except Exception as e:
-        print(e)
+        logging.exception(e)
 
 
 def absdiroffile(filepath):
@@ -117,18 +100,60 @@ def absdiroffile(filepath):
 
 
 def get_folders(path):
-    dirs = [d for d in os.listdir(path) if os.path.isdir(os.path.join(path, d))]
+    """
+    Get a list of directories in the given path.
+
+    Parameters
+    ----------
+    path: str
+        Path to search for directories.
+
+    Returns
+    -------
+    list
+        List of directories in the given path.
+    """
+    dirs = [d for d in os.listdir(
+        path) if os.path.isdir(os.path.join(path, d))]
     return dirs
 
 
 def unique_filename(fname):
+    """
+    Generate a unique filename by prepending a UUID to the given filename.
+
+    Parameters
+    ----------
+    fname: str
+        Original filename.
+
+    Returns
+    -------
+    str
+        Unique filename with prepended UUID.
+    """
     prepended = str(uuid.uuid4()).replace("-", "_")[:10]
     return "{}_{}".format(prepended, fname)
 
 
 def delete_file(path):
-    os.remove(path)
+    """
+    Delete the file at the given path.
+
+    Parameters
+    ----------
+    path: str
+        Path of the file to delete.
 
+    Returns
+    -------
+    None
+    """
+    try:
+        os.remove(path)
+        logging.info("File deleted: {}".format(path))
+    except Exception as e:
+        logging.exception(e)
 
 # def unique_sec_filename(filename):
 #     return unique_filename(secure_filename(filename))
diff --git a/jamstack/api/template.py b/jamstack/api/template.py
index 603368c..1f19945 100644
--- a/jamstack/api/template.py
+++ b/jamstack/api/template.py
@@ -1,41 +1,70 @@
-import uuid
-import datetime
 import builtins
-import string
 import copy
+import datetime
+import json
+import string
+
+from jinja2 import Environment, FileSystemLoader
 
-from jinja2 import Environment
-from jinja2 import FileSystemLoader
 
+def load_json(file):
+    with open(file, 'r') as f:
+        return json.load(f)
 
-def base_context():
-    defaults = [_ for _ in dir(builtins) 
-        if _[0] in string.ascii_lowercase and 
-        _ not in ['copyright', 'credits']
-    ]
-    attrs = [getattr(builtins, _) for _ in defaults if _ not in ['copyright', 'credits']]
 
-    builtins_dict = dict(zip(defaults, attrs))
+def get_builtins_context() -> dict:
+    """
+    Get a dictionary of built-in functions and variables.
+
+    Returns
+    -------
+    dict
+        Dictionary of built-in functions and variables.
+    """
+    builtins_dict = {}
+    for name in dir(builtins):
+        if name[0] in string.ascii_lowercase and name not in ['copyright', 'credits']:
+            value = getattr(builtins, name)
+            builtins_dict[name] = value
     return copy.deepcopy(builtins_dict)
 
 
-def generate(file_in_templates, out_path, template_dir='templates', assets_path_append='', **kwargs):
+def generate(template_name: str, output_path: str, template_dir: str = 'templates', assets_path_append: str = '',
+             context: dict = None) -> None:
     """
-    Generates necessary file(s)
-    :param file_in_templates: template to work with
-    :param out_path: output path to save the generated file to
-    :param template_dir: templates directory
-    :param assets_path_append:
-    :param kwargs: variables
-    :return: None
+    Generates necessary file(s) from a Jinja2 template.
+
+    Parameters
+    ----------
+    template_name: str
+        Template file to work with.
+    output_path: str
+        Output path to save the generated file to.
+    template_dir: str, optional
+        Templates directory. Default is 'templates'.
+    assets_path_append: str, optional
+        Path to append to assets. Default is ''.
+    context: dict, optional
+        Variables to pass to the template. Additional context variables can be provided using this parameter.
+
+    Returns
+    -------
+    None
     """
+    if context is None:
+        context = {}
 
     file_loader = FileSystemLoader(template_dir)
     env = Environment(loader=file_loader)
-    template = env.get_template(file_in_templates)
+    template = env.get_template(template_name)
+
+    context.update({
+        'year': datetime.datetime.now().year,
+        'assets_path_append': assets_path_append,
+        **get_builtins_context(),
+    })
 
-    build_id = str(uuid.uuid4())  # to be used
+    output = template.render(context)
 
-    output = template.render(kwargs, year=datetime.datetime.now().year,
-                             build_id=build_id, assets_path_append=assets_path_append)
-    print(output, file=open(out_path, 'w+', encoding="utf8"))
\ No newline at end of file
+    with open(output_path, 'w+', encoding="utf8") as f:
+        f.write(output)
diff --git a/jamstack/jamdo/jamdo.py b/jamstack/jamdo/jamdo.py
new file mode 100644
index 0000000..4ca1d2b
--- /dev/null
+++ b/jamstack/jamdo/jamdo.py
@@ -0,0 +1,54 @@
+import os
+import urllib.request
+
+import requests
+from tqdm import tqdm
+
+TEMPLATES_URL = "https://api.github.com/repos/jamstackpy/jamstack-templates/git/trees/main?recursive=1"
+
+
+def mkdirs(path):
+    if not os.path.isdir(path):
+        os.makedirs(path)
+
+
+def get_raw_url(file_path, url):
+    raw_url = url.replace(
+        'https://api.github.com/repos/',
+        'https://raw.githubusercontent.com/')
+    raw_url = raw_url.split('/git/blobs/')[0]
+    raw_url = raw_url + '/master/' + file_path
+    return raw_url
+
+
+def get_download_links(template):
+    api = requests.get(TEMPLATES_URL).json()
+    files = api['tree']
+    output = []
+    location = {}
+    for i, file in enumerate(files):
+        if template in file['path']:
+            if file['type'] == 'blob':
+                output.append([file['path'], get_raw_url(file['path'], file['url'])])
+            else:
+                location[file['path']] = i
+    return output, location
+
+
+def download(template, target_folder='*', recursive=True):
+    data = get_download_links(template)
+    files = data[0]
+    location = data[1]
+
+    if target_folder == '*':
+        start = 0
+    else:
+        start = location[target_folder]
+
+    with tqdm(total=len(files), desc="Downloading assets...") as pbar:
+        for i in files[start:]:
+            ndir = i[0].replace('templates/' + template, 'dist/assets/')
+            if recursive or ndir.split(target_folder)[1].count('/') <= 1:
+                mkdirs('.' + '/' + os.path.dirname(ndir))
+                urllib.request.urlretrieve(i[1], '.' + '/' + ndir)
+            pbar.update(1)
diff --git a/jamstack/sites/html5up/massively/info.json b/jamstack/sites/html5up/massively/info.json
index 23720a6..164df94 100644
--- a/jamstack/sites/html5up/massively/info.json
+++ b/jamstack/sites/html5up/massively/info.json
@@ -5,4 +5,4 @@
 		"instagram": "",
 		"github": ""
 	}
-}
\ No newline at end of file
+}
diff --git a/jamstack/sites/html5up/massively/settings.py b/jamstack/sites/html5up/massively/settings.py
index 5588b5a..ff5e831 100644
--- a/jamstack/sites/html5up/massively/settings.py
+++ b/jamstack/sites/html5up/massively/settings.py
@@ -1,9 +1,8 @@
-
 OUTPUT_FOLDER = 'dist/'
 info = {
-    "social":{
+    "social": {
         "facebook": "",
-        "twitter": "https://twitter.com/osdotsystem",
+        "twitter": "",
         "instagram": "",
         "github": ""
     },
@@ -12,4 +11,4 @@
         ["Page 2", "index2.html", "page_2"],
         ["Page 3", "index3.html", "page_3"],
     ]
-}
\ No newline at end of file
+}
diff --git a/jamstack/sites/html5up/massively/static.py b/jamstack/sites/html5up/massively/static.py
index d6d2729..8680250 100644
--- a/jamstack/sites/html5up/massively/static.py
+++ b/jamstack/sites/html5up/massively/static.py
@@ -1,49 +1,42 @@
-# https://github.com/pymug/website-AV19-AV20
-
-import sys
+import argparse
 from os.path import join
 
-from jamstack.api.template import generate
-from jamstack.api.template import base_context
-from flask import Flask
 from livereload import Server
 
 import settings
+from jamstack.api.template import generate
+from jamstack.jamdo.jamdo import download as download_template
 
-context = base_context()
-context.update({
-    "info": settings.info
-})
-
-
-def main(args):
-    def gen():
-        generate('index.html', join(settings.OUTPUT_FOLDER, 'index.html'), **context)
-        generate('index2.html', join(settings.OUTPUT_FOLDER, 'index2.html'), **context)
-        generate('index3.html', join(settings.OUTPUT_FOLDER, 'index3.html'), **context)
-
-    if len(args) > 1 and args[1] == '--server':
-        app = Flask(__name__)
-
-        # remember to use DEBUG mode for templates auto reload
-        # https://github.com/lepture/python-livereload/issues/144
-        app.debug = True
-        server = Server(app.wsgi_app)
 
-        # run a shell command
-        # server.watch('.', 'make static')
+def generate_site():
+    extra_context = {"info": settings.info}
 
-        # run a function
+    generate('index.html', join(settings.OUTPUT_FOLDER, 'index.html'), context=extra_context)
+    generate('index2.html', join(settings.OUTPUT_FOLDER, 'index2.html'), context=extra_context)
+    generate('index3.html', join(settings.OUTPUT_FOLDER, 'index3.html'), context=extra_context)
 
-        server.watch('.', gen, delay=5)
-        server.watch('*.py')
 
-        # output stdout into a file
-        # server.watch('style.less', shell('lessc style.less', output='style.css'))
+def serve_files(port, watch):
+    server = Server()
+    for x in watch.split('|'):
+        server.watch(x, func=generate_site)
+    try:
+        server.serve(root=settings.OUTPUT_FOLDER, port=port)
+    except KeyboardInterrupt:
+        print("Shutting down...")
 
-        server.serve()
-    else:
-        gen()
 
 if __name__ == '__main__':
-    main(sys.argv)
+    parser = argparse.ArgumentParser(description='Project manager.')
+    parser.add_argument('--serve', action='store_true', help='Serve files for livewatch')
+    parser.add_argument('--jamdo', action='store_true', help='Download template assets')
+    parser.add_argument('--watch', type=str, default='*.py|templates|templates/sections', help='Files/Folders to watch')
+    parser.add_argument('--port', type=int, default=8000, help='Port to serve')
+    args = parser.parse_args()
+
+    if args.serve:
+        serve_files(args.port, args.watch)
+    elif args.jamdo:
+        download_template('html5up/massively')
+    else:
+        generate_site()
diff --git a/jamstack/sites/html5up/massively/templates/index.html b/jamstack/sites/html5up/massively/templates/index.html
index 1bfc518..2b80bd0 100644
--- a/jamstack/sites/html5up/massively/templates/index.html
+++ b/jamstack/sites/html5up/massively/templates/index.html
@@ -10,32 +10,24 @@
 		{% include 'sections/head_content.html' %}
 	</head>
 	<body class="is-preload">
-
 		<!-- Wrapper -->
-			<div id="wrapper">
-
-				<!-- Header -->
-					<header id="header">
-						<a href="index.html" class="logo">Massively</a>
-					</header>
-
-				{% include 'sections/nav.html' %}
-
-				{% include 'sections/main.html' %}
-
-				{% include 'sections/footer.html' %}
-
-				<!-- Copyright -->
-					<div id="copyright">
-						<ul>
-							<li>&copy; Untitled</li><li>Design: <a href="https://html5up.net">HTML5 UP</a></li>
-							<br />
-							<li><a href="https://pypi.org/project/jamstack/">generated using jamstack</a></li>
-						</ul>
-					</div>
-
+		<div id="wrapper">
+			<!-- Header -->
+			<header id="header">
+				<a href="index.html" class="logo">Massively</a>
+			</header>
+			{% include 'sections/nav.html' %}
+			{% include 'sections/main.html' %}
+			{% include 'sections/footer.html' %}
+			<!-- Copyright -->
+			<div id="copyright">
+				<ul>
+					<li>&copy; Untitled</li><li>Design: <a href="https://html5up.net">HTML5 UP</a></li>
+					<br />
+					<li><a href="https://pypi.org/project/jamstack/">generated using jamstack</a></li>
+				</ul>
 			</div>
-
+		</div>
 		{% include 'sections/bottom_scripts.html' %}
 	</body>
 </html>
\ No newline at end of file
diff --git a/jamstack/sites/html5up/massively/templates/index2.html b/jamstack/sites/html5up/massively/templates/index2.html
index 3a5966f..76edb3c 100644
--- a/jamstack/sites/html5up/massively/templates/index2.html
+++ b/jamstack/sites/html5up/massively/templates/index2.html
@@ -10,32 +10,24 @@
 		{% include 'sections/head_content.html' %}
 	</head>
 	<body class="is-preload">
-
 		<!-- Wrapper -->
-			<div id="wrapper">
-
-				<!-- Header -->
-					<header id="header">
-						<a href="index.html" class="logo">Massively</a>
-					</header>
-
-				{% include 'sections/nav.html' %}
-
-				{% include 'sections/main.html' %}
-
-				{% include 'sections/footer.html' %}
-
-				<!-- Copyright -->
-					<div id="copyright">
-						<ul>
-							<li>&copy; Untitled</li><li>Design: <a href="https://html5up.net">HTML5 UP</a></li>
-							<br />
-							<li><a href="https://pypi.org/project/jamstack/">generated using jamstack</a></li>
-						</ul>
-					</div>
-
+		<div id="wrapper">
+			<!-- Header -->
+			<header id="header">
+				<a href="index.html" class="logo">Massively</a>
+			</header>
+			{% include 'sections/nav.html' %}
+			{% include 'sections/main.html' %}
+			{% include 'sections/footer.html' %}
+			<!-- Copyright -->
+			<div id="copyright">
+				<ul>
+					<li>&copy; Untitled</li><li>Design: <a href="https://html5up.net">HTML5 UP</a></li>
+					<br />
+					<li><a href="https://pypi.org/project/jamstack/">generated using jamstack</a></li>
+				</ul>
 			</div>
-
+		</div>
 		{% include 'sections/bottom_scripts.html' %}
 	</body>
 </html>
\ No newline at end of file
diff --git a/jamstack/sites/html5up/massively/templates/index3.html b/jamstack/sites/html5up/massively/templates/index3.html
index 44825bc..37733ff 100644
--- a/jamstack/sites/html5up/massively/templates/index3.html
+++ b/jamstack/sites/html5up/massively/templates/index3.html
@@ -10,32 +10,24 @@
 		{% include 'sections/head_content.html' %}
 	</head>
 	<body class="is-preload">
-
 		<!-- Wrapper -->
-			<div id="wrapper">
-
-				<!-- Header -->
-					<header id="header">
-						<a href="index.html" class="logo">Massively</a>
-					</header>
-
-				{% include 'sections/nav.html' %}
-
-				{% include 'sections/main.html' %}
-
-				{% include 'sections/footer.html' %}
-
-				<!-- Copyright -->
-					<div id="copyright">
-						<ul>
-							<li>&copy; Untitled</li><li>Design: <a href="https://html5up.net">HTML5 UP</a></li>
-							<br />
-							<li><a href="https://pypi.org/project/jamstack/">generated using jamstack</a></li>
-						</ul>
-					</div>
-
+		<div id="wrapper">
+			<!-- Header -->
+			<header id="header">
+				<a href="index.html" class="logo">Massively</a>
+			</header>
+			{% include 'sections/nav.html' %}
+			{% include 'sections/main.html' %}
+			{% include 'sections/footer.html' %}
+			<!-- Copyright -->
+			<div id="copyright">
+				<ul>
+					<li>&copy; Untitled</li><li>Design: <a href="https://html5up.net">HTML5 UP</a></li>
+					<br />
+					<li><a href="https://pypi.org/project/jamstack/">generated using jamstack</a></li>
+				</ul>
 			</div>
-
+		</div>
 		{% include 'sections/bottom_scripts.html' %}
 	</body>
 </html>
\ No newline at end of file
diff --git a/jamstack/sites/html5up/massively/templates/sections/bottom_scripts.html b/jamstack/sites/html5up/massively/templates/sections/bottom_scripts.html
index 5f25b89..962cb03 100644
--- a/jamstack/sites/html5up/massively/templates/sections/bottom_scripts.html
+++ b/jamstack/sites/html5up/massively/templates/sections/bottom_scripts.html
@@ -1,8 +1,8 @@
 <!-- Scripts -->
-			<script src="assets/js/jquery.min.js"></script>
-			<script src="assets/js/jquery.scrollex.min.js"></script>
-			<script src="assets/js/jquery.scrolly.min.js"></script>
-			<script src="assets/js/browser.min.js"></script>
-			<script src="assets/js/breakpoints.min.js"></script>
-			<script src="assets/js/util.js"></script>
-			<script src="assets/js/main.js"></script>
\ No newline at end of file
+<script src="assets/js/jquery.min.js"></script>
+<script src="assets/js/jquery.scrollex.min.js"></script>
+<script src="assets/js/jquery.scrolly.min.js"></script>
+<script src="assets/js/browser.min.js"></script>
+<script src="assets/js/breakpoints.min.js"></script>
+<script src="assets/js/util.js"></script>
+<script src="assets/js/main.js"></script>
\ No newline at end of file
diff --git a/jamstack/sites/html5up/massively/templates/sections/footer.html b/jamstack/sites/html5up/massively/templates/sections/footer.html
index 10c8fa8..1943c19 100644
--- a/jamstack/sites/html5up/massively/templates/sections/footer.html
+++ b/jamstack/sites/html5up/massively/templates/sections/footer.html
@@ -1,48 +1,48 @@
 <!-- Footer -->
-					<footer id="footer">
-						<section>
-							<form method="post" action="#">
-								<div class="fields">
-									<div class="field">
-										<label for="name">Name</label>
-										<input type="text" name="name" id="name" />
-									</div>
-									<div class="field">
-										<label for="email">Email</label>
-										<input type="text" name="email" id="email" />
-									</div>
-									<div class="field">
-										<label for="message">Message</label>
-										<textarea name="message" id="message" rows="3"></textarea>
-									</div>
-								</div>
-								<ul class="actions">
-									<li><input type="submit" value="Send Message" /></li>
-								</ul>
-							</form>
-						</section>
-						<section class="split contact">
-							<section class="alt">
-								<h3>Address</h3>
-								<p>1234 Somewhere Road #87257<br />
-								Nashville, TN 00000-0000</p>
-							</section>
-							<section>
-								<h3>Phone</h3>
-								<p><a href="#">(000) 000-0000</a></p>
-							</section>
-							<section>
-								<h3>Email</h3>
-								<p><a href="#">info@untitled.tld</a></p>
-							</section>
-							<section>
-								<h3>Social</h3>
-								<ul class="icons alt">
-									<li><a href="{{ info['social']['twitter'] }}" class="icon brands alt fa-twitter"><span class="label">Twitter</span></a></li>
-									<li><a href="{{ info['social']['facebook'] }}" class="icon brands alt fa-facebook-f"><span class="label">Facebook</span></a></li>
-									<li><a href="{{ info['social']['instagram'] }}" class="icon brands alt fa-instagram"><span class="label">Instagram</span></a></li>
-									<li><a href="{{ info['social']['github'] }}" class="icon brands alt fa-github"><span class="label">GitHub</span></a></li>
-								</ul>
-							</section>
-						</section>
-					</footer>
\ No newline at end of file
+<footer id="footer">
+	<section>
+		<form method="post" action="#">
+			<div class="fields">
+				<div class="field">
+					<label for="name">Name</label>
+					<input type="text" name="name" id="name" />
+				</div>
+				<div class="field">
+					<label for="email">Email</label>
+					<input type="text" name="email" id="email" />
+				</div>
+				<div class="field">
+					<label for="message">Message</label>
+					<textarea name="message" id="message" rows="3"></textarea>
+				</div>
+			</div>
+			<ul class="actions">
+				<li><input type="submit" value="Send Message" /></li>
+			</ul>
+		</form>
+	</section>
+	<section class="split contact">
+		<section class="alt">
+			<h3>Address</h3>
+			<p>1234 Somewhere Road #87257<br />
+			Nashville, TN 00000-0000</p>
+		</section>
+		<section>
+			<h3>Phone</h3>
+			<p><a href="#">(000) 000-0000</a></p>
+		</section>
+		<section>
+			<h3>Email</h3>
+			<p><a href="#">info@untitled.tld</a></p>
+		</section>
+		<section>
+			<h3>Social</h3>
+			<ul class="icons alt">
+				<li><a href="{{ info['social']['twitter'] }}" class="icon brands alt fa-twitter"><span class="label">Twitter</span></a></li>
+				<li><a href="{{ info['social']['facebook'] }}" class="icon brands alt fa-facebook-f"><span class="label">Facebook</span></a></li>
+				<li><a href="{{ info['social']['instagram'] }}" class="icon brands alt fa-instagram"><span class="label">Instagram</span></a></li>
+				<li><a href="{{ info['social']['github'] }}" class="icon brands alt fa-github"><span class="label">GitHub</span></a></li>
+			</ul>
+		</section>
+	</section>
+</footer>
\ No newline at end of file
diff --git a/jamstack/sites/html5up/massively/templates/sections/head_content.html b/jamstack/sites/html5up/massively/templates/sections/head_content.html
index dfd61b7..bbb1284 100644
--- a/jamstack/sites/html5up/massively/templates/sections/head_content.html
+++ b/jamstack/sites/html5up/massively/templates/sections/head_content.html
@@ -1,6 +1,5 @@
-
-		<title>Generic Page - Massively by HTML5 UP</title>
-		<meta charset="utf-8" />
-		<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" />
-		<link rel="stylesheet" href="assets/css/main.css" />
-		<noscript><link rel="stylesheet" href="assets/css/noscript.css" /></noscript>
\ No newline at end of file
+<title>Generic Page - Massively by HTML5 UP</title>
+<meta charset="utf-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" />
+<link rel="stylesheet" href="assets/css/main.css" />
+<noscript><link rel="stylesheet" href="assets/css/noscript.css" /></noscript>
\ No newline at end of file
diff --git a/jamstack/sites/html5up/massively/templates/sections/main.html b/jamstack/sites/html5up/massively/templates/sections/main.html
index 557ad41..3b4073e 100644
--- a/jamstack/sites/html5up/massively/templates/sections/main.html
+++ b/jamstack/sites/html5up/massively/templates/sections/main.html
@@ -1,19 +1,17 @@
 <!-- Main -->
-					<div id="main">
-
-						<!-- Post -->
-							<section class="post">
-								<header class="major">
-									<span class="date">April 25, 2017</span>
-									<h1>This is a<br />
-									Generic Page</h1>
-									<p>Aenean ornare velit lacus varius enim ullamcorper proin aliquam<br />
-									facilisis ante sed etiam magna interdum congue. Lorem ipsum dolor<br />
-									amet nullam sed etiam veroeros.</p>
-								</header>
-								<div class="image main"><img src="images/pic01.jpg" alt="" /></div>
-								<p>Donec eget ex magna. Interdum et malesuada fames ac ante ipsum primis in faucibus. Pellentesque venenatis dolor imperdiet dolor mattis sagittis. Praesent rutrum sem diam, vitae egestas enim auctor sit amet. Pellentesque leo mauris, consectetur id ipsum sit amet, fergiat. Pellentesque in mi eu massa lacinia malesuada et a elit. Donec urna ex, lacinia in purus ac, pretium pulvinar mauris. Nunc lorem mauris, fringilla in aliquam at, euismod in lectus. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Curabitur sapien risus, commodo eget turpis at, elementum convallis enim turpis, lorem ipsum dolor sit amet nullam.</p>
-								<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis dapibus rutrum facilisis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Etiam tristique libero eu nibh porttitor fermentum. Nullam venenatis erat id vehicula viverra. Nunc ultrices eros ut ultricies condimentum. Mauris risus lacus, blandit sit amet venenatis non, bibendum vitae dolor. Nunc lorem mauris, fringilla in aliquam at, euismod in lectus. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. In non lorem sit amet elit placerat maximus. Pellentesque aliquam maximus risus. Donec eget ex magna. Interdum et malesuada fames ac ante ipsum primis in faucibus. Pellentesque venenatis dolor imperdiet dolor mattis sagittis. Praesent rutrum sem diam, vitae egestas enim auctor sit amet. Pellentesque leo mauris, consectetur id ipsum.</p>
-							</section>
-
-					</div>
\ No newline at end of file
+<div id="main">
+	<!-- Post -->
+	<section class="post">
+		<header class="major">
+			<span class="date">April 25, 2017</span>
+			<h1>This is a<br />
+			Generic Page</h1>
+			<p>Aenean ornare velit lacus varius enim ullamcorper proin aliquam<br />
+				facilisis ante sed etiam magna interdum congue. Lorem ipsum dolor<br />
+			amet nullam sed etiam veroeros.</p>
+		</header>
+		<div class="image main"><img src="images/pic01.jpg" alt="" /></div>
+		<p>Donec eget ex magna. Interdum et malesuada fames ac ante ipsum primis in faucibus. Pellentesque venenatis dolor imperdiet dolor mattis sagittis. Praesent rutrum sem diam, vitae egestas enim auctor sit amet. Pellentesque leo mauris, consectetur id ipsum sit amet, fergiat. Pellentesque in mi eu massa lacinia malesuada et a elit. Donec urna ex, lacinia in purus ac, pretium pulvinar mauris. Nunc lorem mauris, fringilla in aliquam at, euismod in lectus. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Curabitur sapien risus, commodo eget turpis at, elementum convallis enim turpis, lorem ipsum dolor sit amet nullam.</p>
+		<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis dapibus rutrum facilisis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Etiam tristique libero eu nibh porttitor fermentum. Nullam venenatis erat id vehicula viverra. Nunc ultrices eros ut ultricies condimentum. Mauris risus lacus, blandit sit amet venenatis non, bibendum vitae dolor. Nunc lorem mauris, fringilla in aliquam at, euismod in lectus. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. In non lorem sit amet elit placerat maximus. Pellentesque aliquam maximus risus. Donec eget ex magna. Interdum et malesuada fames ac ante ipsum primis in faucibus. Pellentesque venenatis dolor imperdiet dolor mattis sagittis. Praesent rutrum sem diam, vitae egestas enim auctor sit amet. Pellentesque leo mauris, consectetur id ipsum.</p>
+	</section>
+</div>
\ No newline at end of file
diff --git a/jamstack/sites/html5up/massively/templates/sections/nav.html b/jamstack/sites/html5up/massively/templates/sections/nav.html
index e4712da..ca0cc27 100644
--- a/jamstack/sites/html5up/massively/templates/sections/nav.html
+++ b/jamstack/sites/html5up/massively/templates/sections/nav.html
@@ -1,14 +1,14 @@
 <!-- Nav -->
-					<nav id="nav">
-						<ul class="links">
-							{% for elem in info['nav'] %}
-								<li class="{{ 'active' if active_page == elem[2] }}"><a href="{{ elem[1] }}">{{ elem[0] }}</a></li>
-							{% endfor %}
-						</ul>
-						<ul class="icons">
-							<li><a href="{{ info['social']['twitter'] }}" class="icon brands fa-twitter"><span class="label">Twitter</span></a></li>
-							<li><a href="{{ info['social']['facebook'] }}" class="icon brands fa-facebook-f"><span class="label">Facebook</span></a></li>
-							<li><a href="{{ info['social']['instagram'] }}" class="icon brands fa-instagram"><span class="label">Instagram</span></a></li>
-							<li><a href="{{ info['social']['github'] }}" class="icon brands fa-github"><span class="label">GitHub</span></a></li>
-						</ul>
-					</nav>
\ No newline at end of file
+<nav id="nav">
+	<ul class="links">
+		{% for elem in info['nav'] %}
+			<li class="{{ 'active' if active_page == elem[2] }}"><a href="{{ elem[1] }}">{{ elem[0] }}</a></li>
+		{% endfor %}
+	</ul>
+	<ul class="icons">
+		<li><a href="{{ info['social']['twitter'] }}" class="icon brands fa-twitter"><span class="label">Twitter</span></a></li>
+		<li><a href="{{ info['social']['facebook'] }}" class="icon brands fa-facebook-f"><span class="label">Facebook</span></a></li>
+		<li><a href="{{ info['social']['instagram'] }}" class="icon brands fa-instagram"><span class="label">Instagram</span></a></li>
+		<li><a href="{{ info['social']['github'] }}" class="icon brands fa-github"><span class="label">GitHub</span></a></li>
+	</ul>
+</nav>
\ No newline at end of file
diff --git a/jamstack/sites/html5up/phantom/info.json b/jamstack/sites/html5up/phantom/info.json
new file mode 100644
index 0000000..7efdeaf
--- /dev/null
+++ b/jamstack/sites/html5up/phantom/info.json
@@ -0,0 +1,74 @@
+{
+    "social": {
+        "twitter": {
+            "url": "https://twitter.com",
+            "title": "Twitter",
+            "icon-type": "brands"
+        },
+        "facebook": {
+            "url": "https://facebook.com",
+            "title": "Facebook",
+            "icon-type": "brands"
+        },
+        "instagram": {
+            "url": "https://instagram.com",
+            "title": "Instagram",
+            "icon-type": "brands"
+        },
+        "dribbble": {
+            "url": "https://dribbble.com",
+            "title": "Dribbble",
+            "icon-type": "brands"
+        },
+        "github": {
+            "url": "https://github.com",
+            "title": "Github",
+            "icon-type": "brands"
+        },
+        "500px": {
+            "url": "https://500px.com",
+            "title": "500px",
+            "icon-type": "brands"
+        },
+        "phone": {
+            "url": "0000",
+            "title": "Phone",
+            "icon-type": "solid"
+        },
+        "envelope": {
+            "url": "mail:email@gmail.com",
+            "title": "E-mail",
+            "icon-type": "solid"
+        }
+    },
+    "sidebar": {
+        "index": {
+            "page": "index.html",
+            "title": "Home"
+        },
+        "generic1": {
+            "page": "generic.html",
+            "title": "Ipsum veroeros"
+        },
+        "generic2": {
+            "page": "generic.html",
+            "title": "Tempus etiam"
+        },
+        "generic3": {
+            "page": "generic.html",
+            "title": "Consequat dolor"
+        },
+        "elements": {
+            "page": "elements.html",
+            "title": "Elements"
+        }
+    },
+    "metatags": {
+        "description": "A modern and responsive Jamstack website built with Python",
+        "keywords": "Python, Jamstack, website, responsive, modern",
+        "author": "Jhon Doe",
+        "copyright": "Jhon Doe"
+    },
+    "pagename": "Phantom",
+    "logo":"https://html5up.net/uploads/demos/phantom/images/logo.svg"
+}
\ No newline at end of file
diff --git a/jamstack/sites/html5up/phantom/posts.json b/jamstack/sites/html5up/phantom/posts.json
new file mode 100644
index 0000000..8d7f4b0
--- /dev/null
+++ b/jamstack/sites/html5up/phantom/posts.json
@@ -0,0 +1,76 @@
+{
+    "posts": {
+        "post1": {
+            "title": "MAGNA",
+            "thumbnail": "https://picsum.photos/350/350?random=2",
+            "description": "Sed nisl arcu euismod sit amet nisi lorem etiam dolor veroeros et feugiat.",
+            "page": "post_template.html"
+        },
+        "post2": {
+            "title": "LOREM",
+            "thumbnail": "https://picsum.photos/350/350?random=2",
+            "description": "Sed nisl arcu euismod sit amet nisi lorem etiam dolor veroeros et feugiat.",
+            "page": "post_template.html"
+        },
+        "post3": {
+            "title": "FEUGIAT",
+            "thumbnail": "https://picsum.photos/350/350?random=2",
+            "description": "Sed nisl arcu euismod sit amet nisi lorem etiam dolor veroeros et feugiat.",
+            "page": "post_template.html"
+        },
+        "post4": {
+            "title": "TEMPUS",
+            "thumbnail": "https://picsum.photos/350/350?random=2",
+            "description": "Sed nisl arcu euismod sit amet nisi lorem etiam dolor veroeros et feugiat.",
+            "page": "post_template.html"
+        },
+        "post5": {
+            "title": "ALIQUAM",
+            "thumbnail": "https://picsum.photos/350/350?random=2",
+            "description": "Sed nisl arcu euismod sit amet nisi lorem etiam dolor veroeros et feugiat.",
+            "page": "post_template.html"
+        },
+        "post6": {
+            "title": "VEROEROS",
+            "thumbnail": "https://picsum.photos/350/350?random=2",
+            "description": "Sed nisl arcu euismod sit amet nisi lorem etiam dolor veroeros et feugiat.",
+            "page": "post_template.html"
+        },
+        "post7": {
+            "title": "IPSUM",
+            "thumbnail": "https://picsum.photos/350/350?random=2",
+            "description": "Sed nisl arcu euismod sit amet nisi lorem etiam dolor veroeros et feugiat.",
+            "page": "post_template.html"
+        },
+        "post8": {
+            "title": "DOLOR",
+            "thumbnail": "https://picsum.photos/350/350?random=2",
+            "description": "Sed nisl arcu euismod sit amet nisi lorem etiam dolor veroeros et feugiat.",
+            "page": "post_template.html"
+        },
+        "post9": {
+            "title": "NULLAM",
+            "thumbnail": "https://picsum.photos/350/350?random=2",
+            "description": "Sed nisl arcu euismod sit amet nisi lorem etiam dolor veroeros et feugiat.",
+            "page": "post_template.html"
+        },
+        "post10": {
+            "title": "ULTRICIES",
+            "thumbnail": "https://picsum.photos/350/350?random=2",
+            "description": "Sed nisl arcu euismod sit amet nisi lorem etiam dolor veroeros et feugiat.",
+            "page": "post_template.html"
+        },
+        "post11": {
+            "title": "DICTUM",
+            "thumbnail": "https://picsum.photos/350/350?random=2",
+            "description": "Sed nisl arcu euismod sit amet nisi lorem etiam dolor veroeros et feugiat.",
+            "page": "post_template.html"
+        },
+        "post12": {
+            "title": "PRETIUM",
+            "thumbnail": "https://picsum.photos/350/350?random=2",
+            "description": "Sed nisl arcu euismod sit amet nisi lorem etiam dolor veroeros et feugiat.",
+            "page": "post_template.html"
+        }
+    }
+}
\ No newline at end of file
diff --git a/jamstack/sites/html5up/phantom/settings.py b/jamstack/sites/html5up/phantom/settings.py
new file mode 100644
index 0000000..34d89e1
--- /dev/null
+++ b/jamstack/sites/html5up/phantom/settings.py
@@ -0,0 +1,6 @@
+from jamstack.api.template import load_json
+
+OUTPUT_FOLDER = 'dist/'
+
+info = load_json('info.json')
+posts = load_json('posts.json')
diff --git a/jamstack/sites/html5up/phantom/static.py b/jamstack/sites/html5up/phantom/static.py
new file mode 100644
index 0000000..e38ec90
--- /dev/null
+++ b/jamstack/sites/html5up/phantom/static.py
@@ -0,0 +1,50 @@
+import argparse
+from os.path import join
+
+from livereload import Server
+
+import settings
+from jamstack.api.template import generate
+from jamstack.jamdo.jamdo import download as download_template
+
+
+def generate_site():
+    extra_context = {"info": settings.info,
+                     "posts": settings.posts}
+    generate('index.html', join(settings.OUTPUT_FOLDER, 'index.html'), context=extra_context)
+
+    # Generate pages based on sidebar items
+    for item in settings.info['sidebar'].values():
+        page = item['page']
+        generate(page, join(settings.OUTPUT_FOLDER, page), context=extra_context)
+
+    # Generate posts pages
+    for post in settings.posts['posts'].values():
+        page = post['page']
+        generate(page, join(settings.OUTPUT_FOLDER, page), context=extra_context)
+
+
+def serve_files(port, watch):
+    server = Server()
+    for x in watch.split('|'):
+        server.watch(x, func=generate_site)
+    try:
+        server.serve(root=settings.OUTPUT_FOLDER, port=port)
+    except KeyboardInterrupt:
+        print("Shutting down...")
+
+
+if __name__ == '__main__':
+    parser = argparse.ArgumentParser(description='Project manager.')
+    parser.add_argument('--serve', action='store_true', help='Serve files for livewatch')
+    parser.add_argument('--jamdo', action='store_true', help='Download template assets')
+    parser.add_argument('--watch', type=str, default='*.py|templates|templates/sections', help='Files/Folders to watch')
+    parser.add_argument('--port', type=int, default=8000, help='Port to serve')
+    args = parser.parse_args()
+
+    if args.serve:
+        serve_files(args.port, args.watch)
+    elif args.jamdo:
+        download_template('html5up/phantom')
+    else:
+        generate_site()
diff --git a/jamstack/sites/html5up/phantom/templates/elements.html b/jamstack/sites/html5up/phantom/templates/elements.html
new file mode 100644
index 0000000..51cdde5
--- /dev/null
+++ b/jamstack/sites/html5up/phantom/templates/elements.html
@@ -0,0 +1,397 @@
+<!DOCTYPE HTML>
+<!--
+	Phantom by HTML5 UP
+	html5up.net | @ajlkn
+	Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
+-->
+<html>
+	<head>
+		<title>Elements - Phantom by HTML5 UP</title>
+		<meta charset="utf-8" />
+		<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" />
+		<link rel="stylesheet" href="assets/css/main.css" />
+		<noscript><link rel="stylesheet" href="assets/css/noscript.css" /></noscript>
+	</head>
+	<body class="is-preload">
+		<!-- Wrapper -->
+		<div id="wrapper">
+			<!-- Header -->
+			<header id="header">
+				<div class="inner">
+					<!-- Logo -->
+					<a href="index.html" class="logo">
+						<span class="symbol"><img src="{{ info['logo'] }}" alt="" /></span><span class="title">Phantom</span>
+					</a>
+					<!-- Nav -->
+					<nav>
+						<ul>
+							<li><a href="#menu">Menu</a></li>
+						</ul>
+					</nav>
+				</div>
+			</header>
+			<!-- Menu -->
+			<nav id="menu">
+				<h2>Menu</h2>
+				<ul>
+					<li><a href="index.html">Home</a></li>
+					<li><a href="generic.html">Ipsum veroeros</a></li>
+					<li><a href="generic.html">Tempus etiam</a></li>
+					<li><a href="generic.html">Consequat dolor</a></li>
+					<li><a href="elements.html">Elements</a></li>
+				</ul>
+			</nav>
+			<!-- Main -->
+			<div id="main">
+				<div class="inner">
+					<h1>Elements</h1>
+					<!-- Text -->
+					<section>
+						<h2>Text</h2>
+						<p>This is <b>bold</b> and this is <strong>strong</strong>. This is <i>italic</i> and this is <em>emphasized</em>.
+							This is <sup>superscript</sup> text and this is <sub>subscript</sub> text.
+							This is <u>underlined</u> and this is code: <code>for (;;) { ... }</code>. Finally, <a href="#">this is a link</a>.</p>
+							<hr />
+							<p>Nunc lacinia ante nunc ac lobortis. Interdum adipiscing gravida odio porttitor sem non mi integer non faucibus ornare mi ut ante amet placerat aliquet. Volutpat eu sed ante lacinia sapien lorem accumsan varius montes viverra nibh in adipiscing blandit tempus accumsan.</p>
+							<hr />
+							<h2>Heading Level 2</h2>
+							<h3>Heading Level 3</h3>
+							<h4>Heading Level 4</h4>
+							<hr />
+							<h3>Blockquote</h3>
+						<blockquote>Fringilla nisl. Donec accumsan interdum nisi, quis tincidunt felis sagittis eget tempus euismod. Vestibulum ante ipsum primis in faucibus vestibulum. Blandit adipiscing eu felis iaculis volutpat ac adipiscing accumsan faucibus. Vestibulum ante ipsum primis in faucibus lorem ipsum dolor sit amet nullam adipiscing eu felis.</blockquote>
+						<h3>Preformatted</h3>
+						<pre><code>i = 0;
+							while (!deck.isInOrder()) {
+							    print 'Iteration ' + i;
+							    deck.shuffle();
+							    i++;
+							}
+						print 'It took ' + i + ' iterations to sort the deck.';</code></pre>
+					</section>
+					<!-- Lists -->
+					<section>
+						<h2>Lists</h2>
+						<div class="row">
+							<div class="col-6 col-12-medium">
+								<h3>Unordered</h3>
+								<ul>
+									<li>Dolor pulvinar etiam.</li>
+									<li>Sagittis adipiscing.</li>
+									<li>Felis enim feugiat.</li>
+								</ul>
+								<h3>Alternate</h3>
+								<ul class="alt">
+									<li>Dolor pulvinar etiam.</li>
+									<li>Sagittis adipiscing.</li>
+									<li>Felis enim feugiat.</li>
+								</ul>
+							</div>
+							<div class="col-6 col-12-medium">
+								<h3>Ordered</h3>
+								<ol>
+									<li>Dolor pulvinar etiam.</li>
+									<li>Etiam vel felis viverra.</li>
+									<li>Felis enim feugiat.</li>
+									<li>Dolor pulvinar etiam.</li>
+									<li>Etiam vel felis lorem.</li>
+									<li>Felis enim et feugiat.</li>
+								</ol>
+								<h3>Icons</h3>
+								<ul class="icons">
+									<li><a href="#" class="icon brands style1 fa-twitter"><span class="label">Twitter</span></a></li>
+									<li><a href="#" class="icon brands style1 fa-facebook-f"><span class="label">Facebook</span></a></li>
+									<li><a href="#" class="icon brands style1 fa-instagram"><span class="label">Instagram</span></a></li>
+									<li><a href="#" class="icon brands style1 fa-github"><span class="label">Github</span></a></li>
+								</ul>
+								<ul class="icons">
+									<li><a href="#" class="icon brands style2 fa-twitter"><span class="label">Twitter</span></a></li>
+									<li><a href="#" class="icon brands style2 fa-facebook-f"><span class="label">Facebook</span></a></li>
+									<li><a href="#" class="icon brands style2 fa-instagram"><span class="label">Instagram</span></a></li>
+									<li><a href="#" class="icon brands style2 fa-github"><span class="label">Github</span></a></li>
+								</ul>
+							</div>
+						</div>
+						<h2>Actions</h2>
+						<div class="row">
+							<div class="col-6 col-12-medium">
+								<ul class="actions">
+									<li><a href="#" class="button primary">Default</a></li>
+									<li><a href="#" class="button">Default</a></li>
+								</ul>
+								<ul class="actions small">
+									<li><a href="#" class="button primary small">Small</a></li>
+									<li><a href="#" class="button small">Small</a></li>
+								</ul>
+								<ul class="actions stacked">
+									<li><a href="#" class="button primary">Default</a></li>
+									<li><a href="#" class="button">Default</a></li>
+								</ul>
+								<ul class="actions stacked">
+									<li><a href="#" class="button primary small">Small</a></li>
+									<li><a href="#" class="button small">Small</a></li>
+								</ul>
+							</div>
+							<div class="col-6 col-12-medium">
+								<ul class="actions stacked">
+									<li><a href="#" class="button primary fit">Default</a></li>
+									<li><a href="#" class="button fit">Default</a></li>
+								</ul>
+								<ul class="actions stacked">
+									<li><a href="#" class="button primary small fit">Small</a></li>
+									<li><a href="#" class="button small fit">Small</a></li>
+								</ul>
+							</div>
+						</div>
+					</section>
+					<!-- Table -->
+					<section>
+						<h2>Table</h2>
+						<h3>Default</h3>
+						<div class="table-wrapper">
+							<table>
+								<thead>
+									<tr>
+										<th>Name</th>
+										<th>Description</th>
+										<th>Price</th>
+									</tr>
+								</thead>
+								<tbody>
+									<tr>
+										<td>Item One</td>
+										<td>Ante turpis integer aliquet porttitor.</td>
+										<td>29.99</td>
+									</tr>
+									<tr>
+										<td>Item Two</td>
+										<td>Vis ac commodo adipiscing arcu aliquet.</td>
+										<td>19.99</td>
+									</tr>
+									<tr>
+										<td>Item Three</td>
+										<td> Morbi faucibus arcu accumsan lorem.</td>
+										<td>29.99</td>
+									</tr>
+									<tr>
+										<td>Item Four</td>
+										<td>Vitae integer tempus condimentum.</td>
+										<td>19.99</td>
+									</tr>
+									<tr>
+										<td>Item Five</td>
+										<td>Ante turpis integer aliquet porttitor.</td>
+										<td>29.99</td>
+									</tr>
+								</tbody>
+								<tfoot>
+								<tr>
+									<td colspan="2"></td>
+									<td>100.00</td>
+								</tr>
+								</tfoot>
+							</table>
+						</div>
+						<h3>Alternate</h3>
+						<div class="table-wrapper">
+							<table class="alt">
+								<thead>
+									<tr>
+										<th>Name</th>
+										<th>Description</th>
+										<th>Price</th>
+									</tr>
+								</thead>
+								<tbody>
+									<tr>
+										<td>Item One</td>
+										<td>Ante turpis integer aliquet porttitor.</td>
+										<td>29.99</td>
+									</tr>
+									<tr>
+										<td>Item Two</td>
+										<td>Vis ac commodo adipiscing arcu aliquet.</td>
+										<td>19.99</td>
+									</tr>
+									<tr>
+										<td>Item Three</td>
+										<td> Morbi faucibus arcu accumsan lorem.</td>
+										<td>29.99</td>
+									</tr>
+									<tr>
+										<td>Item Four</td>
+										<td>Vitae integer tempus condimentum.</td>
+										<td>19.99</td>
+									</tr>
+									<tr>
+										<td>Item Five</td>
+										<td>Ante turpis integer aliquet porttitor.</td>
+										<td>29.99</td>
+									</tr>
+								</tbody>
+								<tfoot>
+								<tr>
+									<td colspan="2"></td>
+									<td>100.00</td>
+								</tr>
+								</tfoot>
+							</table>
+						</div>
+					</section>
+					<!-- Buttons -->
+					<section>
+						<h3>Buttons</h3>
+						<ul class="actions">
+							<li><a href="#" class="button primary">Primary</a></li>
+							<li><a href="#" class="button">Default</a></li>
+						</ul>
+						<ul class="actions">
+							<li><a href="#" class="button large">Large</a></li>
+							<li><a href="#" class="button">Default</a></li>
+							<li><a href="#" class="button small">Small</a></li>
+						</ul>
+						<ul class="actions fit">
+							<li><a href="#" class="button primary fit">Fit</a></li>
+							<li><a href="#" class="button fit">Fit</a></li>
+							<li><a href="#" class="button fit">Fit</a></li>
+						</ul>
+						<ul class="actions fit small">
+							<li><a href="#" class="button primary fit small">Fit + Small</a></li>
+							<li><a href="#" class="button fit small">Fit + Small</a></li>
+							<li><a href="#" class="button fit small">Fit + Small</a></li>
+						</ul>
+						<ul class="actions">
+							<li><a href="#" class="button primary icon solid fa-download">Icon</a></li>
+							<li><a href="#" class="button icon solid fa-upload">Icon</a></li>
+							<li><a href="#" class="button icon solid fa-save">Icon</a></li>
+						</ul>
+						<ul class="actions">
+							<li><span class="button primary disabled">Disabled</span></li>
+							<li><span class="button disabled">Disabled</span></li>
+						</ul>
+					</section>
+					<!-- Form -->
+					<section>
+						<h2>Form</h2>
+						<form method="post" action="#">
+							<div class="row gtr-uniform">
+								<div class="col-6 col-12-xsmall">
+									<input type="text" name="demo-name" id="demo-name" value="" placeholder="Name" />
+								</div>
+								<div class="col-6 col-12-xsmall">
+									<input type="email" name="demo-email" id="demo-email" value="" placeholder="Email" />
+								</div>
+								<div class="col-12">
+									<select name="demo-category" id="demo-category">
+										<option value="">- Category -</option>
+										<option value="1">Manufacturing</option>
+										<option value="1">Shipping</option>
+										<option value="1">Administration</option>
+										<option value="1">Human Resources</option>
+									</select>
+								</div>
+								<div class="col-4 col-12-small">
+									<input type="radio" id="demo-priority-low" name="demo-priority" checked>
+									<label for="demo-priority-low">Low</label>
+								</div>
+								<div class="col-4 col-12-small">
+									<input type="radio" id="demo-priority-normal" name="demo-priority">
+									<label for="demo-priority-normal">Normal</label>
+								</div>
+								<div class="col-4 col-12-small">
+									<input type="radio" id="demo-priority-high" name="demo-priority">
+									<label for="demo-priority-high">High</label>
+								</div>
+								<div class="col-6 col-12-small">
+									<input type="checkbox" id="demo-copy" name="demo-copy">
+									<label for="demo-copy">Email me a copy</label>
+								</div>
+								<div class="col-6 col-12-small">
+									<input type="checkbox" id="demo-human" name="demo-human" checked>
+									<label for="demo-human">Not a robot</label>
+								</div>
+								<div class="col-12">
+									<textarea name="demo-message" id="demo-message" placeholder="Enter your message" rows="6"></textarea>
+								</div>
+								<div class="col-12">
+									<ul class="actions">
+										<li><input type="submit" value="Send Message" class="primary" /></li>
+										<li><input type="reset" value="Reset" /></li>
+									</ul>
+								</div>
+							</div>
+						</form>
+					</section>
+					<!-- Image -->
+					<section>
+						<h2>Image</h2>
+						<h3>Fit</h3>
+						<div class="box alt">
+							<div class="row gtr-uniform">
+								<div class="col-12"><span class="image fit"><img src="https://picsum.photos/1132/326?blur=2?random=2" alt="" /></span></div>
+								<div class="col-4"><span class="image fit"><img src="https://picsum.photos/353/326/?blur=2?random=2" alt="" /></span></div>
+								<div class="col-4"><span class="image fit"><img src="https://picsum.photos/353/326/?blur=2?random=2" alt="" /></span></div>
+								<div class="col-4"><span class="image fit"><img src="https://picsum.photos/353/326/?blur=2?random=2" alt="" /></span></div>
+								<div class="col-4"><span class="image fit"><img src="https://picsum.photos/353/326/?blur=2?random=2" alt="" /></span></div>
+								<div class="col-4"><span class="image fit"><img src="https://picsum.photos/353/326/?blur=2?random=2" alt="" /></span></div>
+								<div class="col-4"><span class="image fit"><img src="https://picsum.photos/353/326/?blur=2?random=2" alt="" /></span></div>
+								<div class="col-4"><span class="image fit"><img src="https://picsum.photos/353/326/?blur=2?random=2" alt="" /></span></div>
+								<div class="col-4"><span class="image fit"><img src="https://picsum.photos/353/326/?blur=2?random=2" alt="" /></span></div>
+								<div class="col-4"><span class="image fit"><img src="https://picsum.photos/353/326/?blur=2?random=2" alt="" /></span></div>
+							</div>
+						</div>
+						<h3>Left &amp; Right</h3>
+						<p><span class="image left"><img src="https://picsum.photos/177/163/?blur=2?random=2" alt="" /></span>Fringilla nisl. Donec accumsan interdum nisi, quis tincidunt felis sagittis eget. tempus euismod. Vestibulum ante ipsum primis in faucibus vestibulum. Blandit adipiscing eu felis iaculis volutpat ac adipiscing accumsan eu faucibus. Integer ac pellentesque praesent tincidunt felis sagittis eget. tempus euismod. Vestibulum ante ipsum primis in faucibus vestibulum. Blandit adipiscing eu felis iaculis volutpat ac adipiscing accumsan eu faucibus. Integer ac pellentesque praesent. Donec accumsan interdum nisi, quis tincidunt felis sagittis eget. tempus euismod. Vestibulum ante ipsum primis in faucibus vestibulum. Blandit adipiscing eu felis iaculis volutpat ac adipiscing accumsan eu faucibus. Integer ac pellentesque praesent tincidunt felis sagittis eget. tempus euismod. Vestibulum ante ipsum primis in faucibus vestibulum. Blandit adipiscing eu felis iaculis volutpat ac adipiscing accumsan eu faucibus. Integer ac pellentesque praesent. Blandit adipiscing eu felis iaculis volutpat ac adipiscing accumsan eu faucibus. Integer ac pellentesque praesent tincidunt felis sagittis eget. tempus euismod. Vestibulum ante ipsum primis in faucibus vestibulum. Blandit adipiscing eu felis iaculis volutpat ac adipiscing accumsan eu faucibus. Integer ac pellentesque praesent.</p>
+						<p><span class="image right"><img src="https://picsum.photos/177/163/?blur=2?random=2" alt="" /></span>Fringilla nisl. Donec accumsan interdum nisi, quis tincidunt felis sagittis eget. tempus euismod. Vestibulum ante ipsum primis in faucibus vestibulum. Blandit adipiscing eu felis iaculis volutpat ac adipiscing accumsan eu faucibus. Integer ac pellentesque praesent tincidunt felis sagittis eget. tempus euismod. Vestibulum ante ipsum primis in faucibus vestibulum. Blandit adipiscing eu felis iaculis volutpat ac adipiscing accumsan eu faucibus. Integer ac pellentesque praesent. Donec accumsan interdum nisi, quis tincidunt felis sagittis eget. tempus euismod. Vestibulum ante ipsum primis in faucibus vestibulum. Blandit adipiscing eu felis iaculis volutpat ac adipiscing accumsan eu faucibus. Integer ac pellentesque praesent tincidunt felis sagittis eget. tempus euismod. Vestibulum ante ipsum primis in faucibus vestibulum. Blandit adipiscing eu felis iaculis volutpat ac adipiscing accumsan eu faucibus. Integer ac pellentesque praesent. Blandit adipiscing eu felis iaculis volutpat ac adipiscing accumsan eu faucibus. Integer ac pellentesque praesent tincidunt felis sagittis eget. tempus euismod. Vestibulum ante ipsum primis in faucibus vestibulum. Blandit adipiscing eu felis iaculis volutpat ac adipiscing accumsan eu faucibus. Integer ac pellentesque praesent.</p>
+					</section>
+				</div>
+			</div>
+			<!-- Footer -->
+			<footer id="footer">
+				<div class="inner">
+					<section>
+						<h2>Get in touch</h2>
+						<form method="post" action="#">
+							<div class="fields">
+								<div class="field half">
+									<input type="text" name="name" id="name" placeholder="Name" />
+								</div>
+								<div class="field half">
+									<input type="email" name="email" id="email" placeholder="Email" />
+								</div>
+								<div class="field">
+									<textarea name="message" id="message" placeholder="Message"></textarea>
+								</div>
+							</div>
+							<ul class="actions">
+								<li><input type="submit" value="Send" class="primary" /></li>
+							</ul>
+						</form>
+					</section>
+					<section>
+						<h2>Follow</h2>
+						<ul class="icons">
+							<li><a href="#" class="icon brands style2 fa-twitter"><span class="label">Twitter</span></a></li>
+							<li><a href="#" class="icon brands style2 fa-facebook-f"><span class="label">Facebook</span></a></li>
+							<li><a href="#" class="icon brands style2 fa-instagram"><span class="label">Instagram</span></a></li>
+							<li><a href="#" class="icon brands style2 fa-dribbble"><span class="label">Dribbble</span></a></li>
+							<li><a href="#" class="icon brands style2 fa-github"><span class="label">GitHub</span></a></li>
+							<li><a href="#" class="icon brands style2 fa-500px"><span class="label">500px</span></a></li>
+							<li><a href="#" class="icon solid style2 fa-phone"><span class="label">Phone</span></a></li>
+							<li><a href="#" class="icon solid style2 fa-envelope"><span class="label">Email</span></a></li>
+						</ul>
+					</section>
+					<ul class="copyright">
+						<li>&copy; Untitled. All rights reserved</li><li>Design: <a href="http://html5up.net">HTML5 UP</a></li>
+					</ul>
+				</div>
+			</footer>
+		</div>
+		<!-- Scripts -->
+		<script src="assets/js/jquery.min.js"></script>
+		<script src="assets/js/browser.min.js"></script>
+		<script src="assets/js/breakpoints.min.js"></script>
+		<script src="assets/js/util.js"></script>
+		<script src="assets/js/main.js"></script>
+	</body>
+</html>
\ No newline at end of file
diff --git a/jamstack/sites/html5up/phantom/templates/generic.html b/jamstack/sites/html5up/phantom/templates/generic.html
new file mode 100644
index 0000000..6844cb3
--- /dev/null
+++ b/jamstack/sites/html5up/phantom/templates/generic.html
@@ -0,0 +1,58 @@
+<!DOCTYPE HTML>
+<!--
+	Phantom by HTML5 UP
+	html5up.net | @ajlkn
+	Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
+-->
+<html>
+	<head>
+		{% include 'sections/head_content.html' %}
+		{% block head %}
+			<title>{{ info['pagename'] }} - Generic page</title>
+		{% endblock %}
+	</head>
+	<body class="is-preload">
+		<!-- Wrapper -->
+		<div id="wrapper">
+			<!-- Header -->
+			<header id="header">
+				<div class="inner">
+					<!-- Logo -->
+					<a href="index.html" class="logo">
+						<span class="symbol"><img src="{{ info['logo'] }}" alt="" /></span><span class="title">Phantom</span>
+					</a>
+					<!-- Nav -->
+					<nav>
+						<ul>
+							<li><a href="#menu">Menu</a></li>
+						</ul>
+					</nav>
+				</div>
+			</header>
+			<!-- Menu -->
+			<nav id="menu">
+				<h2>Menu</h2>
+				<ul>
+					{% for item in info['sidebar'] %}
+						{% set items = info['sidebar'] %}
+						{% set title = items[item]['title'] %}
+						{% set page = items[item]['page'] %}
+						<li><a href="{{ page }}">{{ title }}</a></li>
+					{% endfor %}
+				</ul>
+			</nav>
+			<!-- Main -->
+			<div id="main">
+				<div class="inner">
+					<h1>Generic Page</h1>
+					<span class="image main"><img src="https://picsum.photos/1132/326?blur=2?random=2" alt="" /></span>
+					<p>Donec eget ex magna. Interdum et malesuada fames ac ante ipsum primis in faucibus. Pellentesque venenatis dolor imperdiet dolor mattis sagittis. Praesent rutrum sem diam, vitae egestas enim auctor sit amet. Pellentesque leo mauris, consectetur id ipsum sit amet, fergiat. Pellentesque in mi eu massa lacinia malesuada et a elit. Donec urna ex, lacinia in purus ac, pretium pulvinar mauris. Curabitur sapien risus, commodo eget turpis at, elementum convallis elit. Pellentesque enim turpis, hendrerit tristique.</p>
+					<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis dapibus rutrum facilisis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Etiam tristique libero eu nibh porttitor fermentum. Nullam venenatis erat id vehicula viverra. Nunc ultrices eros ut ultricies condimentum. Mauris risus lacus, blandit sit amet venenatis non, bibendum vitae dolor. Nunc lorem mauris, fringilla in aliquam at, euismod in lectus. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. In non lorem sit amet elit placerat maximus. Pellentesque aliquam maximus risus, vel venenatis mauris vehicula hendrerit.</p>
+					<p>Interdum et malesuada fames ac ante ipsum primis in faucibus. Pellentesque venenatis dolor imperdiet dolor mattis sagittis. Praesent rutrum sem diam, vitae egestas enim auctor sit amet. Pellentesque leo mauris, consectetur id ipsum sit amet, fersapien risus, commodo eget turpis at, elementum convallis elit. Pellentesque enim turpis, hendrerit tristique lorem ipsum dolor.</p>
+				</div>
+			</div>
+			{% include 'sections/footer.html' %}
+		</div>
+		{% include 'sections/bottom_scripts.html' %}
+	</body>
+</html>
\ No newline at end of file
diff --git a/jamstack/sites/html5up/phantom/templates/index.html b/jamstack/sites/html5up/phantom/templates/index.html
new file mode 100644
index 0000000..c9c7663
--- /dev/null
+++ b/jamstack/sites/html5up/phantom/templates/index.html
@@ -0,0 +1,78 @@
+<!DOCTYPE HTML>
+<!--
+	Phantom by HTML5 UP
+	html5up.net | @ajlkn
+	Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
+-->
+<html>
+	<head>
+		{% include 'sections/head_content.html' %}
+		{% block head %}
+			<title>{{ info['pagename'] }} - Home</title>
+		{% endblock %}
+	</head>
+	<body class="is-preload">
+		<!-- Wrapper -->
+		<div id="wrapper">
+			<!-- Header -->
+			<header id="header">
+				<div class="inner">
+					<!-- Logo -->
+					<a href="index.html" class="logo">
+						<span class="symbol"><img src="{{ info['logo'] }}" alt="" /></span><span class="title">{{ info['pagename'] }}</span>
+					</a>
+					<!-- Nav -->
+					<nav>
+						<ul>
+							<li><a href="#menu">Menu</a></li>
+						</ul>
+					</nav>
+				</div>
+			</header>
+			<!-- Menu -->
+			<nav id="menu">
+				<h2>Menu</h2>
+				<ul>
+					{% for item in info['sidebar'] %}
+						{% set items = info['sidebar'] %}
+						{% set title = items[item]['title'] %}
+						{% set page = items[item]['page'] %}
+						<li><a href="{{ page }}">{{ title }}</a></li>
+					{% endfor %}
+				</ul>
+			</nav>
+			<!-- Main -->
+			<div id="main">
+				<div class="inner">
+					<header>
+						<h1>This is Phantom, a free, fully responsive site<br />
+						template designed by <a href="http://html5up.net">HTML5 UP</a>.</h1>
+						<p>Etiam quis viverra lorem, in semper lorem. Sed nisl arcu euismod sit amet nisi euismod sed cursus arcu elementum ipsum arcu vivamus quis venenatis orci lorem ipsum et magna feugiat veroeros aliquam. Lorem ipsum dolor sit amet nullam dolore.</p>
+					</header>
+					<section class="tiles">
+						{% for post in posts['posts'] %}
+							{% set posts = posts['posts'] %}
+							{% set title = posts[post]['title'] %}
+							{% set thumbnail = posts[post]['thumbnail'] %}
+							{% set description = posts[post]['description'] %}
+							{% set page = posts[post]['page'] %}
+							<article class="style1">
+								<span class="image">
+									<img src="{{ thumbnail }}" alt="" />
+								</span>
+								<a href="{{ page }}">
+									<h2>{{ title }}</h2>
+									<div class="content">
+										<p>{{ description }}</p>
+									</div>
+								</a>
+							</article>
+						{% endfor %}
+					</section>
+				</div>
+			</div>
+			{% include 'sections/footer.html' %}
+		</div>
+		{% include 'sections/bottom_scripts.html' %}
+	</body>
+</html>
\ No newline at end of file
diff --git a/jamstack/sites/html5up/phantom/templates/post_template.html b/jamstack/sites/html5up/phantom/templates/post_template.html
new file mode 100644
index 0000000..2dca006
--- /dev/null
+++ b/jamstack/sites/html5up/phantom/templates/post_template.html
@@ -0,0 +1,57 @@
+<!DOCTYPE HTML>
+<!--
+	Phantom by HTML5 UP
+	html5up.net | @ajlkn
+	Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
+-->
+<html>
+	<head>
+		{% include 'sections/head_content.html' %}
+		{% block head %}
+			<title>{{ info['pagename'] }} POST</title>
+		{% endblock %}
+	</head>
+	<body class="is-preload">
+		<!-- Wrapper -->
+		<div id="wrapper">
+			<!-- Header -->
+			<header id="header">
+				<div class="inner">
+					<!-- Logo -->
+					<a href="index.html" class="logo">
+						<span class="symbol"><img src="{{ info['logo'] }}" alt="" /></span><span class="title">{{ info['pagename'] }}</span>
+					</a>
+					<!-- Nav -->
+					<nav>
+						<ul>
+							<li><a href="#menu">Menu</a></li>
+						</ul>
+					</nav>
+				</div>
+			</header>
+			<!-- Menu -->
+			<nav id="menu">
+				<h2>Menu</h2>
+				<ul>
+					{% for item in info['sidebar'] %}
+						{% set items = info['sidebar'] %}
+						{% set title = items[item]['title'] %}
+						{% set page = items[item]['page'] %}
+						<li><a href="{{ page }}">{{ title }}</a></li>
+					{% endfor %}
+				</ul>
+			</nav>
+			<!-- Main -->
+			<div id="main">
+				<div class="inner">
+					<h1>LOREM IPSUM POST</h1>
+					<span class="image main"><img src="https://picsum.photos/1132/326?blur=2?random=2" alt="" /></span>
+					<p>Donec eget ex magna. Interdum et malesuada fames ac ante ipsum primis in faucibus. Pellentesque venenatis dolor imperdiet dolor mattis sagittis. Praesent rutrum sem diam, vitae egestas enim auctor sit amet. Pellentesque leo mauris, consectetur id ipsum sit amet, fergiat. Pellentesque in mi eu massa lacinia malesuada et a elit. Donec urna ex, lacinia in purus ac, pretium pulvinar mauris. Curabitur sapien risus, commodo eget turpis at, elementum convallis elit. Pellentesque enim turpis, hendrerit tristique.</p>
+					<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis dapibus rutrum facilisis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Etiam tristique libero eu nibh porttitor fermentum. Nullam venenatis erat id vehicula viverra. Nunc ultrices eros ut ultricies condimentum. Mauris risus lacus, blandit sit amet venenatis non, bibendum vitae dolor. Nunc lorem mauris, fringilla in aliquam at, euismod in lectus. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. In non lorem sit amet elit placerat maximus. Pellentesque aliquam maximus risus, vel venenatis mauris vehicula hendrerit.</p>
+				</div>
+			</div>
+			{% include 'sections/footer.html' %}
+		</div>
+		{% include 'sections/bottom_scripts.html' %}
+	</body>
+</html>
\ No newline at end of file
diff --git a/jamstack/sites/html5up/phantom/templates/sections/bottom_scripts.html b/jamstack/sites/html5up/phantom/templates/sections/bottom_scripts.html
new file mode 100644
index 0000000..caaeefc
--- /dev/null
+++ b/jamstack/sites/html5up/phantom/templates/sections/bottom_scripts.html
@@ -0,0 +1,5 @@
+<script src="assets/js/jquery.min.js"></script>
+<script src="assets/js/browser.min.js"></script>
+<script src="assets/js/breakpoints.min.js"></script>
+<script src="assets/js/util.js"></script>
+<script src="assets/js/main.js"></script>
\ No newline at end of file
diff --git a/jamstack/sites/html5up/phantom/templates/sections/footer.html b/jamstack/sites/html5up/phantom/templates/sections/footer.html
new file mode 100644
index 0000000..ae64fcc
--- /dev/null
+++ b/jamstack/sites/html5up/phantom/templates/sections/footer.html
@@ -0,0 +1,34 @@
+<footer id="footer">
+	<div class="inner">
+		<section>
+			<h2>Get in touch</h2>
+			<form method="post" action="#">
+				<div class="fields">
+					<div class="field half">
+						<input type="text" name="name" id="name" placeholder="Name" />
+					</div>
+					<div class="field half">
+						<input type="email" name="email" id="email" placeholder="Email" />
+					</div>
+					<div class="field">
+						<textarea name="message" id="message" placeholder="Message"></textarea>
+					</div>
+				</div>
+				<ul class="actions">
+					<li><input type="submit" value="Send" class="primary" /></li>
+				</ul>
+			</form>
+		</section>
+		<section>
+			<h2>Follow</h2>
+			<ul class="icons">
+				{% for item in info['social'] %}
+					<li><a href="{{ info['social'][item]['url'] }}" class="icon {{ info['social'][item]['icon-type'] }} style2 fa-{{ item }}"><span class="label">{{ info['social'][item]['title'] }}</span></a></li>
+				{% endfor %}
+			</ul>
+		</section>
+		<ul class="copyright">
+			<li>&copy; Untitled. All rights reserved</li><li>Design: <a href="http://html5up.net">HTML5 UP</a></li>
+		</ul>
+	</div>
+</footer>
\ No newline at end of file
diff --git a/jamstack/sites/html5up/phantom/templates/sections/head_content.html b/jamstack/sites/html5up/phantom/templates/sections/head_content.html
new file mode 100644
index 0000000..d9b53f6
--- /dev/null
+++ b/jamstack/sites/html5up/phantom/templates/sections/head_content.html
@@ -0,0 +1,10 @@
+{% block head %}{% endblock %}
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
+{% for tag in info['metatags'] %}
+	{% set tagcont = info['metatags'][tag] %}
+	<meta name="{{ tag }}" content="{{ tagcont }}">
+{% endfor %}
+<link rel="icon" type="image/svg+xml" href="{{ info['logo'] }}">
+<link rel="stylesheet" href="assets/css/main.css">
+<noscript><link rel="stylesheet" href="assets/css/noscript.css"></noscript>
\ No newline at end of file
diff --git a/jamstack/sites/plain/info.json b/jamstack/sites/plain/info.json
index 5a28a13..89fc7cb 100644
--- a/jamstack/sites/plain/info.json
+++ b/jamstack/sites/plain/info.json
@@ -1,8 +1,8 @@
 {
-	"head":{
-		"description": "Basic jamstack site",
-		"keywords": "python, jamstack",
-		"author": "R Ja",
-		"theme-color": "#ffb74d"
-	}
+    "head": {
+        "description": "A modern and responsive Jamstack website built with Python",
+        "keywords": "Python, Jamstack, website, responsive, modern",
+        "author": "Jhon Doe",
+        "theme-color": "#4fc3f7"
+    }
 }
\ No newline at end of file
diff --git a/jamstack/sites/plain/settings.py b/jamstack/sites/plain/settings.py
index e03b2c6..16d2f94 100644
--- a/jamstack/sites/plain/settings.py
+++ b/jamstack/sites/plain/settings.py
@@ -1,7 +1,5 @@
-import json
+from jamstack.api.template import load_json
 
 OUTPUT_FOLDER = 'dist/'
-info = None
 
-with open('info.json') as f:
-    info = json.load(f)
\ No newline at end of file
+info = load_json('info.json')
diff --git a/jamstack/sites/plain/static.py b/jamstack/sites/plain/static.py
index 7ba7bf4..32a053c 100644
--- a/jamstack/sites/plain/static.py
+++ b/jamstack/sites/plain/static.py
@@ -1,47 +1,35 @@
-# https://github.com/pymug/website-AV19-AV20
-
-import sys
+import argparse
 from os.path import join
 
-from jamstack.api.template import generate
-from jamstack.api.template import base_context
-from flask import Flask
 from livereload import Server
 
 import settings
+from jamstack.api.template import generate
 
-context = base_context()
-context.update({
-    "info": settings.info
-})
-
-
-def main(args):
-    def gen():
-        generate('index.html', join(settings.OUTPUT_FOLDER, 'index.html'), **context)
-
-    if len(args) > 1 and args[1] == '--server':
-        app = Flask(__name__)
-
-        # remember to use DEBUG mode for templates auto reload
-        # https://github.com/lepture/python-livereload/issues/144
-        app.debug = True
-        server = Server(app.wsgi_app)
 
-        # run a shell command
-        # server.watch('.', 'make static')
+def generate_site():
+    extra_context = {"info": settings.info}
+    generate('index.html', join(settings.OUTPUT_FOLDER, 'index.html'), context=extra_context)
 
-        # run a function
 
-        server.watch('.', gen, delay=5)
-        server.watch('*.py')
+def serve_files(port, watch):
+    server = Server()
+    for x in watch.split('|'):
+        server.watch(x, func=generate_site)
+    try:
+        server.serve(root=settings.OUTPUT_FOLDER, port=port)
+    except KeyboardInterrupt:
+        print("Shutting down...")
 
-        # output stdout into a file
-        # server.watch('style.less', shell('lessc style.less', output='style.css'))
-
-        server.serve()
-    else:
-        gen()
 
 if __name__ == '__main__':
-    main(sys.argv)
+    parser = argparse.ArgumentParser(description='Project manager.')
+    parser.add_argument('--serve', action='store_true', help='Serve files for livewatch')
+    parser.add_argument('--watch', type=str, default='*.py|templates|templates/sections', help='Files/Folders to watch')
+    parser.add_argument('--port', type=int, default=8000, help='Port to serve')
+    args = parser.parse_args()
+
+    if args.serve:
+        serve_files(args.port, args.watch)
+    else:
+        generate_site()
diff --git a/jamstack/sites/plain/templates/index.html b/jamstack/sites/plain/templates/index.html
index f3c148b..df883c3 100644
--- a/jamstack/sites/plain/templates/index.html
+++ b/jamstack/sites/plain/templates/index.html
@@ -1,12 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
-
 <head>
-{% include 'sections/head.html' %}
+    {% include 'sections/head.html' %}
 </head>
-
-<body class="">
-{% include 'sections/body.html' %}
-</body>
-
-</html>
\ No newline at end of file
+	<body class="">
+	    {% include 'sections/body.html' %}
+	</body>
+</html>
diff --git a/jamstack/sites/plain/templates/sections/body.html b/jamstack/sites/plain/templates/sections/body.html
index c231a1e..6131e88 100644
--- a/jamstack/sites/plain/templates/sections/body.html
+++ b/jamstack/sites/plain/templates/sections/body.html
@@ -1,2 +1,2 @@
-<p class="border-box">Hello World {{ str(59).zfill(3) }}</p>
-<a href="https://pypi.org/project/jamstack/">generated using jamstack</a>
\ No newline at end of file
+<p class="border-box">Hello World!</p>
+<a href="https://pypi.org/project/jamstack/">Generated using Jamstack</a>
\ No newline at end of file
diff --git a/jamstack/sites/plain/templates/sections/head.html b/jamstack/sites/plain/templates/sections/head.html
index 4761ffd..060aca2 100644
--- a/jamstack/sites/plain/templates/sections/head.html
+++ b/jamstack/sites/plain/templates/sections/head.html
@@ -1,10 +1,11 @@
-    <title>web and software dev</title>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta charset="utf-8">
-    <meta name="description" content="{{ info['head']['description'] }}">
-    <meta name="keywords" content="{{ info['head']['keywords'] }}">
-    <meta name="author" content="{{ info['head']['author'] }}">
-    <meta name="theme-color" content="{{ info['head']['theme-color'] }}" />
-    <link rel="icon" href="">
-    <script type="text/javascript" src="js/script.js"></script>
-    <link rel="stylesheet" type="text/css" href="css/styles.css">
\ No newline at end of file
+<title>Jamstack Plain Site</title>
+<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
+<meta http-equiv="X-UA-Compatible" content="ie=edge">
+<meta charset="utf-8">
+<meta name="description" content="{{ info['head']['description'] }}">
+<meta name="keywords" content="{{ info['head']['keywords'] }}">
+<meta name="author" content="{{ info['head']['author'] }}">
+<meta name="theme-color" content="{{ info['head']['theme-color'] }}" />
+<link rel="icon" href="">
+<script type="text/javascript" src="js/script.js"></script>
+<link rel="stylesheet" type="text/css" href="css/styles.css">
diff --git a/requirements.txt b/requirements.txt
index 187e26c..de0fddd 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,9 +1,5 @@
 click==7.1.2
 Flask==1.1.2
-itsdangerous==1.1.0
-Jinja2==2.11.3
-livereload==2.6.3
-MarkupSafe==1.1.1
-six==1.15.0
-tornado==6.1
-Werkzeug==1.0.1
\ No newline at end of file
+requests==2.26.0
+tqdm==4.62.3
+livereload==2.5.1
diff --git a/setup.cfg b/setup.cfg
index 224a779..08aedd7 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,2 +1,2 @@
 [metadata]
-description-file = README.md
\ No newline at end of file
+description_file = README.md
diff --git a/setup.py b/setup.py
index 07bcdb1..eeed991 100644
--- a/setup.py
+++ b/setup.py
@@ -1,86 +1,49 @@
-"""A setuptools based setup module.
-See:
-https://packaging.python.org/guides/distributing-packages-using-setuptools/
-https://github.com/pypa/sampleproject
-
-
-python setup.py publish to publish
-
-"""
+import os
+import sys
 
-# Always prefer setuptools over distutils
 from setuptools import setup
 
-# from setuptools import find_packages
-
-import os
-import sys
-from jamstack import __version__  # thanks gunicorn
+from jamstack import __version__
 
 here = os.path.abspath(os.path.dirname(__file__))
 
-if sys.argv[-1] == "publish":  # requests
-    os.system("python setup.py sdist")  # bdist_wheel
+if sys.argv[-1] == "publish":
+    os.system("python setup.py sdist")
     os.system("twine upload dist/* --skip-existing")
     sys.exit()
 
-# Get the long description from the README file
 with open(os.path.join(here, "README.md"), encoding="utf-8") as f:
     long_description = f.read()
+
+with open(os.path.join(here, "requirements.txt"), encoding="utf-8") as f:
+    install_requires = f.read().split("\n")
+
 setup(
-    name="jamstack",  # Required
-    version=__version__,  # Required
-    description="Jamstack in Python",  # Optional
-    long_description=long_description,  # Optional
-    long_description_content_type="text/markdown",  # Optional (see note above)
-    url="https://github.com/Abdur-RahmaanJ/jamstack",  # Optional
-    author="Abdur-Rahmaan Janhangeer",  # Optional
-    author_email="arj.python@gmail.com",  # Optional
-    # Classifiers help users find your project by categorizing it.
-    #
-    # For a list of valid classifiers, see https://pypi.org/classifiers/
-    classifiers=[  # Optional
-        # How mature is this project? Common values are
-        #   3 - Alpha
-        #   4 - Beta
-        #   5 - Production/Stable
-        "Development Status :: 4 - Beta",
-        # Indicate who your project is intended for
+    name="jamstack",
+    version=f'{__version__}',
+    description="Jamstack in Python",
+    long_description=long_description,
+    long_description_content_type="text/markdown",
+    url="https://github.com/jamstackpy/jamstack",
+    author="Abdur-Rahmaan Janhangeer",
+    author_email="arj.python@gmail.com",
+    classifiers=[
+        "Development Status :: 5 - Production/Stable",
         "Intended Audience :: Developers",
-        # 'Topic :: Weather',
-        # Pick your license as you wish
         "License :: OSI Approved :: MIT License",
-        # Specify the Python versions you support here. In particular, ensure
-        # that you indicate whether you support Python 2, Python 3 or both.
-        # These classifiers are *not* checked by 'pip install'. See instead
-        # 'python_requires' below.
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
     ],
-    keywords="jamstack static",  # Optional
-    # You can just specify package directories manually here if your project is
-    # simple. Or you can use find_packages().
-    #
-    # Alternatively, if you just want to distribute a single Python file, use
-    # the `py_modules` argument instead as follows, which will expect a file
-    # called `my_module.py` to exist:
-    #
-    #   py_modules=["my_module"],
-    #
-    # packages=find_packages(exclude=['contrib', 'docs', 'tests']),  # Required
+    keywords="jamstack static website jinja2",
     packages=["jamstack"],
     include_package_data=True,
     python_requires=">=3.6",
-    install_requires=open(
-        os.path.join(here, "requirements.txt"), encoding="utf-8"
-    )
-    .read()
-    .split("\n"),  # Optional
-    project_urls={  # Optional
-        "Bug Reports": "https://github.com/Abdur-RahmaanJ/jamstack/issues",
-        "Source": "https://github.com/Abdur-RahmaanJ/jamstack/",
+    install_requires=install_requires,
+    project_urls={
+        "Bug Reports": "https://github.com/jamstackpy/jamstack/issues",
+        "Source": "https://github.com/jamstackpy/jamstack",
     },
     entry_points={"console_scripts": ["jamstack=jamstack.__main__:main"]},
 )