Jockie, you're right, they are both thematic. In 36a, the definition is the last three words and it's thematically paired with 8d. In 31d, the definition is the first three words, wordplay is two single letters followed by a synonym for almost with one letter substituted. It's thematically paired with 10a