Some more X-mode strats & refinements#2114

osse101 merged 4 commits intovg-json-data:mastervg-json-data/sm-json-data:masterfrom

blkerby:x-mode-shinechargesblkerby/sm-json-data:x-mode-shinechargesCopy head branch name to clipboard