Theme V2.0
File Cleanup