Added all Wizards + Passphrase dialogs.
Small merging problems fixed