Settings

Ok I merged the current version and my Setting modal is working -- the video feature isn't though.