diff --git a/public/objects/window/Window95.jsx b/public/objects/window/Window95.jsx
index 5f5b735..d923760 100644
--- a/public/objects/window/Window95.jsx
+++ b/public/objects/window/Window95.jsx
@@ -22,19 +22,18 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 import React from 'react';
+
+import Styles from './_window95.scss';
+
+import Window from './window/Window';
+
 import TitleBar, { Close, Minimize } from './TitleBar';
 import MenuBar, { MenuOption } from './MenuBar';
 import ContextMenu, { ContextMenuOption } from './ContextMenu';
 import Frame from './Frame';
 import AddressBar from './AddressBar';
 
-export default (props) => {
-  return (
-    <div className="o-window">
-      { props.children }
-    </div>
-  );
-}
+export default Window;
 
 export {
   TitleBar,
@@ -48,6 +47,7 @@ export {
   ContextMenuOption,
 
   Frame,
+  Window,
 
   AddressBar
 }
diff --git a/public/styles/objects/_window95.scss b/public/objects/window/_window95.scss
similarity index 99%
rename from public/styles/objects/_window95.scss
rename to public/objects/window/_window95.scss
index 5a71233..a3abe44 100644
--- a/public/styles/objects/_window95.scss
+++ b/public/objects/window/_window95.scss
@@ -7,7 +7,7 @@
  *  Version:
  *    1.0.0 - 2018/06/24
  */
-
+@import '~@styles/global';
 $o-window--color-background: #C0C0C0;
 $o-window--color-highlight: #0000BF;
 $o-window--color-disabled: #808080;
diff --git a/public/objects/window/window/Window.jsx b/public/objects/window/window/Window.jsx
new file mode 100644
index 0000000..b6bc5ea
--- /dev/null
+++ b/public/objects/window/window/Window.jsx
@@ -0,0 +1,33 @@
+// Copyright (c) 2018 Dominic Masters
+//
+// MIT License
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+import React from 'react';
+
+import Styles from './Window.scss';
+
+export default props => {
+  let { className } = props;
+  let clazz = "o-window";
+  if(className) clazz += ` ${className}`;
+  return <div {...props} className={clazz} />
+};
diff --git a/public/objects/window/window/Window.scss b/public/objects/window/window/Window.scss
new file mode 100644
index 0000000..3a808d7
--- /dev/null
+++ b/public/objects/window/window/Window.scss
@@ -0,0 +1,8 @@
+/*
+ *  Window
+ *    Windows 95 styled Window frame
+ *
+ *  Version:
+ *    3.0.0 - 2018/10/25
+ */
+@import '~@styles/global';