brought in dev theme
added some more files from dev
fixed typo that caused an error