diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 5d1aac4..e1ad8cf 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,17 +6,15 @@
     </artifacts-to-build>
   </component>
   <component name="BookmarkManager">
-    <bookmark url="file://$PROJECT_DIR$/src/MaterialUISwingDemo.java" line="73" />
+    <bookmark url="file://$PROJECT_DIR$/src/MaterialUISwingDemo.java" line="69" />
   </component>
   <component name="ChangeListManager">
     <list default="true" id="3162ee46-df58-4f91-b058-73617e5ff7b2" name="Default" comment="">
+      <change afterPath="$PROJECT_DIR$/src/mdlaf/components/tabbedpane/MaterialTabbedPaneUI.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/lib/material-ui-swing.jar" beforeDir="false" afterPath="$PROJECT_DIR$/lib/material-ui-swing.jar" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/MaterialUISwingDemo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/MaterialUISwingDemo.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/mdlaf/MaterialLookAndFeel.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/mdlaf/MaterialLookAndFeel.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/mdlaf/animation/MaterialUITimer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/mdlaf/animation/MaterialUITimer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/mdlaf/components/menubar/MaterialMenuBarUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/mdlaf/components/menubar/MaterialMenuBarUI.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/mdlaf/resources/MaterialImages.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/mdlaf/resources/MaterialImages.java" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -31,11 +29,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="MaterialRadioButtonUI.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/mdlaf/components/radiobutton/MaterialRadioButtonUI.java">
+      <file leaf-file-name="MaterialUISwingDemo.java" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/MaterialUISwingDemo.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="163">
-              <caret line="24" selection-start-line="24" selection-end-line="24" />
+            <state relative-caret-position="148">
+              <caret line="54" selection-start-line="54" selection-end-line="54" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -43,15 +41,6 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="MaterialMenuBarUI.java" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/mdlaf/components/menubar/MaterialMenuBarUI.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="285">
-              <caret line="28" column="5" selection-start-line="28" selection-start-column="5" selection-end-line="28" selection-end-column="5" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -93,7 +82,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/mdlaf/text/password/password/MaterialPasswordFieldUI.java" />
         <option value="$PROJECT_DIR$/src/mdlaf/text/AbstractMaterialTextUI.java" />
         <option value="$PROJECT_DIR$/src/mdlaf/text/MaterialTextUI.java" />
         <option value="$PROJECT_DIR$/src/mdlaf/text/textfield/MaterialTextFieldUI.java" />
@@ -139,11 +127,12 @@
         <option value="$PROJECT_DIR$/src/mdlaf/components/label/MaterialLabelUI.java" />
         <option value="$PROJECT_DIR$/src/mdlaf/animation/MaterialUIMovement.java" />
         <option value="$PROJECT_DIR$/src/mdlaf/components/textfield/MaterialTextFieldUI.java" />
-        <option value="$PROJECT_DIR$/src/mdlaf/MaterialLookAndFeel.java" />
-        <option value="$PROJECT_DIR$/src/MaterialUISwingDemo.java" />
         <option value="$PROJECT_DIR$/src/mdlaf/animation/MaterialUITimer.java" />
         <option value="$PROJECT_DIR$/src/mdlaf/components/radiobutton/MaterialRadioButtonUI.java" />
         <option value="$PROJECT_DIR$/src/mdlaf/components/menubar/MaterialMenuBarUI.java" />
+        <option value="$PROJECT_DIR$/src/mdlaf/MaterialLookAndFeel.java" />
+        <option value="$PROJECT_DIR$/src/mdlaf/components/tabbedpane/MaterialTabbedPaneUI.java" />
+        <option value="$PROJECT_DIR$/src/MaterialUISwingDemo.java" />
       </list>
     </option>
   </component>
@@ -199,7 +188,7 @@
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="mdlaf" type="462c0819:PsiDirectoryNode" />
               <item name="components" type="462c0819:PsiDirectoryNode" />
-              <item name="menubar" type="462c0819:PsiDirectoryNode" />
+              <item name="panel" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="material-ui-swing" type="b2602c69:ProjectViewProjectNode" />
@@ -207,7 +196,7 @@
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="mdlaf" type="462c0819:PsiDirectoryNode" />
               <item name="components" type="462c0819:PsiDirectoryNode" />
-              <item name="radiobutton" type="462c0819:PsiDirectoryNode" />
+              <item name="spinner" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
           <select />
@@ -356,9 +345,6 @@
     <entry file="file://$PROJECT_DIR$/src/MaterialUISwingDemo.java">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/MaterialUISwingDemo.java">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/mdlaf/animation/MaterialUIMovement.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="59">
@@ -528,13 +514,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/mdlaf/components/spinner/MaterialSpinnerUI.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-187">
-          <caret line="22" column="40" selection-start-line="22" selection-start-column="40" selection-end-line="22" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/mdlaf/components/table/MaterialTableUI.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="90">
@@ -614,61 +593,81 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/mdlaf/components/panel/MaterialPanelUI.java">
+    <entry file="file://$PROJECT_DIR$/src/mdlaf/animation/MaterialUITimer.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="255">
-          <caret line="17" column="5" selection-start-line="17" selection-start-column="5" selection-end-line="17" selection-end-column="5" />
+        <state relative-caret-position="304">
+          <caret line="84" column="22" selection-start-line="84" selection-start-column="22" selection-end-line="84" selection-end-column="22" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/mdlaf/MaterialLookAndFeel.java">
+    <entry file="file://$PROJECT_DIR$/src/mdlaf/animation/MaterialUIMovement.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="316">
-          <caret line="108" column="24" selection-start-line="108" selection-start-column="24" selection-end-line="108" selection-end-column="24" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="240">
+          <caret line="17" selection-start-line="17" selection-end-line="17" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/mdlaf/animation/MaterialUITimer.java">
+    <entry file="file://$PROJECT_DIR$/src/mdlaf/components/menubar/MaterialMenuBarUI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="84" column="22" selection-start-line="84" selection-start-column="22" selection-end-line="84" selection-end-column="22" />
+        <state relative-caret-position="285">
+          <caret line="28" column="5" selection-start-line="28" selection-start-column="5" selection-end-line="28" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/mdlaf/animation/MaterialUIMovement.java">
+    <entry file="file://$PROJECT_DIR$/src/mdlaf/components/radiobutton/MaterialRadioButtonUI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="240">
-          <caret line="17" selection-start-line="17" selection-end-line="17" />
+        <state relative-caret-position="163">
+          <caret line="24" selection-start-line="24" selection-end-line="24" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/MaterialUISwingDemo.java">
+    <entry file="file://$PROJECT_DIR$/src/mdlaf/MaterialLookAndFeel.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="223">
-          <caret line="63" column="29" selection-start-line="63" selection-start-column="29" selection-end-line="63" selection-end-column="29" />
+        <state relative-caret-position="175">
+          <caret line="107" column="12" selection-start-line="107" selection-start-column="12" selection-end-line="107" selection-end-column="12" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/mdlaf/components/radiobutton/MaterialRadioButtonUI.java">
+    <entry file="file://$PROJECT_DIR$/src/mdlaf/components/panel/MaterialPanelUI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="163">
-          <caret line="24" selection-start-line="24" selection-end-line="24" />
+        <state relative-caret-position="255">
+          <caret line="17" column="5" selection-start-line="17" selection-start-column="5" selection-end-line="17" selection-end-column="5" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/mdlaf/components/menubar/MaterialMenuBarUI.java">
+    <entry file="file://$PROJECT_DIR$/src/mdlaf/components/spinner/MaterialSpinnerUI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="285">
-          <caret line="28" column="5" selection-start-line="28" selection-start-column="5" selection-end-line="28" selection-end-column="5" />
+        <state relative-caret-position="178">
+          <caret line="59" lean-forward="true" selection-start-line="59" selection-end-line="59" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/mdlaf/components/tabbedpane/MaterialTabbedPaneUI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="142">
+          <caret line="12" column="25" selection-start-line="12" selection-start-column="25" selection-end-line="12" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/MaterialUISwingDemo.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="148">
+          <caret line="54" selection-start-line="54" selection-end-line="54" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/lib/material-ui-swing.jar b/lib/material-ui-swing.jar
index 7e1284b..da087f9 100644
Binary files a/lib/material-ui-swing.jar and b/lib/material-ui-swing.jar differ
diff --git a/src/MaterialUISwingDemo.java b/src/MaterialUISwingDemo.java
index e5f8835..231dd61 100644
--- a/src/MaterialUISwingDemo.java
+++ b/src/MaterialUISwingDemo.java
@@ -7,7 +7,6 @@
 import javax.swing.JMenuBar;
 import javax.swing.JMenuItem;
 import javax.swing.JPanel;
-import javax.swing.JRadioButton;
 import javax.swing.UIManager;
 import javax.swing.UnsupportedLookAndFeelException;
 import java.awt.BorderLayout;
@@ -67,9 +66,6 @@ public static void main (String[] args) {
 		Color blue = new Color (34, 167, 240);
 		MaterialUIMovement.add (button, blue, 5, 1000 / 30);
 
-		JRadioButton b = new JRadioButton ("test");
-		content.add (b);
-
 		// make everything visible to the world
 		frame.pack ();
 		frame.setVisible (true);
diff --git a/src/mdlaf/MaterialLookAndFeel.java b/src/mdlaf/MaterialLookAndFeel.java
index 6a4ec3b..0ecbc98 100644
--- a/src/mdlaf/MaterialLookAndFeel.java
+++ b/src/mdlaf/MaterialLookAndFeel.java
@@ -10,6 +10,7 @@
 import mdlaf.components.password.MaterialPasswordFieldUI;
 import mdlaf.components.radiobutton.MaterialRadioButtonUI;
 import mdlaf.components.spinner.MaterialSpinnerUI;
+import mdlaf.components.tabbedpane.MaterialTabbedPaneUI;
 import mdlaf.components.table.MaterialTableHeaderUI;
 import mdlaf.components.table.MaterialTableUI;
 import mdlaf.components.textfield.MaterialTextFieldUI;
@@ -39,6 +40,7 @@ public class MaterialLookAndFeel extends BasicLookAndFeel {
 	private static final String menuUI = MaterialMenuUI.class.getCanonicalName ();
 	private static final String checkBoxUI = MaterialCheckBoxUI.class.getCanonicalName ();
 	private static final String radioButtonUI = MaterialRadioButtonUI.class.getCanonicalName ();
+	private static final String tabbedPaneUI = MaterialTabbedPaneUI.class.getCanonicalName ();
 
 	@Override
 	public String getName () {
@@ -82,6 +84,7 @@ protected void initClassDefaults (UIDefaults table) {
 		table.put ("MenuUI", menuUI);
 		table.put ("CheckBoxUI", checkBoxUI);
 		table.put ("RadioButtonUI", radioButtonUI);
+		table.put ("TabbedPaneUI", tabbedPaneUI);
 	}
 
 	@Override
diff --git a/src/mdlaf/components/tabbedpane/MaterialTabbedPaneUI.java b/src/mdlaf/components/tabbedpane/MaterialTabbedPaneUI.java
new file mode 100644
index 0000000..cfee9a6
--- /dev/null
+++ b/src/mdlaf/components/tabbedpane/MaterialTabbedPaneUI.java
@@ -0,0 +1,65 @@
+package mdlaf.components.tabbedpane;
+
+import mdlaf.resources.MaterialColors;
+import mdlaf.resources.MaterialDrawingUtils;
+import mdlaf.resources.MaterialFonts;
+
+import javax.swing.BorderFactory;
+import javax.swing.JComponent;
+import javax.swing.JTabbedPane;
+import javax.swing.plaf.ComponentUI;
+import javax.swing.plaf.basic.BasicTabbedPaneUI;
+import java.awt.Color;
+import java.awt.Graphics;
+import java.awt.Rectangle;
+
+public class MaterialTabbedPaneUI extends BasicTabbedPaneUI {
+
+	public static ComponentUI createUI (JComponent c) {
+		return new MaterialTabbedPaneUI ();
+	}
+
+	@Override
+	public void installUI (JComponent c) {
+		super.installUI (c);
+
+		JTabbedPane tabbedPane = (JTabbedPane) c;
+		tabbedPane.setOpaque (false);
+		tabbedPane.setFont (MaterialFonts.REGULAR);
+		tabbedPane.setBackground (Color.WHITE);
+		tabbedPane.setForeground (Color.BLACK);
+		tabbedPane.setBorder (BorderFactory.createEmptyBorder ());
+
+		darkShadow = null;
+		shadow = null;
+		lightHighlight = MaterialColors.LIGHT_GRAY;
+	}
+
+	@Override
+	public void paint (Graphics g, JComponent c) {
+		super.paint (MaterialDrawingUtils.getAliasedGraphics (g), c);
+	}
+
+	@Override
+	protected void paintTabBackground (Graphics g, int tabPlacement, int tabIndex, int x, int y, int w, int h, boolean isSelected) {
+		g.setColor (isSelected ? lightHighlight : tabPane.getBackground ());
+		g.fillRect (x, y, w, h);
+	}
+
+	@Override
+	protected void paintTabBorder (Graphics g, int tabPlacement, int tabIndex, int x, int y, int w, int h, boolean isSelected) {
+		g.setColor (Color.LIGHT_GRAY);
+		g.drawRect (x, y, w, h);
+	}
+
+	@Override
+	protected void paintFocusIndicator (Graphics g, int tabPlacement, Rectangle[] rects, int tabIndex, Rectangle iconRect, Rectangle textRect, boolean isSelected) {
+		// do nothing
+	}
+
+	@Override
+	protected void paintTab (Graphics g, int tabPlacement, Rectangle[] rects, int tabIndex, Rectangle iconRect, Rectangle textRect) {
+		// for some reason tabs aren't painted properly by paint()
+		super.paintTab (MaterialDrawingUtils.getAliasedGraphics (g), tabPlacement, rects, tabIndex, iconRect, textRect);
+	}
+}