NV3 Version

Copied all files from repository that was modified and pasted it into
the studiolite fork