Fix /theme and /layout commands. #3