updated themes and cleaned up