Changed Theme- Need to finish changing rest