diff --git a/public/components/w95/ContextButton.jsx b/public/components/w95/ContextButton.jsx
index aa2e1f2..f358298 100644
--- a/public/components/w95/ContextButton.jsx
+++ b/public/components/w95/ContextButton.jsx
@@ -52,7 +52,7 @@ class ContextButton extends Component {
   }
 
   render() {
-    let cls = "btn";
+    let cls = "c-context-menu__btn";
 
     let options = [];
     if(this.props.data === "disabled") {
@@ -70,7 +70,7 @@ class ContextButton extends Component {
     let menu = <div></div>;
     if(options.length > 0) {
       menu = (
-        <div className="menu">
+        <div className="c-context-menu__menu">
           {options}
         </div>
       );
diff --git a/public/components/w95/ContextMenu.jsx b/public/components/w95/ContextMenu.jsx
index eede9fa..9231e7e 100644
--- a/public/components/w95/ContextMenu.jsx
+++ b/public/components/w95/ContextMenu.jsx
@@ -59,7 +59,7 @@ class ContextMenu extends Component {
     }
 
     return (
-      <div className="context-menu">
+      <div className="c-context-menu">
         {contextButtons}
       </div>
     );
diff --git a/public/components/w95/ContextMenuButton.jsx b/public/components/w95/ContextMenuButton.jsx
index 98b9647..f4019f1 100644
--- a/public/components/w95/ContextMenuButton.jsx
+++ b/public/components/w95/ContextMenuButton.jsx
@@ -30,7 +30,7 @@ class ContextMenuButton extends Component {
   isDisabled() {return this.props.data === "disabled";}
 
   render() {
-    let cls = "menu-option";
+    let cls = "c-context-menu__menu-option";
 
     if(this.isDisabled()) cls += " disabled";
 
diff --git a/public/styles/components/_w95.scss b/public/styles/components/_w95.scss
index 8962012..c99282f 100644
--- a/public/styles/components/_w95.scss
+++ b/public/styles/components/_w95.scss
@@ -3,7 +3,9 @@
 
 @import './w95/_window.scss';
 @import './w95/_title-bar.scss';
+@import './w95/_window-button.scss';
 @import './w95/_text-field.scss';
+@import './w95/_window-menu.scss';
 
 /*$windowBG: #C0C0C0;
 $highlight: #0000BF;
diff --git a/public/styles/components/w95/_window-button.scss b/public/styles/components/w95/_window-button.scss
new file mode 100644
index 0000000..76ba250
--- /dev/null
+++ b/public/styles/components/w95/_window-button.scss
@@ -0,0 +1,29 @@
+.c-window-buttons {
+  height: 100%;
+  float: right;
+  font-size: 0;
+}
+
+.c-window-btn {
+  @include button95($w95Scale);
+  width: 16px*$w95Scale;
+  height: 14px*$w95Scale;
+  font-size: 12px*$w95Scale;
+
+  &.close {
+    margin-left: 2px*$w95Scale;
+    background-position-x: 0px*$w95Scale;
+  }
+
+  &.help {
+    background-position-x: 36px*$w95Scale;
+  }
+
+  &.minimize {
+    background-position-x: 24px*$w95Scale;
+  }
+
+  &.maximize {
+    background-position-x: 12px*$w95Scale;
+  }
+}