Fix stupid errors that were caused from fatigue
Fix stupid errors that were caused from fatigue
Take a different approach to horizontal/vertical
Revert to non-themed approach for pull request