add potion and lime themes, minor cleanups