cleanup, some basic themes