diff --git a/src/components/rich_content/rich_content.jsx b/src/components/rich_content/rich_content.jsx
index 342bb1e5..634236ef 100644
--- a/src/components/rich_content/rich_content.jsx
+++ b/src/components/rich_content/rich_content.jsx
@@ -71,12 +71,10 @@ export default {
   // NEVER EVER TOUCH DATA INSIDE RENDER
   render () {
     // Don't greentext MFM
-    if (this.mfm) {
-      this.greentext = false
-    }
+    const greentext = this.mfm ? false : this.greentext
 
     // Pre-process HTML
-    const { newHtml: html } = preProcessPerLine(this.html, this.greentext)
+    const { newHtml: html } = preProcessPerLine(this.html, greentext)
     let currentMentions = null // Current chain of mentions, we group all mentions together
     // This is used to recover spacing removed when parsing mentions
     let lastSpacing = ''
diff --git a/static/mfm.css b/static/mfm.css
index 57989a19..a59ec2ce 100644
--- a/static/mfm.css
+++ b/static/mfm.css
@@ -23,10 +23,10 @@
   animation: mfm-spin 0.5s linear infinite;
 }
 
-._mfm_spin_[x] {
+._mfm_spin_[data-x] {
   animation-name: mfm-spinX;
 }
-._mfm_spin_[y] {
+._mfm_spin_[data-y] {
   animation-name: mfm-spinY;
 }
 ._mfm_spin_[left] {