4/4 - Further template edits; including database and uploads folder