diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index cf188fe..200f160 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -14,5 +14,10 @@
 # limitations under the License.
 
 PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/lineage_osprey.mk
+    $(LOCAL_DIR)/colt_osprey.mk
+
+COMMON_LUNCH_CHOICES := \
+    colt_osprey-user \
+    colt_osprey-userdebug \
+    colt_osprey-eng
 
diff --git a/lineage.dependencies b/colt.dependencies
similarity index 99%
rename from lineage.dependencies
rename to colt.dependencies
index 30b7919..740b634 100644
--- a/lineage.dependencies
+++ b/colt.dependencies
@@ -4,4 +4,3 @@
     "target_path": "device/motorola/msm8916-common"
   }
 ]
-
diff --git a/lineage_osprey.mk b/colt_osprey.mk
similarity index 72%
rename from lineage_osprey.mk
rename to colt_osprey.mk
index 504a38b..3c699d1 100644
--- a/lineage_osprey.mk
+++ b/colt_osprey.mk
@@ -16,14 +16,19 @@
 $(call inherit-product, device/motorola/osprey/full_osprey.mk)
 
 # Boot animation
-TARGET_BOOTANIMATION_HALF_RES := true
-TARGET_SCREEN_WIDTH := 720
-TARGET_SCREEN_HEIGHT := 1280
+TARGET_BOOT_ANIMATION_RES := 720×1280 : Please change as per your device resolution
+# TARGET_BOOT_ANIMATION_RES := 1080x1920 : Please change as per your device resolution
+
+TARGET_GAPPS_ARCH := arm
+TARGET_MINIMAL_APPS := true
 
 ## Device identifier. This must come after all inclusions
 PRODUCT_DEVICE := osprey
-PRODUCT_NAME := lineage_osprey
+PRODUCT_NAME := colt_osprey
 PRODUCT_MODEL := MotoG3
 PRODUCT_BRAND := Motorola
 PRODUCT_MANUFACTURER := Motorola
 PRODUCT_RELEASE_NAME := osprey
+
+# Inherit some common Colt stuff.
+$(call inherit-product, vendor/colt/config/common_full_phone.mk)
diff --git a/init/Android.bp b/init/Android.bp
new file mode 100644
index 0000000..6571bbb
--- /dev/null
+++ b/init/Android.bp
@@ -0,0 +1,12 @@
+cc_library_static {
+    name: "libinit_osprey",
+    recovery_available: true,
+
+    include_dirs: [
+        "system/core/base/include",
+        "system/core/init",
+    ],
+
+    srcs: ["init_osprey.cpp"],
+    static_libs: ["libbase"],
+}
diff --git a/init/Android.mk b/init/Android.mk
deleted file mode 100644
index 1e9900c..0000000
--- a/init/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-LOCAL_C_INCLUDES := system/core/init
-LOCAL_CPPFLAGS := -Wall -DANDROID_TARGET=\"$(TARGET_BOARD_PLATFORM)\"
-LOCAL_SRC_FILES := init_osprey.cpp
-LOCAL_MODULE := libinit_osprey
-LOCAL_STATIC_LIBRARIES := libbase
-
-include $(BUILD_STATIC_LIBRARY)
diff --git a/init/init_osprey.cpp b/init/init_osprey.cpp
index 3f87534..b8d4765 100644
--- a/init/init_osprey.cpp
+++ b/init/init_osprey.cpp
@@ -73,10 +73,6 @@ void vendor_load_properties()
     char fingerprint[PROP_VALUE_MAX];
     char tv[PROP_VALUE_MAX];
 
-    std::string platform = GetProperty("ro.board.platform","");
-    if (platform != ANDROID_TARGET)
-        return;
-
     // Warning-less way of sprintf(var, "");
     ds[0] = 0;
     tv[0] = 0;
diff --git a/rootdir/Android.mk b/rootdir/Android.mk
index 5cd1a15..7655817 100644
--- a/rootdir/Android.mk
+++ b/rootdir/Android.mk
@@ -4,7 +4,7 @@ LOCAL_PATH:= $(call my-dir)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE       := init.target.rc
-LOCAL_MODULE_TAGS  := optional eng
+LOCAL_MODULE_TAGS  := optional
 LOCAL_MODULE_CLASS := ETC
 LOCAL_SRC_FILES    := etc/init.target.rc
 LOCAL_MODULE_PATH  := $(TARGET_OUT_VENDOR_ETC)/init/hw
diff --git a/rootdir/etc/init.target.rc b/rootdir/etc/init.target.rc
index d3051e1..c5cf1d4 100644
--- a/rootdir/etc/init.target.rc
+++ b/rootdir/etc/init.target.rc
@@ -76,7 +76,6 @@ on property:sys.boot_completed=1
     setprop sys.io.scheduler bfq
 
     write /sys/module/lpm_levels/parameters/sleep_disabled 0
-    write /sys/devices/system/cpu/cpu0/online 1
 
     # HMP scheduler settings
     write /proc/sys/kernel/sched_ravg_hist_size 3
@@ -123,8 +122,6 @@ on property:sys.boot_completed=1
     write /dev/cpuset/camera-daemon/cpus 0-3
     write /dev/cpuset/restricted/cpus 0-3
 
-    start batt_health
-
     write /sys/class/devfreq/1c00000.qcom,kgsl-3d0/governor "msm-adreno-tz"
     write /sys/class/devfreq/qcom,cpubw.30/governor "cpufreq"