NewTheme Project for 1st eval:Cleaned up