finish remaining theme extension stuff