Removed some trailing spaces
Moved the shift list generator
Renamed and modified some configuration entries