Update + Add Settigns & Framework