Minor theme id tweaks