Tweaks to expiration date, switch back to selfstarter theme