diff --git a/README.md b/README.md
index dcc3aac..9ad7c0e 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ IntelliJ IDEA code style settings for Square's Java and Android projects.
Installation
------------
- * Run the `install.sh` script.
+ * On Unix, run the `install.sh` script. Windows users should use `install.bat` instead.
* Restart IntelliJ if it's running.
* Open IntelliJ Project Settings -> Code Styles, change the code style for the
project to the one you want.
diff --git a/configs/codestyles/Square.xml b/configs/codestyles/Square.xml
index 0d5bd27..ebee07c 100644
--- a/configs/codestyles/Square.xml
+++ b/configs/codestyles/Square.xml
@@ -70,6 +70,16 @@
+
+
+
+
+
+
+
+
@@ -245,6 +255,13 @@
+
+
+
+
+
+
+
@@ -278,4 +295,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/configs/codestyles/SquareAndroid.xml b/configs/codestyles/SquareAndroid.xml
index 74c58f8..19a6fd9 100644
--- a/configs/codestyles/SquareAndroid.xml
+++ b/configs/codestyles/SquareAndroid.xml
@@ -6,11 +6,6 @@
-
-
-
-
-
@@ -35,7 +30,6 @@
-
@@ -73,12 +67,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -110,15 +134,12 @@
-
-
-
@@ -144,7 +165,6 @@
-
@@ -154,7 +174,6 @@
-
@@ -189,7 +208,6 @@
-
@@ -197,12 +215,9 @@
-
-
-
@@ -219,28 +234,43 @@
-
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
@@ -260,7 +290,6 @@
-
@@ -309,6 +338,16 @@
+
+
+
+
+ .*:name
+ http://schemas.android.com/apk/res/android
+
+
+
+
@@ -351,6 +390,17 @@
BY_NAME
+
+
+
+
+ app:layout_.*
+ http://schemas.android.com/apk/res-auto
+
+
+ BY_NAME
+
+
-
\ No newline at end of file
+
diff --git a/configs/inspection/Square.xml b/configs/inspection/Square.xml
index 361afca..a87576b 100644
--- a/configs/inspection/Square.xml
+++ b/configs/inspection/Square.xml
@@ -1,7 +1,46 @@
-
-
+
+
+
+
+
-
-
+
+
+
+
diff --git a/configs/options/editor.codeinsight.xml b/configs/options/editor.codeinsight.xml
new file mode 100644
index 0000000..e46761d
--- /dev/null
+++ b/configs/options/editor.codeinsight.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/install.bat b/install.bat
new file mode 100644
index 0000000..884691c
--- /dev/null
+++ b/install.bat
@@ -0,0 +1,25 @@
+REM Installs Square's IntelliJ configs into your user configs.
+@echo off
+echo Installing Square IntelliJ configs...
+
+setlocal enableDelayedExpansion
+
+for /D %%i in ("%userprofile%"\.AndroidStudio*) do call :copy_config "%%i"
+for /D %%i in ("%userprofile%"\.IdeaIC*) do call :copy_config "%%i"
+for /D %%i in ("%userprofile%"\.IntelliJIdea*) do call :copy_config "%%i"
+for /D %%i in ("%userprofile%"\.AndroidStudio*\settingsRepository\repository) do call :copy_config "%%i"
+for /D %%i in ("%userprofile%"\.IdeaIC*\settingsRepository\repository) do call :copy_config "%%i"
+for /D %%i in ("%userprofile%"\.IntelliJIdea*\settingsRepository\repository) do call :copy_config "%%i"
+
+echo.
+echo Restart IntelliJ and/or AndroidStudio, go to preferences, and apply 'Square' or 'SquareAndroid'.
+exit /b
+
+REM sub function for copy config files
+:copy_config
+set config_dir=%~1\config
+echo Installing to "!config_dir!"
+xcopy /s configs "!config_dir!"
+echo Done.
+echo.
+exit /b
diff --git a/install.sh b/install.sh
index b7617b1..9e08c77 100755
--- a/install.sh
+++ b/install.sh
@@ -10,17 +10,25 @@ for i in $HOME/Library/Preferences/IntelliJIdea* \
$HOME/Library/Preferences/AndroidStudio* \
$HOME/.IntelliJIdea*/config \
$HOME/.IdeaIC*/config \
- $HOME/.AndroidStudio*/config
+ $HOME/.AndroidStudio*/config \
+ $HOME/Library/Application\ Support/JetBrains/IntelliJIdea* \
+ $HOME/Library/Application\ Support/Google/AndroidStudio* \
+ $HOME/Library/Application\ Support/JetBrains/IdeaIC* \
+ $HOME/Library/Application\ Support/Google/AndroidStudio*/settingsRepository/repository \
+ $HOME/Library/Application\ Support/JetBrains/IdeaIC*/settingsRepository/repository
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"
fi
done