Converted all files to use element-kits latest + cleanup