Organized a bit and updated some files to fix behavior/syntax with recent Arch update.