Track the new frameworks and settings branches

Signed-off-by: Dragon <dragon7780@hotmail.nl>