resolver fix + split theme
added examples