diff --git a/makefile b/makefile
index e08d4e3fb..15ed8f13e 100644
--- a/makefile
+++ b/makefile
@@ -1,26 +1,76 @@
-setup:
+define BROWSER_PYSCRIPT
+import os, webbrowser, sys
+
+from urllib.request import pathname2url
+
+webbrowser.open("file://" + pathname2url(os.path.abspath(sys.argv[1])))
+endef
+export BROWSER_PYSCRIPT
+
+define PRINT_HELP_PYSCRIPT
+import re, sys
+
+for line in sys.stdin:
+	match = re.match(r'^([a-zA-Z_-]+):.*?## (.*)$$', line)
+	if match:
+		target, help = match.groups()
+		print("%-20s %s" % (target, help))
+endef
+export PRINT_HELP_PYSCRIPT
+
+BROWSER := python -c "$$BROWSER_PYSCRIPT"
+
+help:
+	@python -c "$$PRINT_HELP_PYSCRIPT" < $(MAKEFILE_LIST)
+
+clean: clean-pyc clean-test ## remove all build, test, coverage and Python artifacts
+	
+clean-pyc: ## remove Python file artifacts
+	find . -name '*.pyc' -exec rm -f {} +
+	find . -name '*.pyo' -exec rm -f {} +
+	find . -name '*~' -exec rm -f {} +
+	find . -name '__pycache__' -exec rm -fr {} +
+
+clean-test: ## remove test and coverage artifacts
+	rm -fr .tox/
+	rm -f .coverage
+	rm -fr htmlcov/
+	rm -fr .pytest_cache
+
+test: ## run tests quickly with the default Python
+	poetry run pytest
+
+format:
+	poetry run black .
+
+lint: ## check style with flake8
+	poetry run flake8 mealie tests
+
+setup: ## Setup Development Instance
 	poetry install && \
 	cd frontend && \
 	npm install && \
 	cd ..
 
-backend: 
+backend: ## Start Mealie Backend Development Server
 	poetry run python mealie/db/init_db.py && \
 	poetry run python mealie/app.py
 
 .PHONY: frontend
-frontend:
+frontend: ## Start Mealie Frontend Development Server
 	cd frontend && npm run serve
 
 .PHONY: docs
-docs:
-	poetry run python mealie/utils/api_docs.py && \
+docs: ## Start Mkdocs Development Server
+	poetry run python dev/scripts/app_docs_gen.py && \
 	cd docs && poetry run python -m mkdocs serve
 
-docker-dev:
+docker-dev: ## Build and Start Docker Development Stack
 	docker-compose -f docker-compose.dev.yml -p dev-mealie up --build
 
-docker-prod:
+docker-prod: ## Build and Start Docker Production Stack
 	docker-compose -p mealie up --build -d
 
-	
\ No newline at end of file
+
+code-gen: ## Run Code-Gen Scripts
+	poetry run python dev/scripts/app_routes_gen.py
\ No newline at end of file