Shiki Eiki set #1

Open
aniva wants to merge 8 commits from pattern/shiki-eiki into main

8 Commits