diff --git a/app/src/main/res/layout/fragment_library.xml b/app/src/main/res/layout/fragment_library.xml
index e5af0fb2..56d6b3f2 100644
--- a/app/src/main/res/layout/fragment_library.xml
+++ b/app/src/main/res/layout/fragment_library.xml
@@ -53,7 +53,7 @@
                 app:cardBackgroundColor="?colorSurface"
                 app:cardCornerRadius="8dp"
                 app:cardUseCompatPadding="true"
-                app:layout_collapseMode="pin">
+                app:layout_scrollFlags="scroll|enterAlways">
 
                 <FrameLayout
                     android:layout_width="match_parent"
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATESwitch.kt b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATESwitch.kt
index 5e0ddc8a..89284b9c 100755
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATESwitch.kt
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATESwitch.kt
@@ -1,11 +1,10 @@
 package code.name.monkey.appthemehelper.common.views
 
 import android.content.Context
-import android.content.res.ColorStateList
 import android.util.AttributeSet
 import android.view.View
 import androidx.appcompat.widget.SwitchCompat
-import code.name.monkey.appthemehelper.R
+import code.name.monkey.appthemehelper.ATH
 import code.name.monkey.appthemehelper.ThemeStore
 
 
@@ -27,15 +26,7 @@ class ATESwitch : SwitchCompat {
     }
 
     private fun init(context: Context) {
-        setThumbResource(R.drawable.toggle_switch)
-        setTrackResource(R.drawable.ate_track)
-        background = null
-
-        val sl = ColorStateList(arrayOf(intArrayOf(-android.R.attr.state_checked), intArrayOf(android.R.attr.state_checked)),
-                intArrayOf(ThemeStore.textColorSecondary(context), ThemeStore.accentColor(context)))
-
-        thumbTintList = sl
-        trackTintList = sl
+        ATH.setTint(this, ThemeStore.accentColor(context))
     }
 
     override fun isShown(): Boolean {