Merge branch 'Convert-to-WP-Theme'