Complete rework, using latest bower-versions now