* Add filament vendors part 1 * Add filament vendors part 2 * Fix merge confilcts * Readd filament vendors & remove duplicate
* Add filament vendors part 1 * Add filament vendors part 2 * Fix merge confilcts * Readd filament vendors & remove duplicate