* Merge branch 'dev' * update theme library * update author to use equicord constants * Delete Dev Stuff For Merge