merge akirad ui / themes + icons