diff --git a/.gitignore b/.gitignore
index 2757c2c..38a24a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,7 @@
 __pycache__/
 *.py[cod]
 *$py.class
-
+.idea/
 # C extensions
 *.so
 
diff --git a/CHANGELOGS.md b/CHANGELOGS.md
index 34e9102..c64e7f4 100644
--- a/CHANGELOGS.md
+++ b/CHANGELOGS.md
@@ -1,21 +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).
+    * 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**
+* 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 2cd20d8..8d4ee1d 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,9 @@
 
 ![](https://img.shields.io/pypi/v/jamstack)
 
-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.
+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
 
@@ -15,22 +17,22 @@ python -m pip install jamstack
 ## Create basic project
 
 ```bash
-jamstack plain <foldername> # or jamstack plain . --existing
+jamstack plain <foldername>
 ```
 
 ## Templates
 
 Jamstack has templates available courtesy of [html5up](https://html5up.net).
 
-| Template                                   | Command           | Tutorial                                                     |
-| ------------------------------------------ | ----------------- | ------------------------------------------------------------ |
-| [Massively](https://html5up.net/massively) | html5up/massively |                                                              |
+| 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> <foldername>
+jamstack t <template_command> <project_folder_name>
 ```
 
 Use the `--existing` flag if you want the project to be created in an existing folder
@@ -39,7 +41,9 @@ Use the `--existing` flag if you want the project to be created in an existing f
 jamstack t html5up/massively myproject --existing
 ```
 
-By default, projects 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.
+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.
 
 ## Build
 
@@ -51,10 +55,21 @@ python static.py
 
 Your site will be generated in the **dist/** folder.
 
-Alternatively you can use the `--server` flag if you want to start livewatch.
+## 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/)
-- [A Personal Site](https://compileralchemy.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 9c78a78..9260b35 100644
--- a/jamstack/__init__.py
+++ b/jamstack/__init__.py
@@ -1,2 +1,2 @@
-version_info = (1, 0, 0)
-__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 bab23cf..1754516 100644
--- a/jamstack/__main__.py
+++ b/jamstack/__main__.py
@@ -2,51 +2,43 @@
 from pathlib import Path
 
 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 = template.split('/')[0]
-    project = template.split('/')[1]
-
-    dirs_exist_ok = False
-    if existing is True:
-        dirs_exist_ok = True
+    namespace, project = template.split('/')
 
     trycopytree(
         os.path.join(sites_path, namespace, project),
         os.path.join(path, project_name),
-        dirs_exist_ok=dirs_exist_ok
+        existing
     )
 
 
diff --git a/jamstack/api/file.py b/jamstack/api/file.py
index 19aee07..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,19 +100,60 @@ def absdiroffile(filepath):
 
 
 def get_folders(path):
+    """
+    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 16e8fb7..1f19945 100644
--- a/jamstack/api/template.py
+++ b/jamstack/api/template.py
@@ -1,50 +1,70 @@
 import builtins
 import copy
 import datetime
+import json
 import string
-import uuid
 
 from jinja2 import Environment, FileSystemLoader
 
 
-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']]
+def load_json(file):
+    with open(file, 'r') as f:
+        return json.load(f)
 
-    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)
-    with open(out_path, 'w+', encoding="utf8") as f:
+    with open(output_path, 'w+', encoding="utf8") as f:
         f.write(output)
diff --git a/jamstack/jamdo/jamdo.py b/jamstack/jamdo/jamdo.py
index aedca51..4ca1d2b 100644
--- a/jamstack/jamdo/jamdo.py
+++ b/jamstack/jamdo/jamdo.py
@@ -1,46 +1,38 @@
-import json
 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")
+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):
-    tmp_url = url.replace(
+    raw_url = url.replace(
         'https://api.github.com/repos/',
         'https://raw.githubusercontent.com/')
-    tmp_url = tmp_url.split('/git/blobs/')[0]
-    tmp_url = tmp_url + '/master/' + file_path
-    return tmp_url
+    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).text
-    print(templates_url)
-    files = json.loads(api)
+    api = requests.get(TEMPLATES_URL).json()
+    files = api['tree']
     output = []
-    location = dict()
-    for (k, i) in enumerate(files['tree']):
-        if template in i['path']:
-            if i['type'] == 'blob':
-                tmp = [i['path']]
-                tmp += [get_raw_url(tmp[0], i['url'])]
-                output.append(tmp)
+    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[i['path']] = k
-    files = output
-    location = location
-
-    return (files, location)
-
-
-def mkdirs(path):
-    if not os.path.isdir(path):
-        os.makedirs(path)
+                location[file['path']] = i
+    return output, location
 
 
 def download(template, target_folder='*', recursive=True):
@@ -48,25 +40,15 @@ def download(template, target_folder='*', recursive=True):
     files = data[0]
     location = data[1]
 
-    # mkdirs(".")
-
     if target_folder == '*':
         start = 0
     else:
-        tmp_target = target_folder.replace('./', '')
-        tmp_target = tmp_target.replace('../', '')
-
-        # Remove "/"
-        tmp_target = (tmp_target if tmp_target[-1] != '/'
-                      else tmp_target[:-1])
         start = location[target_folder]
 
-    # Start download
     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:
+            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/settings.py b/jamstack/sites/html5up/massively/settings.py
index caf13a2..ff5e831 100644
--- a/jamstack/sites/html5up/massively/settings.py
+++ b/jamstack/sites/html5up/massively/settings.py
@@ -2,7 +2,7 @@
 info = {
     "social": {
         "facebook": "",
-        "twitter": "https://twitter.com/osdotsystem",
+        "twitter": "",
         "instagram": "",
         "github": ""
     },
diff --git a/jamstack/sites/html5up/massively/static.py b/jamstack/sites/html5up/massively/static.py
index a302d00..8680250 100644
--- a/jamstack/sites/html5up/massively/static.py
+++ b/jamstack/sites/html5up/massively/static.py
@@ -1,54 +1,42 @@
-# https://github.com/pymug/website-AV19-AV20
-
-import sys
+import argparse
 from os.path import join
 
-import settings
-from flask import Flask
-from jamstack.api.template import base_context, generate
-from jamstack.jamdo.jamdo import download as download_template
 from livereload import Server
 
-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)
+import settings
+from jamstack.api.template import generate
+from jamstack.jamdo.jamdo import download as download_template
 
-    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)
+def generate_site():
+    extra_context = {"info": settings.info}
 
-        # run a shell command
-        # server.watch('.', 'make static')
+    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)
 
-        # 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()
-    elif len(args) > 1 and args[1] == '--jamdo':
+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/massively')
     else:
-        gen()
-
-
-if __name__ == '__main__':
-    main(sys.argv)
+        generate_site()
diff --git a/jamstack/sites/html5up/phantom/info.json b/jamstack/sites/html5up/phantom/info.json
index 7dffa0e..7efdeaf 100644
--- a/jamstack/sites/html5up/phantom/info.json
+++ b/jamstack/sites/html5up/phantom/info.json
@@ -64,8 +64,8 @@
         }
     },
     "metatags": {
-        "description": "Webpage description",
-        "keywords": "jamstack, python, html5up",
+        "description": "A modern and responsive Jamstack website built with Python",
+        "keywords": "Python, Jamstack, website, responsive, modern",
         "author": "Jhon Doe",
         "copyright": "Jhon Doe"
     },
diff --git a/jamstack/sites/html5up/phantom/settings.py b/jamstack/sites/html5up/phantom/settings.py
index 6271e89..34d89e1 100644
--- a/jamstack/sites/html5up/phantom/settings.py
+++ b/jamstack/sites/html5up/phantom/settings.py
@@ -1,11 +1,6 @@
-import json
+from jamstack.api.template import load_json
 
 OUTPUT_FOLDER = 'dist/'
-info = None
-posts = None
 
-with open('info.json') as f:
-    info = json.load(f)
-
-with open('posts.json') as f:
-    posts = json.load(f)
+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
index a8b93ea..e38ec90 100644
--- a/jamstack/sites/html5up/phantom/static.py
+++ b/jamstack/sites/html5up/phantom/static.py
@@ -1,65 +1,50 @@
-# https://github.com/pymug/website-AV19-AV20
-
-import sys
+import argparse
 from os.path import join
 
-import settings
-from flask import Flask
-from jamstack.api.template import base_context, generate
-from jamstack.jamdo.jamdo import download as download_template
 from livereload import Server
 
-context = base_context()
-context.update({
-    "info": settings.info,
-    "posts": settings.posts
-})
-
-
-def main(args):
-    def gen():
-        generate('index.html', join(
-            settings.OUTPUT_FOLDER, 'index.html'), **context)
-
-        # Generate pages based in sidebar items
-        sidebar = settings.info['sidebar']
-        for item in sidebar:
-            page = sidebar[item]['page']
-            generate(page, join(settings.OUTPUT_FOLDER, page), **context)
+import settings
+from jamstack.api.template import generate
+from jamstack.jamdo.jamdo import download as download_template
 
-        # Generate posts pages
-        posts = settings.posts['posts']
-        for post in posts:
-            page = posts[post]['page']
-            generate(page, join(
-                settings.OUTPUT_FOLDER, page), **context)
 
-    if len(args) > 1 and args[1] == '--server':
-        app = Flask(__name__)
+def generate_site():
+    extra_context = {"info": settings.info,
+                     "posts": settings.posts}
+    generate('index.html', join(settings.OUTPUT_FOLDER, 'index.html'), context=extra_context)
 
-        # 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)
+    # 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)
 
-        # run a shell command
-        # server.watch('.', 'make static')
+    # Generate posts pages
+    for post in settings.posts['posts'].values():
+        page = post['page']
+        generate(page, join(settings.OUTPUT_FOLDER, page), 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()
-    elif len(args) > 1 and args[1] == '--jamdo':
+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:
-        gen()
-
-
-if __name__ == '__main__':
-    main(sys.argv)
+        generate_site()
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 8973fdd..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)
+info = load_json('info.json')
diff --git a/jamstack/sites/plain/static.py b/jamstack/sites/plain/static.py
index fdf1966..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
 
-import settings
-from flask import Flask
-from jamstack.api.template import base_context, generate
 from livereload import Server
 
-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)
+import settings
+from jamstack.api.template import generate
 
-        # run a shell command
-        # server.watch('.', 'make static')
 
-        # run a function
+def generate_site():
+    extra_context = {"info": settings.info}
+    generate('index.html', join(settings.OUTPUT_FOLDER, 'index.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'))
-
-        server.serve()
-    else:
-        gen()
+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__':
-    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 5bfdda5..df883c3 100644
--- a/jamstack/sites/plain/templates/index.html
+++ b/jamstack/sites/plain/templates/index.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
-	<head>
-		{% include 'sections/head.html' %}
-	</head>
+<head>
+    {% include 'sections/head.html' %}
+</head>
 	<body class="">
-		{% include 'sections/body.html' %}
+	    {% include 'sections/body.html' %}
 	</body>
-</html>
\ No newline at end of file
+</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 b1b579c..060aca2 100644
--- a/jamstack/sites/plain/templates/sections/head.html
+++ b/jamstack/sites/plain/templates/sections/head.html
@@ -1,5 +1,6 @@
-<title>web and software dev</title>
-<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<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'] }}">
@@ -7,4 +8,4 @@
 <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
+<link rel="stylesheet" type="text/css" href="css/styles.css">
diff --git a/requirements.txt b/requirements.txt
index 61696fe..de0fddd 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,11 +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
 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 95decc3..eeed991 100644
--- a/setup.py
+++ b/setup.py
@@ -1,9 +1,9 @@
 import os
 import sys
 
-from jamstack import __version__
 from setuptools import setup
 
+from jamstack import __version__
 
 here = os.path.abspath(os.path.dirname(__file__))
 
@@ -14,9 +14,13 @@
 
 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",
-    version=__version__,
+    version=f'{__version__}',
     description="Jamstack in Python",
     long_description=long_description,
     long_description_content_type="text/markdown",
@@ -24,7 +28,7 @@
     author="Abdur-Rahmaan Janhangeer",
     author_email="arj.python@gmail.com",
     classifiers=[
-        "Development Status :: 4 - Beta",
+        "Development Status :: 5 - Production/Stable",
         "Intended Audience :: Developers",
         "License :: OSI Approved :: MIT License",
         "Programming Language :: Python :: 3.6",
@@ -32,15 +36,11 @@
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
     ],
-    keywords="jamstack static",
+    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"),
+    install_requires=install_requires,
     project_urls={
         "Bug Reports": "https://github.com/jamstackpy/jamstack/issues",
         "Source": "https://github.com/jamstackpy/jamstack",