diff --git a/configs/codestyles/SquareAndroid.xml b/configs/codestyles/SquareAndroid.xml
index 32ff5cf..a3cb906 100644
--- a/configs/codestyles/SquareAndroid.xml
+++ b/configs/codestyles/SquareAndroid.xml
@@ -295,28 +295,40 @@
         <section>
           <rule>
             <match>
-              <NAME>class</NAME>
+              <AND>
+                <NAME>class</NAME>
+                <XML_ATTRIBUTE />
+              </AND>
             </match>
           </rule>
         </section>
         <section>
           <rule>
             <match>
-              <NAME>layout</NAME>
+              <AND>
+                <NAME>layout</NAME>
+                <XML_ATTRIBUTE />
+              </AND>
             </match>
           </rule>
         </section>
         <section>
           <rule>
             <match>
-              <NAME>xmlns:android</NAME>
+              <AND>
+                <NAME>xmlns:android</NAME>
+                <XML_ATTRIBUTE />
+              </AND>
             </match>
           </rule>
         </section>
         <section>
           <rule>
             <match>
-              <NAME>xmlns:.*</NAME>
+              <AND>
+                <NAME>xmlns:.*</NAME>
+                <XML_ATTRIBUTE />
+              </AND>
             </match>
             <order>BY_NAME</order>
           </rule>
@@ -326,6 +338,7 @@
             <match>
               <AND>
                 <NAME>.*:id</NAME>
+                <XML_ATTRIBUTE />
                 <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
               </AND>
             </match>
@@ -346,6 +359,7 @@
             <match>
               <AND>
                 <NAME>.*:layout_width</NAME>
+                <XML_ATTRIBUTE />
                 <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
               </AND>
             </match>
@@ -356,6 +370,7 @@
             <match>
               <AND>
                 <NAME>.*:layout_height</NAME>
+                <XML_ATTRIBUTE />
                 <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
               </AND>
             </match>
@@ -366,6 +381,7 @@
             <match>
               <AND>
                 <NAME>.*:layout_.*</NAME>
+                <XML_ATTRIBUTE />
                 <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
               </AND>
             </match>
@@ -377,6 +393,7 @@
             <match>
               <AND>
                 <NAME>.*</NAME>
+                <XML_ATTRIBUTE />
                 <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
               </AND>
             </match>
@@ -386,7 +403,11 @@
         <section>
           <rule>
             <match>
-              <NAME>.*(?&lt;!style)$</NAME>
+              <AND>
+                <NAME>app:layout_.*</NAME>
+                <XML_ATTRIBUTE />
+                <XML_NAMESPACE>http://schemas.android.com/apk/res-auto</XML_NAMESPACE>
+              </AND>
             </match>
             <order>BY_NAME</order>
           </rule>
@@ -394,7 +415,21 @@
         <section>
           <rule>
             <match>
-              <NAME>style</NAME>
+              <AND>
+                <NAME>.*(?&lt;!style)$</NAME>
+                <XML_ATTRIBUTE />
+              </AND>
+            </match>
+            <order>BY_NAME</order>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <NAME>style</NAME>
+                <XML_ATTRIBUTE />
+              </AND>
             </match>
           </rule>
         </section>
diff --git a/install.sh b/install.sh
index a03a9a1..9f826a2 100755
--- a/install.sh
+++ b/install.sh
@@ -8,23 +8,25 @@ CONFIGS="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/configs"
 for i in $HOME/Library/Preferences/IntelliJIdea*  \
          $HOME/Library/Preferences/IdeaIC*        \
          $HOME/Library/Preferences/AndroidStudio* \
+         $HOME/Library/Application\ Support/JetBrains/IntelliJIdea* \
          $HOME/.IntelliJIdea*/config              \
          $HOME/.IdeaIC*/config                    \
-         $HOME/.AndroidStudio*/config
+         $HOME/.AndroidStudio*/config \
+         $HOME/Library/Application\ Support/Google/AndroidStudio* \
+         $HOME/Library/Application\ Support/JetBrains/IdeaIC*
 do
-  if [[ -d $i ]]; then
-
+  if [[ -d "$i" ]]; then
     # Install codestyles
-    mkdir -p $i/codestyles
-    cp -frv "$CONFIGS/codestyles"/* $i/codestyles
+    mkdir -p "$i/codestyles"
+    cp -frv "$CONFIGS/codestyles"/* "$i/codestyles"
 
     # Install inspections
-    mkdir -p $i/inspection
-    cp -frv "$CONFIGS/inspection"/* $i/inspection
+    mkdir -p "$i/inspection"
+    cp -frv "$CONFIGS/inspection"/* "$i/inspection"
 
     # Install options ("Exclude from Import and Completion")
-    mkdir -p $i/options
-    cp -frv "$CONFIGS/options"/* $i/options
+    mkdir -p "$i/options"
+    cp -frv "$CONFIGS/options"/* "$i/options"
   fi
 done