diff --git a/.gitignore b/.gitignore
index 98072057..c9f8a667 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,7 @@ build*
 *.kate-swp
 *~
 *.project
+*.classpath
+*.settings
+*.setting
+bin/
diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResResSpec.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResResSpec.java
index f39f561e..b27d085d 100755
--- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResResSpec.java
+++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResResSpec.java
@@ -102,7 +102,7 @@ public class ResResSpec {
     }
 
     public ResType getType() {
-        return mType;
+        return getmType();
     }
 
     public void addResource(ResResource res)
@@ -120,6 +120,10 @@ public class ResResSpec {
 
     @Override
     public String toString() {
-        return mId.toString() + " " + mType.toString() + "/" + mName;
+        return mId.toString() + " " + getmType().toString() + "/" + mName;
     }
+
+	public ResType getmType() {
+		return mType;
+	}
 }
diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResStyleValue.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResStyleValue.java
index 99331f95..b6ce42a9 100644
--- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResStyleValue.java
+++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResStyleValue.java
@@ -49,6 +49,11 @@ public class ResStyleValue extends ResBagValue implements ResValuesXmlSerializab
         }
         for (int i = 0; i < mItems.length; i++) {
             ResResSpec spec = mItems[i].m1.getReferent();
+            
+            // hacky-fix remove bad ReferenceVars
+            if (spec.getDefaultResource().getValue().toString().contains("ResReferenceValue@")) {
+            	continue;
+            }
             ResAttr attr = (ResAttr) spec.getDefaultResource().getValue();
             String value = attr.convertToResXmlFormat(mItems[i].m2);