Fixed deprecations
Moved to @import