Update style + separate into rpi section.