merged @kdeebee 's PR

merged @kdeebee's PR and fixed merge conflict and adjusted terminal prompts to match current pattern