Config Update + Cleanup! Big thanks to @Dorimanx