Replace my double-tab with an extra escape
Fix up layer shifting so no layer shifts are permanent