diff --git a/greendroid/.gitignore b/greendroid/.gitignore
index 37dc7d784..1136241e6 100644
--- a/greendroid/.gitignore
+++ b/greendroid/.gitignore
@@ -1,4 +1,6 @@
 */bin/*
 */gen/*
 *.DS_Store
-*.pyc
\ No newline at end of file
+*.pyc
+GDCatalog/.project
+GreenDroid-GoogleAPIs/.project
diff --git a/greendroid/GDCatalog/.classpath b/greendroid/GDCatalog/.classpath
index a785243ee..28d6a6ece 100644
--- a/greendroid/GDCatalog/.classpath
+++ b/greendroid/GDCatalog/.classpath
@@ -3,7 +3,6 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/GreenDroid"/>
 	<classpathentry kind="src" path="GreenDroid_src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/greendroid/GDCatalog/default.properties b/greendroid/GDCatalog/default.properties
index 3c8031c8f..2dde05127 100644
--- a/greendroid/GDCatalog/default.properties
+++ b/greendroid/GDCatalog/default.properties
@@ -10,5 +10,5 @@
 # Indicates whether an apk should be generated for each density.
 split.density=false
 # Project target.
-target=android-4
+target=android-8
 android.library.reference.1=../GreenDroid
diff --git a/greendroid/GreenDroid-GoogleAPIs/.project b/greendroid/GreenDroid-GoogleAPIs/.project
deleted file mode 100644
index 19c45f478..000000000
--- a/greendroid/GreenDroid-GoogleAPIs/.project
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>GreenDroid-GoogleAPIs</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-	<linkedResources>
-		<link>
-			<name>GreenDroid_src</name>
-			<type>2</type>
-			<locationURI>_android_GreenDroid_612cb559/src</locationURI>
-		</link>
-	</linkedResources>
-</projectDescription>
diff --git a/greendroid/GreenDroid-GoogleAPIs/default.properties b/greendroid/GreenDroid-GoogleAPIs/default.properties
index 935267c0c..e756ce911 100644
--- a/greendroid/GreenDroid-GoogleAPIs/default.properties
+++ b/greendroid/GreenDroid-GoogleAPIs/default.properties
@@ -8,6 +8,6 @@
 # project structure.
 
 # Project target.
-target=Google Inc.:Google APIs:4
+target=Google Inc.:Google APIs:8
 android.library=true
 android.library.reference.1=../GreenDroid/
diff --git a/greendroid/GreenDroid/res/values-v5/gd_themes.xml b/greendroid/GreenDroid/res/values-v5/gd_themes.xml
index afda6e372..a027ea8d9 100644
--- a/greendroid/GreenDroid/res/values-v5/gd_themes.xml
+++ b/greendroid/GreenDroid/res/values-v5/gd_themes.xml
@@ -40,53 +40,53 @@
         <item name="gdItemViewPreferredPaddingLeft">@dimen/gd_item_view_padding_left</item>
         <item name="gdSeparatorItemViewPreferredHeight">@dimen/gd_separator_item_view_height</item>
         
-        <item name="gdTextItemViewStyle">@style/GreenDroid.TextItemView</item>
-        <item name="gdLongTextItemViewStyle">@style/GreenDroid.LongTextItemView</item>
-        <item name="gdDescriptionItemViewStyle">@style/GreenDroid.DescriptionItemView</item>
+        <item name="gdTextItemViewStyle">@style/GreenDroid.Widget.ItemView.TextItemView</item>
+        <item name="gdLongTextItemViewStyle">@style/GreenDroid.Widget.ItemView.LongTextItemView</item>
+        <item name="gdDescriptionItemViewStyle">@style/GreenDroid.Widget.ItemView.DescriptionItemView</item>
         
-        <item name="gdSeparatorItemViewStyle">@style/GreenDroid.SeparatorItemView</item>
+        <item name="gdSeparatorItemViewStyle">@style/GreenDroid.Widget.ItemView.SeparatorItemView</item>
         
-       	<item name="gdProgressItemViewStyle">@style/GreenDroid.ProgressItemView</item>
-	 	<item name="gdProgressItemViewStyleText">@style/GreenDroid.ProgressItemView.Text</item>
-	 	<item name="gdProgressItemViewStyleProgressBar">@style/GreenDroid.ProgressItemView.ProgressBar</item>
-	 	
-	 	<item name="gdDrawableItemViewStyle">@style/GreenDroid.DrawableItemView</item>
-	 	<item name="gdDrawableItemViewStyleText">@style/GreenDroid.DrawableItemView.Text</item>
-	 	<item name="gdDrawableItemViewStyleDrawable">@style/GreenDroid.DrawableItemView.Drawable</item>
+        <item name="gdProgressItemViewStyle">@style/GreenDroid.Widget.ItemView.ProgressItemView</item>
+        <item name="gdProgressItemViewStyleText">@style/GreenDroid.Widget.ItemView.ProgressItemView.Text</item>
+        <item name="gdProgressItemViewStyleProgressBar">@style/GreenDroid.Widget.ItemView.ProgressItemView.ProgressBar</item>
+
+        <item name="gdDrawableItemViewStyle">@style/GreenDroid.Widget.ItemView.DrawableItemView</item>
+        <item name="gdDrawableItemViewStyleText">@style/GreenDroid.Widget.ItemView.DrawableItemView.Text</item>
+        <item name="gdDrawableItemViewStyleDrawable">@style/GreenDroid.Widget.ItemView.DrawableItemView.Drawable</item>
         
-        <item name="gdSubtitleItemViewStyle">@style/GreenDroid.SubtitleItemView</item>
-        <item name="gdSubtitleItemViewStyleText">@style/GreenDroid.SubtitleItemView.Text</item>
-        <item name="gdSubtitleItemViewStyleSubtitle">@style/GreenDroid.SubtitleItemView.Subtitle</item>
+        <item name="gdSubtitleItemViewStyle">@style/GreenDroid.Widget.ItemView.SubtitleItemView</item>
+        <item name="gdSubtitleItemViewStyleText">@style/GreenDroid.Widget.ItemView.SubtitleItemView.Text</item>
+        <item name="gdSubtitleItemViewStyleSubtitle">@style/GreenDroid.Widget.ItemView.SubtitleItemView.Subtitle</item>
         
-        <item name="gdSubtextItemViewStyle">@style/GreenDroid.SubtextItemView</item>
-        <item name="gdSubtextItemViewStyleText">@style/GreenDroid.SubtextItemView.Text</item>
-        <item name="gdSubtextItemViewStyleSubtext">@style/GreenDroid.SubtextItemView.Subtext</item>
+        <item name="gdSubtextItemViewStyle">@style/GreenDroid.Widget.ItemView.SubtextItemView</item>
+        <item name="gdSubtextItemViewStyleText">@style/GreenDroid.Widget.ItemView.SubtextItemView.Text</item>
+        <item name="gdSubtextItemViewStyleSubtext">@style/GreenDroid.Widget.ItemView.SubtextItemView.Subtext</item>
         
-        <item name="gdThumbnailItemViewStyle">@style/GreenDroid.ThumbnailItemView</item>
-        <item name="gdThumbnailItemViewStyleText">@style/GreenDroid.ThumbnailItemView.Text</item>
-        <item name="gdThumbnailItemViewStyleSubtitle">@style/GreenDroid.ThumbnailItemView.Subtitle</item>
-        <item name="gdThumbnailItemViewStyleThumbnail">@style/GreenDroid.ThumbnailItemView.Thumbnail</item>
+        <item name="gdThumbnailItemViewStyle">@style/GreenDroid.Widget.ItemView.ThumbnailItemView</item>
+        <item name="gdThumbnailItemViewStyleText">@style/GreenDroid.Widget.ItemView.ThumbnailItemView.Text</item>
+        <item name="gdThumbnailItemViewStyleSubtitle">@style/GreenDroid.Widget.ItemView.ThumbnailItemView.Subtitle</item>
+        <item name="gdThumbnailItemViewStyleThumbnail">@style/GreenDroid.Widget.ItemView.ThumbnailItemView.Thumbnail</item>
         
         <item name="gdSegmentTextColor">@android:color/black</item>
         <item name="gdSegmentTextSize">14sp</item>
         <item name="gdSegmentBackground">@drawable/gd_segment_label</item>
         <item name="gdSegmentCheckmark">@drawable/gd_segment_checkmark</item>
-        <item name="gdSegmentedBarStyle">@style/GreenDroid.SegmentedBar</item>
-        <item name="gdSegmentedHostStyle">@style/GreenDroid.SegmentedHost</item>
+        <item name="gdSegmentedBarStyle">@style/GreenDroid.Widget.SegmentedBar</item>
+        <item name="gdSegmentedHostStyle">@style/GreenDroid.Widget.SegmentedHost</item>
         
-		<item name="gdActionBarTitleColor">@android:color/white</item>
-		<item name="gdActionBarBackground">@color/gd_action_bar_tint</item>
-		<item name="gdActionBarItemBackground">@drawable/gd_action_bar_item</item>
-		<item name="gdActionBarDividerDrawable">@color/gd_action_bar_divider_tint</item>
-		<item name="gdActionBarDividerWidth">1px</item>
-		<item name="gdActionBarApplicationDrawable">@null</item>
-		<item name="gdActionBarHomeDrawable">@drawable/gd_action_bar_home</item>
-		
-		<item name="gdActionBarStyle">@style/GreenDroid.Widget.ActionBar</item>
-		<item name="gdActionBarTitleStyle">@style/GreenDroid.Widget.ActionBar.Title</item>
-		<item name="gdActionBarItemStyle">@style/GreenDroid.Widget.ActionBar.Item</item>
-		
-		<item name="gdTabIndicatorHeight">38dp</item>
+        <item name="gdActionBarTitleColor">@android:color/white</item>
+        <item name="gdActionBarBackground">@color/gd_action_bar_tint</item>
+        <item name="gdActionBarItemBackground">@drawable/gd_action_bar_item</item>
+        <item name="gdActionBarDividerDrawable">@color/gd_action_bar_divider_tint</item>
+        <item name="gdActionBarDividerWidth">1px</item>
+        <item name="gdActionBarApplicationDrawable">@null</item>
+        <item name="gdActionBarHomeDrawable">@null</item>
+
+        <item name="gdActionBarStyle">@style/GreenDroid.Widget.ActionBar</item>
+        <item name="gdActionBarTitleStyle">@style/GreenDroid.Widget.ActionBar.Title</item>
+        <item name="gdActionBarItemStyle">@style/GreenDroid.Widget.ActionBar.Item</item>
+
+        <item name="gdTabIndicatorHeight">38dp</item>
         <item name="gdTabIndicatorTextAppearance">@style/TextAppearance.TabIndicator</item>
         <item name="gdTabIndicatorBackground">@drawable/gd_tab_indicator</item>
         
@@ -96,13 +96,5 @@
         <item name="gdQuickActionGridItemStyle">@style/GreenDroid.Widget.QuickAction.Grid.Item</item>
         
     </style>
-    
-    
-    <style name="Theme.GreenDroid.NoTitleBar" parent="@style/Theme.GreenDroid">
-    
-    	<item name="android:windowContentOverlay">@null</item>
-    	<item name="android:windowNoTitle">true</item>
-    	
-    </style>
-    
+
 </resources>
\ No newline at end of file