Move some logic to wetkit theme