Oops utils and theme updates
Adding untracked modules