Shiki Eiki set #1

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

9 Commits