fixes and trinity theme adjustments