diff --git a/app/bookmark/BookmarkRepo.scala b/app/bookmark/BookmarkRepo.scala
index 29c84de887..544834b833 100644
--- a/app/bookmark/BookmarkRepo.scala
+++ b/app/bookmark/BookmarkRepo.scala
@@ -61,7 +61,7 @@ final class BookmarkRepo(val collection: MongoCollection) {
         "g" -> gameId,
         "u" -> userId,
         "d" -> date),
-      concern = WriteConcern.Safe
+      writeConcern = WriteConcern.Safe
     )
   }
 
diff --git a/app/core/Titivate.scala b/app/core/Titivate.scala
index b4d135e274..468c60084d 100644
--- a/app/core/Titivate.scala
+++ b/app/core/Titivate.scala
@@ -5,7 +5,7 @@ import game.GameRepo
 import round.Finisher
 import bookmark.BookmarkApi
 
-import com.mongodb.casbah.query.Imports._
+import com.mongodb.casbah.Imports._
 import org.joda.time.DateTime
 import org.scala_tools.time.Imports._
 import scalaz.effects._
diff --git a/app/forum/CategRepo.scala b/app/forum/CategRepo.scala
index 82c3a48ac0..e372ca66b8 100644
--- a/app/forum/CategRepo.scala
+++ b/app/forum/CategRepo.scala
@@ -12,7 +12,7 @@ final class CategRepo(
   ) extends SalatDAO[Categ, String](collection) {
 
   def bySlug(slug: String): IO[Option[Categ]] = io {
-    findOneById(slug)
+    findOneByID(slug)
   }
 
   val all: IO[List[Categ]] = io {
diff --git a/app/forum/PostRepo.scala b/app/forum/PostRepo.scala
index c8727e81c1..30d9bac421 100644
--- a/app/forum/PostRepo.scala
+++ b/app/forum/PostRepo.scala
@@ -11,7 +11,7 @@ final class PostRepo(
     collection: MongoCollection) extends SalatDAO[Post, String](collection) {
 
   def byId(id: String): IO[Option[Post]] = io {
-    findOneById(id)
+    findOneByID(id)
   }
 
   def countByTopics(topics: List[Topic]): IO[Int] = io {
diff --git a/app/forum/TopicRepo.scala b/app/forum/TopicRepo.scala
index 9598d68e86..5f120dc01a 100644
--- a/app/forum/TopicRepo.scala
+++ b/app/forum/TopicRepo.scala
@@ -4,14 +4,14 @@ package forum
 import com.novus.salat._
 import com.novus.salat.dao._
 import com.mongodb.casbah.MongoCollection
-import com.mongodb.casbah.query.Imports._
+import com.mongodb.casbah.Imports._
 import scalaz.effects._
 
 final class TopicRepo(
     collection: MongoCollection) extends SalatDAO[Topic, String](collection) {
 
   def byId(id: String): IO[Option[Topic]] = io {
-    findOneById(id)
+    findOneByID(id)
   }
 
   def byCateg(categ: Categ): IO[List[Topic]] = io {
diff --git a/app/game/GameRepo.scala b/app/game/GameRepo.scala
index eff3e687ac..aa683f740a 100644
--- a/app/game/GameRepo.scala
+++ b/app/game/GameRepo.scala
@@ -11,7 +11,7 @@ import user.User
 import com.novus.salat._
 import com.novus.salat.dao._
 import com.mongodb.casbah.MongoCollection
-import com.mongodb.casbah.query.Imports._
+import com.mongodb.casbah.Imports._
 import org.joda.time.DateTime
 import org.scala_tools.time.Imports._
 import java.util.Date
@@ -23,7 +23,7 @@ class GameRepo(collection: MongoCollection)
 
   def game(gameId: String): IO[Option[DbGame]] = io {
     if (gameId.size != gameIdSize) None
-    else findOneById(gameId) flatMap (_.decode)
+    else findOneByID(gameId) flatMap (_.decode)
   }
 
   def player(gameId: String, color: Color): IO[Option[DbPlayer]] =
diff --git a/app/lobby/HookRepo.scala b/app/lobby/HookRepo.scala
index 3c2ebb9ad2..1e6b6da8c9 100644
--- a/app/lobby/HookRepo.scala
+++ b/app/lobby/HookRepo.scala
@@ -6,7 +6,7 @@ import game.DbGame
 import com.novus.salat._
 import com.novus.salat.dao._
 import com.mongodb.casbah.MongoCollection
-import com.mongodb.casbah.query.Imports._
+import com.mongodb.casbah.Imports._
 import scalaz.effects._
 import org.joda.time.DateTime
 import org.scala_tools.time.Imports._
@@ -15,7 +15,7 @@ class HookRepo(collection: MongoCollection)
     extends SalatDAO[Hook, String](collection) {
 
   def hook(hookId: String): IO[Option[Hook]] = io {
-    findOneById(hookId)
+    findOneByID(hookId)
   }
 
   def ownedHook(ownerId: String): IO[Option[Hook]] = io {
diff --git a/app/lobby/MessageRepo.scala b/app/lobby/MessageRepo.scala
index 571497df3c..6c7c216713 100644
--- a/app/lobby/MessageRepo.scala
+++ b/app/lobby/MessageRepo.scala
@@ -3,7 +3,7 @@ package lobby
 
 import mongodb.CappedRepo
 import com.mongodb.casbah.MongoCollection
-import com.mongodb.casbah.query.Imports._
+import com.mongodb.casbah.Imports._
 import scalaz.effects._
 
 final class MessageRepo(collection: MongoCollection, max: Int)
diff --git a/app/message/ThreadRepo.scala b/app/message/ThreadRepo.scala
index a2be1275ed..677d3cc65f 100644
--- a/app/message/ThreadRepo.scala
+++ b/app/message/ThreadRepo.scala
@@ -6,15 +6,14 @@ import user.User
 import com.novus.salat._
 import com.novus.salat.dao._
 import com.mongodb.casbah.MongoCollection
-import com.mongodb.casbah.query.Imports._
-import com.mongodb.casbah.map_reduce.MapReduceInlineOutput
+import com.mongodb.casbah.Imports._
 import scalaz.effects._
 
 final class ThreadRepo(
     collection: MongoCollection) extends SalatDAO[Thread, String](collection) {
 
   def byId(id: String): IO[Option[Thread]] = io {
-    findOneById(id)
+    findOneByID(id)
   }
 
   def byUser(user: User): IO[List[Thread]] = io {
diff --git a/app/round/RoomRepo.scala b/app/round/RoomRepo.scala
index b0a21745a4..403914a439 100644
--- a/app/round/RoomRepo.scala
+++ b/app/round/RoomRepo.scala
@@ -4,14 +4,14 @@ package round
 import com.novus.salat._
 import com.novus.salat.dao._
 import com.mongodb.casbah.MongoCollection
-import com.mongodb.casbah.query.Imports._
+import com.mongodb.casbah.Imports._
 import scalaz.effects._
 
 class RoomRepo(collection: MongoCollection)
     extends SalatDAO[Room, String](collection) {
 
   def room(id: String): IO[Room] = io {
-    findOneById(id) | Room(id, Nil)
+    findOneByID(id) | Room(id, Nil)
   }
 
   def addMessage(id: String, author: String, message: String): IO[Unit] = io {
diff --git a/app/round/WatcherRoomRepo.scala b/app/round/WatcherRoomRepo.scala
index 328d12ef6b..ed1e721727 100644
--- a/app/round/WatcherRoomRepo.scala
+++ b/app/round/WatcherRoomRepo.scala
@@ -4,7 +4,7 @@ package round
 import com.novus.salat._
 import com.novus.salat.dao._
 import com.mongodb.casbah.MongoCollection
-import com.mongodb.casbah.query.Imports._
+import com.mongodb.casbah.Imports._
 import scalaz.effects._
 
 class WatcherRoomRepo(collection: MongoCollection)
@@ -13,7 +13,7 @@ class WatcherRoomRepo(collection: MongoCollection)
   import WatcherRoom.Message
 
   def room(id: String): IO[WatcherRoom] = io {
-    findOneById(id) | WatcherRoom(id, Nil)
+    findOneByID(id) | WatcherRoom(id, Nil)
   }
 
   def addMessage(id: String, username: Option[String], text: String): IO[Message] = io {
diff --git a/app/security/Store.scala b/app/security/Store.scala
index 0f43683395..5c2d75def5 100644
--- a/app/security/Store.scala
+++ b/app/security/Store.scala
@@ -5,7 +5,7 @@ import user.User
 
 import play.api.mvc.RequestHeader
 import com.mongodb.casbah.MongoCollection
-import com.mongodb.casbah.query.Imports._
+import com.mongodb.casbah.Imports._
 import org.joda.time.DateTime
 import scalaz.effects._
 
diff --git a/app/setup/UserConfigRepo.scala b/app/setup/UserConfigRepo.scala
index 16f1aaeec8..24e14f97f2 100644
--- a/app/setup/UserConfigRepo.scala
+++ b/app/setup/UserConfigRepo.scala
@@ -19,7 +19,7 @@ class UserConfigRepo(collection: MongoCollection)
   } yield ()
 
   def config(user: User): IO[UserConfig] = io {
-    findOneById(user.id) flatMap (_.decode)
+    findOneByID(user.id) flatMap (_.decode)
   } except { e ⇒
     putStrLn("Can't load config: " + e.getMessage) map (_ ⇒ none[UserConfig])
   } map (_ | UserConfig.default(user))
diff --git a/app/user/HistoryRepo.scala b/app/user/HistoryRepo.scala
index 13272f7217..efa1f3287a 100644
--- a/app/user/HistoryRepo.scala
+++ b/app/user/HistoryRepo.scala
@@ -2,7 +2,7 @@ package lila
 package user
 
 import com.mongodb.casbah.MongoCollection
-import com.mongodb.casbah.query.Imports._
+import com.mongodb.casbah.Imports._
 
 import java.lang.Float.parseFloat
 import java.lang.Integer.parseInt
diff --git a/app/user/UserRepo.scala b/app/user/UserRepo.scala
index d356687179..ff5e7f0c4b 100644
--- a/app/user/UserRepo.scala
+++ b/app/user/UserRepo.scala
@@ -4,14 +4,14 @@ package user
 import com.novus.salat._
 import com.novus.salat.dao._
 import com.mongodb.casbah.{ MongoCollection, WriteConcern }
-import com.mongodb.casbah.query.Imports._
+import com.mongodb.casbah.Imports._
 import scalaz.effects._
 import com.roundeights.hasher.Implicits._
 import org.joda.time.DateTime
 import ornicar.scalalib.OrnicarRandom
 
-class UserRepo(collection: MongoCollection) 
-extends SalatDAO[User, String](collection) {
+class UserRepo(
+    collection: MongoCollection) extends SalatDAO[User, String](collection) {
 
   val enabledQuery = DBObject("enabled" -> true)
   def byIdQuery(id: String): DBObject = DBObject("_id" -> normalize(id))
@@ -20,7 +20,7 @@ extends SalatDAO[User, String](collection) {
   def normalize(id: String) = id.toLowerCase
 
   def byId(id: String): IO[Option[User]] = io {
-    findOneById(normalize(id))
+    findOneByID(normalize(id))
   }
 
   def byIds(ids: Iterable[String]): IO[List[User]] = io {
diff --git a/app/wiki/PageRepo.scala b/app/wiki/PageRepo.scala
index 36d37f02c0..1da45b47d4 100644
--- a/app/wiki/PageRepo.scala
+++ b/app/wiki/PageRepo.scala
@@ -11,7 +11,7 @@ final class PageRepo(
     collection: MongoCollection) extends SalatDAO[Page, String](collection) {
 
   def byId(id: String): IO[Option[Page]] = io {
-    findOneById(id)
+    findOneByID(id)
   }
 
   val all: IO[List[Page]] = io {
diff --git a/project/Build.scala b/project/Build.scala
index 0f99587bb6..91587dc2f2 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -7,7 +7,6 @@ trait Resolvers {
   val typesafe = "typesafe.com" at "http://repo.typesafe.com/typesafe/releases/"
   val iliaz = "iliaz.com" at "http://scala.iliaz.com/"
   val sonatype = "sonatype" at "http://oss.sonatype.org/content/repositories/releases"
-  val sonatypeS = "sonatype snapshots" at "http://oss.sonatype.org/content/repositories/snapshots"
   val t2v = "t2v.jp repo" at "http://www.t2v.jp/maven-repo/"
   val guice = "guice-maven" at "http://guice-maven.googlecode.com/svn/trunk"
   val jgitMaven = "jgit-maven" at "http://download.eclipse.org/jgit/maven"
@@ -17,8 +16,8 @@ trait Dependencies {
   val scalachess = "com.github.ornicar" %% "scalachess" % "2.1"
   val scalaz = "org.scalaz" %% "scalaz-core" % "6.0.4"
   val specs2 = "org.specs2" %% "specs2" % "1.11"
-  val casbah = "org.mongodb" %% "casbah" % "2.4.0"
-  val salat = "com.novus" %% "salat-core" % "1.9-SNAPSHOT"
+  val casbah = "com.mongodb.casbah" %% "casbah" % "2.1.5-1"
+  val salat = "com.novus" %% "salat-core" % "0.0.8-SNAPSHOT"
   val scalalib = "com.github.ornicar" %% "scalalib" % "1.37"
   val config = "com.typesafe" % "config" % "0.4.0"
   val json = "com.codahale" %% "jerkson" % "0.5.0"
@@ -38,9 +37,9 @@ object ApplicationBuild extends Build with Resolvers with Dependencies {
 
   private val buildSettings = Project.defaultSettings ++ Seq(
     organization := "com.github.ornicar",
-    version := "1.0",
+    version := "0.1",
     scalaVersion := "2.9.1",
-    resolvers := Seq(iliaz, codahale, sonatype, sonatypeS, typesafe, t2v, guice, jgitMaven),
+    resolvers := Seq(iliaz, codahale, sonatype, typesafe, t2v, guice, jgitMaven),
     libraryDependencies := Seq(scalaz, scalalib, hasher),
     libraryDependencies in test := Seq(specs2),
     shellPrompt := {
diff --git a/todo b/todo
index f8fdd92449..54f3ec7dfb 100644
--- a/todo
+++ b/todo
@@ -29,3 +29,4 @@ analysis: replace scores with bar (adv+delta visible)
 legend feedback: http://en.lichess.org/forum/lichess-feedback/a-few-points-bugssuggestions#1
 http://en.lichess.org/forum/lichess-feedback/problems-with-yin-yang#1
 also translate websockets error message
+play with a friend possible bug http://en.lichess.org/forum/lichess-feedback/play-with-a-friend-bug