While most individuals with mental illness currently receive treatment in the community, dedicated psychiatric care facilities are critical spaces for those in crisis. Yet their low tolerance for risk mandates that architecture must anticipate and mitigate instances of patient violence, self-harm, and escape. However, by designing for the most at-risk patient, the architect presumes the same likelihood of risk for all patients, often leading to reductive and uninspired spaces. In psychiatric care, the architectural environment can enhance or undermine patient wellness, staff interactions, and even public perception. To contribute to redefining the mandate of architecture in this context, this thesis proposes a catalogue of architectural details that seek to prioritize patient well-being and facilitate therapeutic interactions while remaining safe and appropriate for those in psychiatric crisis. These details are then situated within proposed renovations of Psychiatric Emergency Services (PES) at The Ottawa Hospital.