Reorganized theme files and updated some templates/styles