More theme updates et.c