Add Dark/Light theme, fix ninder helper