refactor + macro fixes + theme system

Dockerfile

@@ -9,7 +9,7 @@ RUN pip install --no-cache-dir -r requirements.txt
 # Copy source code
 COPY app.py .
 COPY templates/ ./templates/
-#COPY static/ ./static/
+COPY static/ ./static/
 #COPY .env .
 
 # Create the folder structure for the volume mounts