Updated theme code and added some nice themes