wicker migration
readded components
cleanup
refactored?
fixes
Many improvements, version 2.1 done!