cleaned up themed